Merge oe-devel@oe-devel.bkbits.net:openembedded

into hyperion.kergoth.com:/home/kergoth/code/openembedded

2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.

BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA

6 files changed, 0 insertions, 268 deletions

diff --git a/apt/apt-0.5.27/autofoo.patch b/apt/apt-0.5.27/autofoo.patch
deleted file mode 100644
index d9a30d096c..0000000000
--- a/apt/apt-0.5.27/autofoo.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- apt-0.5.27/configure.in~autofoo
-+++ apt-0.5.27/configure.in
-@@ -18,9 +18,9 @@
- AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
- 
- dnl -- SET THIS TO THE RELEASE VERSION --
--AC_DEFINE_UNQUOTED(VERSION,"0.5.27")
-+AC_DEFINE_UNQUOTED(VERSION,"0.5.27", [package version])
- PACKAGE="apt"
--AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
-+AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE", [package name])
- AC_SUBST(PACKAGE)
- 
- dnl Check the archs, we want the target type.
-@@ -47,7 +47,7 @@
- LIBS="$SAVE_LIBS"
-  
- dnl Checks for pthread -- disabled due to glibc bugs jgg
--dnl AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD) PTHREADLIB="-lpthread"])
-+dnl AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD, 1, [define if we have pthreads]) PTHREADLIB="-lpthread"])
- AC_SUBST(PTHREADLIB)
- dnl if test "$PTHREADLIB" != "-lpthread"; then
- dnl   AC_MSG_ERROR(failed: I need posix threads, pthread)
-@@ -64,7 +64,7 @@
-        [#include <db.h>],
-        [int r, s, t; db_version(&r, &s, &t);]
-       )],
--      [AC_DEFINE(HAVE_BDB)
-+      [AC_DEFINE(HAVE_BDB, 1, [define if we have BerkeleyDB])
-        BDBLIB="-ldb"
-        AC_MSG_RESULT(yes)],
-       [BDBLIB=""
-@@ -84,14 +84,14 @@
-   AC_MSG_ERROR(failed: use --host= or check buildlib/archtable)
- fi
- AC_MSG_RESULT($archset)
--AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset")
-+AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset",[define to the system architecture])
- 
- dnl Get a common name for the host OS - this is primarily only for HURD and is
- dnl non fatal if it fails
- AC_MSG_CHECKING(system OS)
- osset="`awk \" ! /^#|^\\\$/ {if (match(\\\"$target_vendor-$target_os\\\",\\\$1)) {print \\\$2; exit}}\" $srcdir/buildlib/ostable`"
- AC_MSG_RESULT($osset)
--AC_DEFINE_UNQUOTED(COMMON_OS,"$osset")
-+AC_DEFINE_UNQUOTED(COMMON_OS,"$osset",[define to the system OS])
- 
- dnl We use C99 types if at all possible
- AC_CACHE_CHECK([for C99 integer types],c9x_ints,[
-@@ -105,13 +105,13 @@
- 
- dnl Arg, linux and bsd put their statfs function in different places
- if test x"$HAVE_STATVFS" != x"yes"; then
--   AC_EGREP_HEADER(statfs,sys/vfs.h,[AC_DEFINE(HAVE_VFS_H)],[
--   AC_EGREP_HEADER(statfs,sys/mount.h,[AC_DEFINE(HAVE_MOUNT_H)],[AC_MSG_ERROR(failed: Need statvfs)])
-+   AC_EGREP_HEADER(statfs,sys/vfs.h,[AC_DEFINE(HAVE_VFS_H, 1, [define if statfs is in sys/vfs.h])],[
-+   AC_EGREP_HEADER(statfs,sys/mount.h,[AC_DEFINE(HAVE_MOUNT_H, 1, [define if statfs is in sys/mount.h])],[AC_MSG_ERROR(failed: Need statvfs)])
-    ])
- fi
- 
- dnl We should use the real timegm function if we have it.
--AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM))
-+AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM, 1, [define if we have timegm]))
- AC_SUBST(HAVE_TIMEGM)
- 
- dnl Check the sizes etc. of the architecture
-@@ -157,7 +157,7 @@
- dnl HP-UX sux..
- AC_MSG_CHECKING(for missing socklen_t)
- AC_EGREP_HEADER(socklen_t, sys/socket.h,[AC_MSG_RESULT(no)],[
--	AC_DEFINE(NEED_SOCKLEN_T_DEFINE)
-+	AC_DEFINE(NEED_SOCKLEN_T_DEFINE, 1, [define if we need to define socklen_t])
- 	NEED_SOCKLEN_T_DEFINE=yes
-         AC_MSG_RESULT(missing.)])
- AC_SUBST(NEED_SOCKLEN_T_DEFINE)
-@@ -195,7 +195,7 @@
- ALL_LINGUAS="da de en_GB es fr hu it nl no_NO pl pt_BR ru sv zh_TW"
- AM_GNU_GETTEXT(external)
- if test x"$USE_NLS" = "xyes"; then
--   AC_DEFINE(USE_NLS)
-+   AC_DEFINE(USE_NLS, 1, [define if we have native language support])
- fi
- AC_SUBST(USE_NLS)
- AC_PATH_PROG(BASH, bash)
diff --git a/apt/apt-0.6.25/autofoo.patch b/apt/apt-0.6.25/autofoo.patch
deleted file mode 100644
index 7083b838a2..0000000000
--- a/apt/apt-0.6.25/autofoo.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- apt-0.6.18/configure.in~autofoo
-+++ apt-0.6.18/configure.in
-@@ -17,9 +17,9 @@
- AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
- 
- dnl -- SET THIS TO THE RELEASE VERSION --
--AC_DEFINE_UNQUOTED(VERSION,"0.6.25")
-+AC_DEFINE_UNQUOTED(VERSION,"0.6.25", [package version])
- PACKAGE="apt"
--AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
-+AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE", [package name])
- AC_SUBST(PACKAGE)
- 
- dnl Check the archs, we want the target type.
-@@ -46,7 +46,7 @@
- LIBS="$SAVE_LIBS"
-  
- dnl Checks for pthread -- disabled due to glibc bugs jgg
--dnl AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD) PTHREADLIB="-lpthread"])
-+dnl AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD, 1, [define if we have pthreads]) PTHREADLIB="-lpthread"])
- AC_SUBST(PTHREADLIB)
- dnl if test "$PTHREADLIB" != "-lpthread"; then
- dnl   AC_MSG_ERROR(failed: I need posix threads, pthread)
-@@ -66,14 +66,14 @@
-   AC_MSG_ERROR(failed: use --host=)
- fi
- AC_MSG_RESULT($archset)
--AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset")
-+AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset",[define to the system architecture])
- 
- dnl Get a common name for the host OS - this is primarily only for HURD and is
- dnl non fatal if it fails
- AC_MSG_CHECKING(system OS)
- osset="`awk \" ! /^#|^\\\$/ {if (match(\\\"$target_vendor-$target_os\\\",\\\$1)) {print \\\$2; exit}}\" $srcdir/buildlib/ostable`"
- AC_MSG_RESULT($osset)
--AC_DEFINE_UNQUOTED(COMMON_OS,"$osset")
-+AC_DEFINE_UNQUOTED(COMMON_OS,"$osset",[define to the system OS])
- 
- dnl We use C99 types if at all possible
- AC_CACHE_CHECK([for C99 integer types],c9x_ints,[
-@@ -87,13 +87,13 @@
- 
- dnl Arg, linux and bsd put their statfs function in different places
- if test x"$HAVE_STATVFS" != x"yes"; then
--   AC_EGREP_HEADER(statfs,sys/vfs.h,[AC_DEFINE(HAVE_VFS_H)],[
--   AC_EGREP_HEADER(statfs,sys/mount.h,[AC_DEFINE(HAVE_MOUNT_H)],[AC_MSG_ERROR(failed: Need statvfs)])
-+   AC_EGREP_HEADER(statfs,sys/vfs.h,[AC_DEFINE(HAVE_VFS_H, 1, [define if statfs is in sys/vfs.h])],[
-+   AC_EGREP_HEADER(statfs,sys/mount.h,[AC_DEFINE(HAVE_MOUNT_H, 1, [define if statfs is in sys/mount.h])],[AC_MSG_ERROR(failed: Need statvfs)])
-    ])
- fi
- 
- dnl We should use the real timegm function if we have it.
--AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM))
-+AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM, 1, [define if we have timegm]))
- AC_SUBST(HAVE_TIMEGM)
- 
- dnl Check the sizes etc. of the architecture
-@@ -139,7 +139,7 @@
- dnl HP-UX sux..
- AC_MSG_CHECKING(for missing socklen_t)
- AC_EGREP_HEADER(socklen_t, sys/socket.h,[AC_MSG_RESULT(no)],[
--	AC_DEFINE(NEED_SOCKLEN_T_DEFINE)
-+	AC_DEFINE(NEED_SOCKLEN_T_DEFINE, 1, [define if we need to define socklen_t])
- 	NEED_SOCKLEN_T_DEFINE=yes
-         AC_MSG_RESULT(missing.)])
- AC_SUBST(NEED_SOCKLEN_T_DEFINE)
-@@ -174,7 +174,7 @@
- ALL_LINGUAS="da de en_GB es fr hu it nl no_NO pl pt_BR ru sv zh_TW"
- AM_GNU_GETTEXT(external)
- if test x"$USE_NLS" = "xyes"; then
--   AC_DEFINE(USE_NLS)
-+   AC_DEFINE(USE_NLS, 1, [define if we have native language support])
- fi
- AC_SUBST(USE_NLS)
- AC_PATH_PROG(BASH, bash)
diff --git a/apt/apt-package.inc b/apt/apt-package.inc
deleted file mode 100644
index 6a8a269843..0000000000
--- a/apt/apt-package.inc
+++ /dev/null
@@ -1,99 +0,0 @@
-apt-manpages="doc/apt-cache.8 \
-	      doc/apt-cdrom.8 \
-	      doc/apt-config.8 \
-	      doc/apt-get.8 \
-	      doc/apt.8 \
-	      doc/apt.conf.5 \
-	      doc/apt_preferences.5 \
-	      doc/fr/apt-cache.fr.8 \
-	      doc/fr/apt-cdrom.fr.8 \
-	      doc/fr/apt-config.fr.8 \
-	      doc/fr/apt-get.fr.8 \
-	      doc/fr/apt.conf.fr.5 \
-	      doc/fr/apt_preferences.fr.5 \
-	      doc/fr/sources.list.fr.5 \
-	      doc/es/apt.es.8 \
-	      doc/es/apt-cache.es.8 \
-	      doc/es/apt-cdrom.es.8 \
-	      doc/es/apt-config.es.8 \
-	      doc/es/apt-get.es.8 \
-	      doc/es/apt.conf.es.5 \
-	      doc/es/apt_preferences.es.5 \
-	      doc/es/sources.list.es.5 \
-	      doc/pt_BR/apt_preferences.pt_BR.5 \
-	      doc/ja/apt-cache.ja.8 \
-	      doc/ja/apt-cdrom.ja.8 \
-	      doc/ja/apt-get.ja.8 \
-	      doc/ja/apt.conf.ja.5 \
-	      doc/sources.list.5"
-apt-utils-manpages="doc/apt-extracttemplates.1 \
-		    doc/apt-sortpkgs.1 \
-		    doc/fr/apt-extracttemplates.fr.1 \
-		    doc/fr/apt-sortpkgs.fr.1"
-#		    doc/fr/apt-ftparchive.fr.1
-#		    doc/apt-ftparchive.1
-
-def get_files_apt_doc(d, bb, manpages):
-	import re
-	manpages = re.sub(r'\bdoc/(\S+)/(\S+)\.\1\.(.)\b', r'${mandir}/\1/man\3/\2.\3', manpages)
-	manpages = re.sub(r'\bdoc/(\S+)\.(.)\b', r'${mandir}/man\3/\1.\3', manpages)
-	return manpages
-
-def get_commands_apt_doc(d, bb, manpages):
-	import os
-	s = list()
-	__dir_cache__ = list()
-	for m in manpages.split():
-		dest = get_files_apt_doc(d, bb, m)
-		dir = os.path.dirname(dest)
-		if not dir in __dir_cache__:
-			s.append("install -d ${D}/%s" % dir)
-			__dir_cache__.append(dir)
-		s.append("install -m 0644 %s ${D}/%s" % (m, dest))
-	return "\n".join(s)
-
-PACKAGES += "${PN}-utils ${PN}-utils-doc"
-FILES_${PN} = "${bindir}/apt-cdrom ${bindir}/apt-get \
-	       ${bindir}/apt-config ${bindir}/apt-cache \
-	       ${libdir}/apt ${libdir}/libapt*.so.* \
-	       ${localstatedir} ${sysconfdir} \
-	       ${libdir}/dpkg"
-FILES_${PN}-utils = "${bindir}/apt-sortpkgs ${bindir}/apt-extracttemplates"
-FILES_${PN}-doc = "${@get_files_apt_doc(d, bb, bb.data.getVar('apt-manpages', d, 1))} \
-		   ${datadir}/doc/apt"
-FILES_${PN}-utils-doc = "${@get_files_apt_doc(d, bb, bb.data.getVar('apt-utils-manpages', d, 1))}"
-FILES_${PN}-dev = "${libdir}/libapt*.so"
-
-do_install () {
-	${@get_commands_apt_doc(d, bb, bb.data.getVar('apt-manpages', d, 1))}
-	${@get_commands_apt_doc(d, bb, bb.data.getVar('apt-utils-manpages', d, 1))}
-	install -d ${D}/${bindir}
-	install -m 0755 bin/apt-cdrom ${D}/${bindir}/
-	install -m 0755 bin/apt-get ${D}/${bindir}/
-	install -m 0755 bin/apt-config ${D}/${bindir}/
-	install -m 0755 bin/apt-cache ${D}/${bindir}/
-
-	install -m 0755 bin/apt-sortpkgs ${D}/${bindir}/
-	install -m 0755 bin/apt-extracttemplates ${D}/${bindir}/
-
-	oe_libinstall -so -C bin libapt-pkg--6 ${D}/${libdir}/
-	ln -sf libapt-pkg--6.so ${D}/${libdir}/libapt-pkg.so
-	oe_libinstall -so -C bin libapt-inst--6 ${D}/${libdir}/
-	ln -sf libapt-inst--6.so ${D}/${libdir}/libapt-inst.so
-
-	install -d ${D}/${libdir}/apt/methods
-	install -m 0755 bin/methods/* ${D}/${libdir}/apt/methods/
-
-	install -d ${D}/${libdir}/dpkg/methods/apt
-	install -m 0644 dselect/desc.apt ${D}/${libdir}/dpkg/methods/apt/ 
-	install -m 0644 dselect/names ${D}/${libdir}/dpkg/methods/apt/ 
-	install -m 0755 dselect/install ${D}/${libdir}/dpkg/methods/apt/ 
-	install -m 0755 dselect/setup ${D}/${libdir}/dpkg/methods/apt/ 
-	install -m 0755 dselect/update ${D}/${libdir}/dpkg/methods/apt/ 
-
-	install -d ${D}/${sysconfdir}/apt
-	install -d ${D}/${localstatedir}/lib/apt/lists/partial
-	install -d ${D}/${localstatedir}/cache/apt/archives/partial
-	install -d ${D}/${datadir}/doc/apt/examples
-	install -m 0644 doc/examples/* ${D}/${datadir}/doc/apt/examples/
-}
diff --git a/apt/apt.inc b/apt/apt.inc
deleted file mode 100644
index e69de29bb2..0000000000
--- a/apt/apt.inc
+++ /dev/null
diff --git a/apt/apt_0.5.27.bb b/apt/apt_0.5.27.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/apt/apt_0.5.27.bb
+++ /dev/null
diff --git a/apt/apt_0.6.25.bb b/apt/apt_0.6.25.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/apt/apt_0.6.25.bb
+++ /dev/null