From 43997e7f37e90c85f68e56d89479ddf7eab1d998 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 3 Oct 2006 17:59:58 +0000 Subject: apt: update to 0.6.46, hack do_install to work around missing .so files * not tested on device --- packages/apt/apt-0.6.45exp2/.mtn2git_empty | 0 packages/apt/apt-0.6.45exp2/autofoo.patch | 84 --------------------------- packages/apt/apt-0.6.45exp2/noconfigure.patch | 35 ----------- packages/apt/apt-0.6.45exp2/nodoc.patch | 15 ----- packages/apt/apt-0.6.46/.mtn2git_empty | 0 packages/apt/apt-0.6.46/autofoo.patch | 84 +++++++++++++++++++++++++++ packages/apt/apt-0.6.46/noconfigure.patch | 35 +++++++++++ packages/apt/apt-0.6.46/nodoc.patch | 15 +++++ packages/apt/apt-native_0.6.45exp2.bb | 4 -- packages/apt/apt-native_0.6.46.bb | 4 ++ packages/apt/apt_0.6.45exp2.bb | 9 --- packages/apt/apt_0.6.46.bb | 43 ++++++++++++++ 12 files changed, 181 insertions(+), 147 deletions(-) delete mode 100644 packages/apt/apt-0.6.45exp2/.mtn2git_empty delete mode 100644 packages/apt/apt-0.6.45exp2/autofoo.patch delete mode 100644 packages/apt/apt-0.6.45exp2/noconfigure.patch delete mode 100644 packages/apt/apt-0.6.45exp2/nodoc.patch create mode 100644 packages/apt/apt-0.6.46/.mtn2git_empty create mode 100644 packages/apt/apt-0.6.46/autofoo.patch create mode 100644 packages/apt/apt-0.6.46/noconfigure.patch create mode 100644 packages/apt/apt-0.6.46/nodoc.patch delete mode 100644 packages/apt/apt-native_0.6.45exp2.bb create mode 100644 packages/apt/apt-native_0.6.46.bb delete mode 100644 packages/apt/apt_0.6.45exp2.bb create mode 100644 packages/apt/apt_0.6.46.bb diff --git a/packages/apt/apt-0.6.45exp2/.mtn2git_empty b/packages/apt/apt-0.6.45exp2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/apt/apt-0.6.45exp2/autofoo.patch b/packages/apt/apt-0.6.45exp2/autofoo.patch deleted file mode 100644 index 74d787cefd..0000000000 --- a/packages/apt/apt-0.6.45exp2/autofoo.patch +++ /dev/null @@ -1,84 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- - configure.in | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - ---- apt-0.6.45exp2.orig/configure.in -+++ apt-0.6.45exp2/configure.in -@@ -18,9 +18,9 @@ AC_CONFIG_AUX_DIR(buildlib) - 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.45exp2") -+AC_DEFINE_UNQUOTED(VERSION,"0.6.45exp2",[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 @@ AC_SUBST(SOCKETLIBS) - 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) -@@ -84,14 +84,14 @@ if test "x$archset" = "x"; then - 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 @@ AC_SUBST(HAVE_STATVFS) - - 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 @@ fi - 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) -@@ -204,7 +204,7 @@ dnl gettext approved makefiles, so this - ALL_LINGUAS="bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja ko nb nl nn pl pt_BR pt ro ru sk sl sv tl vi zn_CN 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/packages/apt/apt-0.6.45exp2/noconfigure.patch b/packages/apt/apt-0.6.45exp2/noconfigure.patch deleted file mode 100644 index 682a96da24..0000000000 --- a/packages/apt/apt-0.6.45exp2/noconfigure.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- - apt-pkg/packagemanager.cc | 4 ++++ - 1 file changed, 4 insertions(+) - ---- apt-0.6.45exp2.orig/apt-pkg/packagemanager.cc -+++ apt-0.6.45exp2/apt-pkg/packagemanager.cc -@@ -534,10 +534,12 @@ bool pkgPackageManager::SmartUnPack(PkgI - - List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States); - -+#if 0 - // Perform immedate configuration of the package. - if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true) - if (SmartConfigure(Pkg) == false) - return _error->Error("Internal Error, Could not perform immediate configuration (2) on %s",Pkg.Name()); -+#endif - - return true; - } -@@ -609,6 +611,7 @@ pkgPackageManager::OrderResult pkgPackag - DoneSomething = true; - } - -+#if 0 - // Final run through the configure phase - if (ConfigureAll() == false) - return Failed; -@@ -623,6 +626,7 @@ pkgPackageManager::OrderResult pkgPackag - return Failed; - } - } -+#endif - - return Completed; - } diff --git a/packages/apt/apt-0.6.45exp2/nodoc.patch b/packages/apt/apt-0.6.45exp2/nodoc.patch deleted file mode 100644 index 9101847189..0000000000 --- a/packages/apt/apt-0.6.45exp2/nodoc.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- apt-0.6.45exp2.orig/Makefile -+++ apt-0.6.45exp2/Makefile -@@ -17,7 +17,7 @@ all headers library clean veryclean bina - $(MAKE) -C cmdline $@ - $(MAKE) -C ftparchive $@ - $(MAKE) -C dselect $@ -- $(MAKE) -C doc $@ -+# $(MAKE) -C doc $@ - $(MAKE) -C po $@ - - # Some very common aliases diff --git a/packages/apt/apt-0.6.46/.mtn2git_empty b/packages/apt/apt-0.6.46/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/apt/apt-0.6.46/autofoo.patch b/packages/apt/apt-0.6.46/autofoo.patch new file mode 100644 index 0000000000..74d787cefd --- /dev/null +++ b/packages/apt/apt-0.6.46/autofoo.patch @@ -0,0 +1,84 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- + configure.in | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +--- apt-0.6.45exp2.orig/configure.in ++++ apt-0.6.45exp2/configure.in +@@ -18,9 +18,9 @@ AC_CONFIG_AUX_DIR(buildlib) + 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.45exp2") ++AC_DEFINE_UNQUOTED(VERSION,"0.6.45exp2",[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 @@ AC_SUBST(SOCKETLIBS) + 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) +@@ -84,14 +84,14 @@ if test "x$archset" = "x"; then + 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 @@ AC_SUBST(HAVE_STATVFS) + + 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 @@ fi + 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) +@@ -204,7 +204,7 @@ dnl gettext approved makefiles, so this + ALL_LINGUAS="bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja ko nb nl nn pl pt_BR pt ro ru sk sl sv tl vi zn_CN 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/packages/apt/apt-0.6.46/noconfigure.patch b/packages/apt/apt-0.6.46/noconfigure.patch new file mode 100644 index 0000000000..682a96da24 --- /dev/null +++ b/packages/apt/apt-0.6.46/noconfigure.patch @@ -0,0 +1,35 @@ +--- + apt-pkg/packagemanager.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +--- apt-0.6.45exp2.orig/apt-pkg/packagemanager.cc ++++ apt-0.6.45exp2/apt-pkg/packagemanager.cc +@@ -534,10 +534,12 @@ bool pkgPackageManager::SmartUnPack(PkgI + + List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States); + ++#if 0 + // Perform immedate configuration of the package. + if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true) + if (SmartConfigure(Pkg) == false) + return _error->Error("Internal Error, Could not perform immediate configuration (2) on %s",Pkg.Name()); ++#endif + + return true; + } +@@ -609,6 +611,7 @@ pkgPackageManager::OrderResult pkgPackag + DoneSomething = true; + } + ++#if 0 + // Final run through the configure phase + if (ConfigureAll() == false) + return Failed; +@@ -623,6 +626,7 @@ pkgPackageManager::OrderResult pkgPackag + return Failed; + } + } ++#endif + + return Completed; + } diff --git a/packages/apt/apt-0.6.46/nodoc.patch b/packages/apt/apt-0.6.46/nodoc.patch new file mode 100644 index 0000000000..9101847189 --- /dev/null +++ b/packages/apt/apt-0.6.46/nodoc.patch @@ -0,0 +1,15 @@ +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- apt-0.6.45exp2.orig/Makefile ++++ apt-0.6.45exp2/Makefile +@@ -17,7 +17,7 @@ all headers library clean veryclean bina + $(MAKE) -C cmdline $@ + $(MAKE) -C ftparchive $@ + $(MAKE) -C dselect $@ +- $(MAKE) -C doc $@ ++# $(MAKE) -C doc $@ + $(MAKE) -C po $@ + + # Some very common aliases diff --git a/packages/apt/apt-native_0.6.45exp2.bb b/packages/apt/apt-native_0.6.45exp2.bb deleted file mode 100644 index 43f73889f7..0000000000 --- a/packages/apt/apt-native_0.6.45exp2.bb +++ /dev/null @@ -1,4 +0,0 @@ -require apt-native.inc - -SRC_URI += "file://nodoc.patch;patch=1 \ - file://noconfigure.patch;patch=1" diff --git a/packages/apt/apt-native_0.6.46.bb b/packages/apt/apt-native_0.6.46.bb new file mode 100644 index 0000000000..43f73889f7 --- /dev/null +++ b/packages/apt/apt-native_0.6.46.bb @@ -0,0 +1,4 @@ +require apt-native.inc + +SRC_URI += "file://nodoc.patch;patch=1 \ + file://noconfigure.patch;patch=1" diff --git a/packages/apt/apt_0.6.45exp2.bb b/packages/apt/apt_0.6.45exp2.bb deleted file mode 100644 index 1cd8eb270e..0000000000 --- a/packages/apt/apt_0.6.45exp2.bb +++ /dev/null @@ -1,9 +0,0 @@ -require apt.inc - -SRC_URI += "file://autofoo.patch;patch=1 \ - file://nodoc.patch;patch=1" - -require apt-package.inc - -FILES_${PN} += "${bindir}/apt-key" -apt-manpages += "doc/apt-key.8" diff --git a/packages/apt/apt_0.6.46.bb b/packages/apt/apt_0.6.46.bb new file mode 100644 index 0000000000..6d21638118 --- /dev/null +++ b/packages/apt/apt_0.6.46.bb @@ -0,0 +1,43 @@ +require apt.inc + +require apt-package.inc + +FILES_${PN} += "${bindir}/apt-key" +apt-manpages += "doc/apt-key.8" + +do_install () { + set -x + ${@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}/ + + eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` + oe_libinstall -a -C bin libapt-pkg ${D}${libdir}/ + ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so + oe_libinstall -a -C bin libapt-inst ${D}${libdir}/ + ln -sf libapt-inst$GLIBC_VER-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}${docdir}/apt/examples + install -m 0644 doc/examples/* ${D}${docdir}/apt/examples/ +} + -- cgit v1.2.3