From 709c4d66e0b107ca606941b988bad717c0b45d9b Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 17 Mar 2009 14:32:59 -0400 Subject: rename packages/ to recipes/ per earlier agreement See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko Acked-by: Mike Westerhof Acked-by: Philip Balister Acked-by: Khem Raj Acked-by: Marcin Juszkiewicz Acked-by: Koen Kooi Acked-by: Frans Meulenbroeks --- recipes/apt/apt-0.5.28.6/autofoo.patch | 92 ++++++++++++++++++++++ recipes/apt/apt-0.6.25/autofoo.patch | 81 ++++++++++++++++++++ recipes/apt/apt-0.6.46.2/autofoo.patch | 84 ++++++++++++++++++++ recipes/apt/apt-0.6.46.2/noconfigure.patch | 35 +++++++++ recipes/apt/apt-0.6.46.2/nodoc.patch | 15 ++++ recipes/apt/apt-0.7.14/no-ko-translation.patch | 9 +++ recipes/apt/apt-0.7.14/noconfigure.patch | 35 +++++++++ recipes/apt/apt-0.7.14/nodoc.patch | 19 +++++ recipes/apt/apt-0.7.14/use-host.patch | 44 +++++++++++ recipes/apt/apt-0.7.19/no-curl.patch | 40 ++++++++++ recipes/apt/apt-0.7.19/noconfigure.patch | 35 +++++++++ recipes/apt/apt-0.7.19/nodoc.patch | 19 +++++ recipes/apt/apt-0.7.2/noconfigure.patch | 35 +++++++++ recipes/apt/apt-0.7.2/nodoc.patch | 15 ++++ recipes/apt/apt-0.7.20.2/no-curl.patch | 40 ++++++++++ recipes/apt/apt-0.7.20.2/noconfigure.patch | 35 +++++++++ recipes/apt/apt-0.7.20.2/nodoc.patch | 19 +++++ recipes/apt/apt-0.7.3/noconfigure.patch | 35 +++++++++ recipes/apt/apt-0.7.3/nodoc.patch | 15 ++++ recipes/apt/apt-native.inc | 64 ++++++++++++++++ recipes/apt/apt-native_0.6.46.2.bb | 5 ++ recipes/apt/apt-native_0.7.14.bb | 6 ++ recipes/apt/apt-native_0.7.19.bb | 6 ++ recipes/apt/apt-native_0.7.2.bb | 5 ++ recipes/apt/apt-native_0.7.20.2.bb | 6 ++ recipes/apt/apt-native_0.7.3.bb | 5 ++ recipes/apt/apt-package.inc | 102 +++++++++++++++++++++++++ recipes/apt/apt.inc | 23 ++++++ recipes/apt/apt_0.5.28.6.bb | 13 ++++ recipes/apt/apt_0.6.25.bb | 11 +++ recipes/apt/apt_0.6.46.2.bb | 11 +++ recipes/apt/apt_0.7.14.bb | 27 +++++++ recipes/apt/apt_0.7.19.bb | 27 +++++++ recipes/apt/apt_0.7.2.bb | 9 +++ recipes/apt/apt_0.7.20.2.bb | 26 +++++++ recipes/apt/apt_0.7.3.bb | 9 +++ recipes/apt/files/apt.conf | 43 +++++++++++ recipes/apt/files/db_linking_hack.patch | 27 +++++++ recipes/apt/files/environment.patch | 13 ++++ recipes/apt/files/no-curl.patch | 44 +++++++++++ 40 files changed, 1184 insertions(+) create mode 100644 recipes/apt/apt-0.5.28.6/autofoo.patch create mode 100644 recipes/apt/apt-0.6.25/autofoo.patch create mode 100644 recipes/apt/apt-0.6.46.2/autofoo.patch create mode 100644 recipes/apt/apt-0.6.46.2/noconfigure.patch create mode 100644 recipes/apt/apt-0.6.46.2/nodoc.patch create mode 100644 recipes/apt/apt-0.7.14/no-ko-translation.patch create mode 100644 recipes/apt/apt-0.7.14/noconfigure.patch create mode 100644 recipes/apt/apt-0.7.14/nodoc.patch create mode 100644 recipes/apt/apt-0.7.14/use-host.patch create mode 100644 recipes/apt/apt-0.7.19/no-curl.patch create mode 100644 recipes/apt/apt-0.7.19/noconfigure.patch create mode 100644 recipes/apt/apt-0.7.19/nodoc.patch create mode 100644 recipes/apt/apt-0.7.2/noconfigure.patch create mode 100644 recipes/apt/apt-0.7.2/nodoc.patch create mode 100644 recipes/apt/apt-0.7.20.2/no-curl.patch create mode 100644 recipes/apt/apt-0.7.20.2/noconfigure.patch create mode 100644 recipes/apt/apt-0.7.20.2/nodoc.patch create mode 100644 recipes/apt/apt-0.7.3/noconfigure.patch create mode 100644 recipes/apt/apt-0.7.3/nodoc.patch create mode 100644 recipes/apt/apt-native.inc create mode 100644 recipes/apt/apt-native_0.6.46.2.bb create mode 100644 recipes/apt/apt-native_0.7.14.bb create mode 100644 recipes/apt/apt-native_0.7.19.bb create mode 100644 recipes/apt/apt-native_0.7.2.bb create mode 100644 recipes/apt/apt-native_0.7.20.2.bb create mode 100644 recipes/apt/apt-native_0.7.3.bb create mode 100644 recipes/apt/apt-package.inc create mode 100644 recipes/apt/apt.inc create mode 100644 recipes/apt/apt_0.5.28.6.bb create mode 100644 recipes/apt/apt_0.6.25.bb create mode 100644 recipes/apt/apt_0.6.46.2.bb create mode 100644 recipes/apt/apt_0.7.14.bb create mode 100644 recipes/apt/apt_0.7.19.bb create mode 100644 recipes/apt/apt_0.7.2.bb create mode 100644 recipes/apt/apt_0.7.20.2.bb create mode 100644 recipes/apt/apt_0.7.3.bb create mode 100644 recipes/apt/files/apt.conf create mode 100644 recipes/apt/files/db_linking_hack.patch create mode 100644 recipes/apt/files/environment.patch create mode 100644 recipes/apt/files/no-curl.patch (limited to 'recipes/apt') diff --git a/recipes/apt/apt-0.5.28.6/autofoo.patch b/recipes/apt/apt-0.5.28.6/autofoo.patch new file mode 100644 index 0000000000..02ee7e057f --- /dev/null +++ b/recipes/apt/apt-0.5.28.6/autofoo.patch @@ -0,0 +1,92 @@ +upstream: more recent version in OE + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: apt-0.5.28.6/configure.in +=================================================================== +--- apt-0.5.28.6.orig/configure.in 2005-03-22 08:03:50.000000000 +0100 ++++ apt-0.5.28.6/configure.in 2005-05-15 15:08:50.000000000 +0200 +@@ -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.28.6") ++AC_DEFINE_UNQUOTED(VERSION,"0.5.28.6", [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 ], + [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/recipes/apt/apt-0.6.25/autofoo.patch b/recipes/apt/apt-0.6.25/autofoo.patch new file mode 100644 index 0000000000..1a6887bc8f --- /dev/null +++ b/recipes/apt/apt-0.6.25/autofoo.patch @@ -0,0 +1,81 @@ +upstream: more recent version in OE + +# +# 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/recipes/apt/apt-0.6.46.2/autofoo.patch b/recipes/apt/apt-0.6.46.2/autofoo.patch new file mode 100644 index 0000000000..74d787cefd --- /dev/null +++ b/recipes/apt/apt-0.6.46.2/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/recipes/apt/apt-0.6.46.2/noconfigure.patch b/recipes/apt/apt-0.6.46.2/noconfigure.patch new file mode 100644 index 0000000000..682a96da24 --- /dev/null +++ b/recipes/apt/apt-0.6.46.2/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/recipes/apt/apt-0.6.46.2/nodoc.patch b/recipes/apt/apt-0.6.46.2/nodoc.patch new file mode 100644 index 0000000000..9101847189 --- /dev/null +++ b/recipes/apt/apt-0.6.46.2/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/recipes/apt/apt-0.7.14/no-ko-translation.patch b/recipes/apt/apt-0.7.14/no-ko-translation.patch new file mode 100644 index 0000000000..5f3634b32a --- /dev/null +++ b/recipes/apt/apt-0.7.14/no-ko-translation.patch @@ -0,0 +1,9 @@ +--- + po/LINGUAS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- apt-0.7.14.orig/po/LINGUAS ++++ apt-0.7.14/po/LINGUAS +@@ -1 +1 @@ +-ar bg bs ca cs cy da de dz el en_GB es eu fi fr gl he hu it ja km ko ku mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl uk vi zh_CN zh_TW ++ar bg bs ca cs cy da de dz el en_GB es eu fi fr gl he hu it ja km ku mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl uk vi zh_CN zh_TW diff --git a/recipes/apt/apt-0.7.14/noconfigure.patch b/recipes/apt/apt-0.7.14/noconfigure.patch new file mode 100644 index 0000000000..682a96da24 --- /dev/null +++ b/recipes/apt/apt-0.7.14/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/recipes/apt/apt-0.7.14/nodoc.patch b/recipes/apt/apt-0.7.14/nodoc.patch new file mode 100644 index 0000000000..db8cf93717 --- /dev/null +++ b/recipes/apt/apt-0.7.14/nodoc.patch @@ -0,0 +1,19 @@ +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- apt-0.7.14.orig/Makefile ++++ apt-0.7.14/Makefile +@@ -15,11 +15,11 @@ all headers library clean veryclean bina + $(MAKE) -C apt-inst $@ + $(MAKE) -C methods $@ + $(MAKE) -C cmdline $@ + $(MAKE) -C ftparchive $@ + $(MAKE) -C dselect $@ +- $(MAKE) -C doc $@ ++# $(MAKE) -C doc $@ + $(MAKE) -C po $@ + + # Some very common aliases + .PHONY: maintainer-clean dist-clean distclean pristine sanity + maintainer-clean dist-clean distclean pristine sanity: veryclean diff --git a/recipes/apt/apt-0.7.14/use-host.patch b/recipes/apt/apt-0.7.14/use-host.patch new file mode 100644 index 0000000000..894a697661 --- /dev/null +++ b/recipes/apt/apt-0.7.14/use-host.patch @@ -0,0 +1,44 @@ +--- + buildlib/sizetable | 4 +++- + configure.in | 2 +- + 2 files changed, 4 insertions(+), 2 deletions(-) + +--- apt-0.7.14.orig/buildlib/sizetable ++++ apt-0.7.14/buildlib/sizetable +@@ -9,16 +9,19 @@ + # + # This is used primarily for the MD5 algorithm. + # The format is:- + # CPU endian sizeof: char, int, short, long + i386 little 1 4 2 4 ++i486 little 1 4 2 4 ++i586 little 1 4 2 4 ++i686 little 1 4 2 4 + armeb big 1 4 2 4 + arm little 1 4 2 4 + alpha little 1 4 2 8 + mipsel little 1 4 2 4 + sparc big 1 4 2 4 + sparc64 big 1 4 2 8 + m68k big 1 4 2 4 + powerpc big 1 4 2 4 + mips big 1 4 2 4 + hppa big 1 4 2 4 +-m32r big 1 4 2 4 +\ No newline at end of file ++m32r big 1 4 2 4 +--- apt-0.7.14.orig/configure.in ++++ apt-0.7.14/configure.in +@@ -86,11 +86,11 @@ AC_SUBST(BDBLIB) + dnl Converts the ARCH to be something singular for this general CPU family + dnl This is often the dpkg architecture string. + dnl First check against the full canonical canoncial-system-type in $target + dnl and if that fails, just look for the cpu + AC_MSG_CHECKING(debian architecture) +-archset="`dpkg-architecture -qDEB_HOST_ARCH`" ++archset="`echo $host_alias|cut -d'-' -f1`" + if test "x$archset" = "x"; then + AC_MSG_ERROR([failed: use --host= or output from dpkg-architecture]) + fi + AC_MSG_RESULT($archset) + AC_DEFINE_UNQUOTED(COMMON_ARCH,"$archset") diff --git a/recipes/apt/apt-0.7.19/no-curl.patch b/recipes/apt/apt-0.7.19/no-curl.patch new file mode 100644 index 0000000000..3e5aff139c --- /dev/null +++ b/recipes/apt/apt-0.7.19/no-curl.patch @@ -0,0 +1,40 @@ +--- + configure.in | 6 ------ + methods/makefile | 7 ------- + 2 files changed, 13 deletions(-) + +Index: apt-0.7.19/configure.in +=================================================================== +--- apt-0.7.19.orig/configure.in 2008-12-15 13:44:44.000000000 +0000 ++++ apt-0.7.19/configure.in 2008-12-15 13:57:16.000000000 +0000 +@@ -86,12 +86,6 @@ + + LIBS="$saveLIBS" + +-AC_CHECK_LIB(curl, curl_easy_init, +- [AC_CHECK_HEADER(curl/curl.h, +- curl_ok=yes, +- curl_ok=no)], +- AC_MSG_ERROR([failed: I need CURL due https support]), +-) + + AC_SUBST(BDBLIB) + +Index: apt-0.7.19/methods/makefile +=================================================================== +--- apt-0.7.19.orig/methods/makefile 2008-11-24 09:32:23.000000000 +0000 ++++ apt-0.7.19/methods/makefile 2008-12-15 13:57:44.000000000 +0000 +@@ -52,13 +52,6 @@ + SOURCE = http.cc rfc2553emu.cc connect.cc + include $(PROGRAM_H) + +-# The https method +-PROGRAM=https +-SLIBS = -lapt-pkg -lcurl $(INTLLIBS) +-LIB_MAKES = apt-pkg/makefile +-SOURCE = https.cc +-include $(PROGRAM_H) +- + # The ftp method + PROGRAM=ftp + SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS) diff --git a/recipes/apt/apt-0.7.19/noconfigure.patch b/recipes/apt/apt-0.7.19/noconfigure.patch new file mode 100644 index 0000000000..682a96da24 --- /dev/null +++ b/recipes/apt/apt-0.7.19/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/recipes/apt/apt-0.7.19/nodoc.patch b/recipes/apt/apt-0.7.19/nodoc.patch new file mode 100644 index 0000000000..db8cf93717 --- /dev/null +++ b/recipes/apt/apt-0.7.19/nodoc.patch @@ -0,0 +1,19 @@ +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- apt-0.7.14.orig/Makefile ++++ apt-0.7.14/Makefile +@@ -15,11 +15,11 @@ all headers library clean veryclean bina + $(MAKE) -C apt-inst $@ + $(MAKE) -C methods $@ + $(MAKE) -C cmdline $@ + $(MAKE) -C ftparchive $@ + $(MAKE) -C dselect $@ +- $(MAKE) -C doc $@ ++# $(MAKE) -C doc $@ + $(MAKE) -C po $@ + + # Some very common aliases + .PHONY: maintainer-clean dist-clean distclean pristine sanity + maintainer-clean dist-clean distclean pristine sanity: veryclean diff --git a/recipes/apt/apt-0.7.2/noconfigure.patch b/recipes/apt/apt-0.7.2/noconfigure.patch new file mode 100644 index 0000000000..682a96da24 --- /dev/null +++ b/recipes/apt/apt-0.7.2/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/recipes/apt/apt-0.7.2/nodoc.patch b/recipes/apt/apt-0.7.2/nodoc.patch new file mode 100644 index 0000000000..9101847189 --- /dev/null +++ b/recipes/apt/apt-0.7.2/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/recipes/apt/apt-0.7.20.2/no-curl.patch b/recipes/apt/apt-0.7.20.2/no-curl.patch new file mode 100644 index 0000000000..3e5aff139c --- /dev/null +++ b/recipes/apt/apt-0.7.20.2/no-curl.patch @@ -0,0 +1,40 @@ +--- + configure.in | 6 ------ + methods/makefile | 7 ------- + 2 files changed, 13 deletions(-) + +Index: apt-0.7.19/configure.in +=================================================================== +--- apt-0.7.19.orig/configure.in 2008-12-15 13:44:44.000000000 +0000 ++++ apt-0.7.19/configure.in 2008-12-15 13:57:16.000000000 +0000 +@@ -86,12 +86,6 @@ + + LIBS="$saveLIBS" + +-AC_CHECK_LIB(curl, curl_easy_init, +- [AC_CHECK_HEADER(curl/curl.h, +- curl_ok=yes, +- curl_ok=no)], +- AC_MSG_ERROR([failed: I need CURL due https support]), +-) + + AC_SUBST(BDBLIB) + +Index: apt-0.7.19/methods/makefile +=================================================================== +--- apt-0.7.19.orig/methods/makefile 2008-11-24 09:32:23.000000000 +0000 ++++ apt-0.7.19/methods/makefile 2008-12-15 13:57:44.000000000 +0000 +@@ -52,13 +52,6 @@ + SOURCE = http.cc rfc2553emu.cc connect.cc + include $(PROGRAM_H) + +-# The https method +-PROGRAM=https +-SLIBS = -lapt-pkg -lcurl $(INTLLIBS) +-LIB_MAKES = apt-pkg/makefile +-SOURCE = https.cc +-include $(PROGRAM_H) +- + # The ftp method + PROGRAM=ftp + SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS) diff --git a/recipes/apt/apt-0.7.20.2/noconfigure.patch b/recipes/apt/apt-0.7.20.2/noconfigure.patch new file mode 100644 index 0000000000..682a96da24 --- /dev/null +++ b/recipes/apt/apt-0.7.20.2/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/recipes/apt/apt-0.7.20.2/nodoc.patch b/recipes/apt/apt-0.7.20.2/nodoc.patch new file mode 100644 index 0000000000..db8cf93717 --- /dev/null +++ b/recipes/apt/apt-0.7.20.2/nodoc.patch @@ -0,0 +1,19 @@ +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- apt-0.7.14.orig/Makefile ++++ apt-0.7.14/Makefile +@@ -15,11 +15,11 @@ all headers library clean veryclean bina + $(MAKE) -C apt-inst $@ + $(MAKE) -C methods $@ + $(MAKE) -C cmdline $@ + $(MAKE) -C ftparchive $@ + $(MAKE) -C dselect $@ +- $(MAKE) -C doc $@ ++# $(MAKE) -C doc $@ + $(MAKE) -C po $@ + + # Some very common aliases + .PHONY: maintainer-clean dist-clean distclean pristine sanity + maintainer-clean dist-clean distclean pristine sanity: veryclean diff --git a/recipes/apt/apt-0.7.3/noconfigure.patch b/recipes/apt/apt-0.7.3/noconfigure.patch new file mode 100644 index 0000000000..682a96da24 --- /dev/null +++ b/recipes/apt/apt-0.7.3/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/recipes/apt/apt-0.7.3/nodoc.patch b/recipes/apt/apt-0.7.3/nodoc.patch new file mode 100644 index 0000000000..9101847189 --- /dev/null +++ b/recipes/apt/apt-0.7.3/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/recipes/apt/apt-native.inc b/recipes/apt/apt-native.inc new file mode 100644 index 0000000000..4e4771a9cd --- /dev/null +++ b/recipes/apt/apt-native.inc @@ -0,0 +1,64 @@ +require apt.inc +inherit native + +DEPENDS = "perl-native dpkg-native gettext-native" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/apt-${PV}" +PACKAGES = "" +USE_NLS = "yes" + +SRC_URI += "file://db_linking_hack.patch;patch=1" + +python do_stage () { + bb.build.exec_func('do_stage_base', d) + bb.build.exec_func('do_stage_config', d) +} + +python do_stage_config () { + indir = os.path.dirname(bb.data.getVar('FILE',d,1)) + infile = file(os.path.join(indir, 'files', 'apt.conf'), 'r') + data = infile.read() + infile.close() + + data = bb.data.expand(data, d) + + outdir = os.path.join(bb.data.getVar('sysconfdir', d, 1), 'apt') + if not os.path.exists(outdir): + os.makedirs(outdir) + outpath = os.path.join(outdir, 'apt.conf.sample') + + outfile = file(outpath, 'w') + outfile.write(data) + outfile.close() +} + +do_stage_base () { + install -d ${bindir} + install -m 0755 bin/apt-cdrom ${bindir}/ + install -m 0755 bin/apt-get ${bindir}/ + install -m 0755 bin/apt-config ${bindir}/ + install -m 0755 bin/apt-cache ${bindir}/ + install -m 0755 bin/apt-sortpkgs ${bindir}/ + install -m 0755 bin/apt-extracttemplates ${bindir}/ + + eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` + oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${libdir}/ + ln -sf libapt-pkg$GLIBC_VER-6.so ${libdir}/libapt-pkg.so + oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${libdir}/ + ln -sf libapt-inst$GLIBC_VER-6.so ${libdir}/libapt-inst.so + + install -d ${libdir}/apt/methods + install -m 0755 bin/methods/* ${libdir}/apt/methods/ + + install -d ${libdir}/dpkg/methods/apt + install -m 0644 dselect/desc.apt ${libdir}/dpkg/methods/apt/ + install -m 0644 dselect/names ${libdir}/dpkg/methods/apt/ + install -m 0755 dselect/install ${libdir}/dpkg/methods/apt/ + install -m 0755 dselect/setup ${libdir}/dpkg/methods/apt/ + install -m 0755 dselect/update ${libdir}/dpkg/methods/apt/ + + install -d ${sysconfdir}/apt + install -d ${localstatedir}/lib/apt/lists/partial + install -d ${localstatedir}/cache/apt/archives/partial + + install -d ${localstatedir}/log/apt/ +} diff --git a/recipes/apt/apt-native_0.6.46.2.bb b/recipes/apt/apt-native_0.6.46.2.bb new file mode 100644 index 0000000000..7bf69c01af --- /dev/null +++ b/recipes/apt/apt-native_0.6.46.2.bb @@ -0,0 +1,5 @@ +require apt-native.inc +PR = "r3" + +SRC_URI += "file://nodoc.patch;patch=1 \ + file://noconfigure.patch;patch=1" diff --git a/recipes/apt/apt-native_0.7.14.bb b/recipes/apt/apt-native_0.7.14.bb new file mode 100644 index 0000000000..7628bc9741 --- /dev/null +++ b/recipes/apt/apt-native_0.7.14.bb @@ -0,0 +1,6 @@ +require apt-native.inc +PR = "r3" + +SRC_URI += "file://nodoc.patch;patch=1 \ + file://noconfigure.patch;patch=1 \ + file://no-curl.patch;patch=1" diff --git a/recipes/apt/apt-native_0.7.19.bb b/recipes/apt/apt-native_0.7.19.bb new file mode 100644 index 0000000000..7628bc9741 --- /dev/null +++ b/recipes/apt/apt-native_0.7.19.bb @@ -0,0 +1,6 @@ +require apt-native.inc +PR = "r3" + +SRC_URI += "file://nodoc.patch;patch=1 \ + file://noconfigure.patch;patch=1 \ + file://no-curl.patch;patch=1" diff --git a/recipes/apt/apt-native_0.7.2.bb b/recipes/apt/apt-native_0.7.2.bb new file mode 100644 index 0000000000..4b6897fa44 --- /dev/null +++ b/recipes/apt/apt-native_0.7.2.bb @@ -0,0 +1,5 @@ +require apt-native.inc +PR = "r4" + +SRC_URI += "file://nodoc.patch;patch=1 \ + file://noconfigure.patch;patch=1" diff --git a/recipes/apt/apt-native_0.7.20.2.bb b/recipes/apt/apt-native_0.7.20.2.bb new file mode 100644 index 0000000000..2641cd243b --- /dev/null +++ b/recipes/apt/apt-native_0.7.20.2.bb @@ -0,0 +1,6 @@ +require apt-native.inc +PR = "r1" + +SRC_URI += "file://nodoc.patch;patch=1 \ + file://noconfigure.patch;patch=1 \ + file://no-curl.patch;patch=1" diff --git a/recipes/apt/apt-native_0.7.3.bb b/recipes/apt/apt-native_0.7.3.bb new file mode 100644 index 0000000000..f252bd382a --- /dev/null +++ b/recipes/apt/apt-native_0.7.3.bb @@ -0,0 +1,5 @@ +require apt-native.inc +PR = "r5" + +SRC_URI += "file://nodoc.patch;patch=1 \ + file://noconfigure.patch;patch=1" diff --git a/recipes/apt/apt-package.inc b/recipes/apt/apt-package.inc new file mode 100644 index 0000000000..2b4f6d54a8 --- /dev/null +++ b/recipes/apt/apt-package.inc @@ -0,0 +1,102 @@ +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\2/\1.\2', 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}-dbg += "${libdir}/apt/*/.debug" +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))} \ + ${docdir}/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 () { + 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 -so -C bin libapt-pkg$GLIBC_VER-6 ${D}${libdir}/ + ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so + oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${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/ +} diff --git a/recipes/apt/apt.inc b/recipes/apt/apt.inc new file mode 100644 index 0000000000..4a4de1788a --- /dev/null +++ b/recipes/apt/apt.inc @@ -0,0 +1,23 @@ +DESCRIPTION = "Advanced front-end for dpkg." +LICENSE = "GPL" +SECTION = "base" + +SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz" + +S = "${WORKDIR}/apt-${PV}" + +inherit autotools gettext + +EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" + +# Apt wants to know the glibc version by running a binary file, which will +# fail, so we have to tell configure which version to use Since I don't know +# the impliations of setting a wrong value I only provide one for angstrom, +# which uses glibc 2.5 (which claims to be 2.4) +# Koen - 20070327 +EXTRA_OECONF_append_angstrom = " ac_cv_glibc_ver=libc6.4" + +# under Debian it is set to libc6.3 as they use glibc 2.3 +# They also provide glibc 2.5 in 'experimental' and it works with APT built +# for 2.3 so we set it in same way +EXTRA_OECONF_append = " ac_cv_glibc_ver=libc6.3" diff --git a/recipes/apt/apt_0.5.28.6.bb b/recipes/apt/apt_0.5.28.6.bb new file mode 100644 index 0000000000..92f80ef031 --- /dev/null +++ b/recipes/apt/apt_0.5.28.6.bb @@ -0,0 +1,13 @@ +require apt.inc +PR = "r2" + +SRC_URI += "file://autofoo.patch;patch=1" + +inherit autotools gettext + +require apt-package.inc + +apt-manpages += "doc/vendors.list.5 \ + doc/fr/vendors.list.fr.5 \ + doc/es/vendors.list.es.5 \ + doc/de/apt.de.8" diff --git a/recipes/apt/apt_0.6.25.bb b/recipes/apt/apt_0.6.25.bb new file mode 100644 index 0000000000..23c9829f21 --- /dev/null +++ b/recipes/apt/apt_0.6.25.bb @@ -0,0 +1,11 @@ +require apt.inc +PR = "r3" + +SRC_URI += "file://autofoo.patch;patch=1" + +inherit autotools gettext + +require apt-package.inc + +FILES_${PN} += "${bindir}/apt-key" +apt-manpages += "doc/apt-key.8" diff --git a/recipes/apt/apt_0.6.46.2.bb b/recipes/apt/apt_0.6.46.2.bb new file mode 100644 index 0000000000..6410ec7683 --- /dev/null +++ b/recipes/apt/apt_0.6.46.2.bb @@ -0,0 +1,11 @@ +require apt.inc +PR = "r2" + +SRC_URI += "file://nodoc.patch;patch=1" + +require apt-package.inc + +FILES_${PN} += "${bindir}/apt-key" +apt-manpages += "doc/apt-key.8" + + diff --git a/recipes/apt/apt_0.7.14.bb b/recipes/apt/apt_0.7.14.bb new file mode 100644 index 0000000000..251ed6416d --- /dev/null +++ b/recipes/apt/apt_0.7.14.bb @@ -0,0 +1,27 @@ +DEPENDS = "curl db" +RDEPENDS = "dpkg" + +require apt.inc + +SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \ + file://no-ko-translation.patch;patch=1 \ + file://use-host.patch;patch=1 " +PR = "r2" + +SRC_URI += "file://nodoc.patch;patch=1" + +require apt-package.inc + +FILES_${PN} += "${bindir}/apt-key" +apt-manpages += "doc/apt-key.8" + +do_stage() { + install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/apt-pkg + eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` + oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${STAGING_LIBDIR}/ + ln -sf libapt-pkg$GLIBC_VER-6.so ${STAGING_LIBDIR}/libapt-pkg.so + oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${STAGING_LIBDIR}/ + ln -sf libapt-inst$GLIBC_VER-6.so ${STAGING_LIBDIR}/libapt-inst.so + + install -m 0644 include/apt-pkg/*.h ${STAGING_INCDIR}/apt-pkg/ +} diff --git a/recipes/apt/apt_0.7.19.bb b/recipes/apt/apt_0.7.19.bb new file mode 100644 index 0000000000..251ed6416d --- /dev/null +++ b/recipes/apt/apt_0.7.19.bb @@ -0,0 +1,27 @@ +DEPENDS = "curl db" +RDEPENDS = "dpkg" + +require apt.inc + +SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \ + file://no-ko-translation.patch;patch=1 \ + file://use-host.patch;patch=1 " +PR = "r2" + +SRC_URI += "file://nodoc.patch;patch=1" + +require apt-package.inc + +FILES_${PN} += "${bindir}/apt-key" +apt-manpages += "doc/apt-key.8" + +do_stage() { + install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/apt-pkg + eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` + oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${STAGING_LIBDIR}/ + ln -sf libapt-pkg$GLIBC_VER-6.so ${STAGING_LIBDIR}/libapt-pkg.so + oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${STAGING_LIBDIR}/ + ln -sf libapt-inst$GLIBC_VER-6.so ${STAGING_LIBDIR}/libapt-inst.so + + install -m 0644 include/apt-pkg/*.h ${STAGING_INCDIR}/apt-pkg/ +} diff --git a/recipes/apt/apt_0.7.2.bb b/recipes/apt/apt_0.7.2.bb new file mode 100644 index 0000000000..7f6bb81f6e --- /dev/null +++ b/recipes/apt/apt_0.7.2.bb @@ -0,0 +1,9 @@ +require apt.inc +PR = "r3" + +SRC_URI += "file://nodoc.patch;patch=1" + +require apt-package.inc + +FILES_${PN} += "${bindir}/apt-key" +apt-manpages += "doc/apt-key.8" diff --git a/recipes/apt/apt_0.7.20.2.bb b/recipes/apt/apt_0.7.20.2.bb new file mode 100644 index 0000000000..318b94c642 --- /dev/null +++ b/recipes/apt/apt_0.7.20.2.bb @@ -0,0 +1,26 @@ +DEPENDS = "curl db" +RDEPENDS = "dpkg" + +require apt.inc + +SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \ + file://no-ko-translation.patch;patch=1 \ + file://use-host.patch;patch=1 " + +SRC_URI += "file://nodoc.patch;patch=1" + +require apt-package.inc + +FILES_${PN} += "${bindir}/apt-key" +apt-manpages += "doc/apt-key.8" + +do_stage() { + install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/apt-pkg + eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` + oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${STAGING_LIBDIR}/ + ln -sf libapt-pkg$GLIBC_VER-6.so ${STAGING_LIBDIR}/libapt-pkg.so + oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${STAGING_LIBDIR}/ + ln -sf libapt-inst$GLIBC_VER-6.so ${STAGING_LIBDIR}/libapt-inst.so + + install -m 0644 include/apt-pkg/*.h ${STAGING_INCDIR}/apt-pkg/ +} diff --git a/recipes/apt/apt_0.7.3.bb b/recipes/apt/apt_0.7.3.bb new file mode 100644 index 0000000000..7f6bb81f6e --- /dev/null +++ b/recipes/apt/apt_0.7.3.bb @@ -0,0 +1,9 @@ +require apt.inc +PR = "r3" + +SRC_URI += "file://nodoc.patch;patch=1" + +require apt-package.inc + +FILES_${PN} += "${bindir}/apt-key" +apt-manpages += "doc/apt-key.8" diff --git a/recipes/apt/files/apt.conf b/recipes/apt/files/apt.conf new file mode 100644 index 0000000000..2bd9ddbfaf --- /dev/null +++ b/recipes/apt/files/apt.conf @@ -0,0 +1,43 @@ +Dir "${STAGING_DIR_NATIVE}/" +{ + State "var/lib/apt/" + { + Lists "lists/"; + status "${IMAGE_ROOTFS}/var/dpkg/status"; + }; + Cache "var/cache/apt/" + { + Archives "archives/"; + pkgcache ""; + srcpkgcache ""; + }; + Bin "${STAGING_BINDIR_NATIVE}/" + { + methods "${STAGING_LIBDIR}/apt/methods/"; + gzip "/bin/gzip"; + dpkg "dpkg"; + dpkg-source "dpkg-source"; + dpkg-buildpackage "dpkg-buildpackage"; + apt-get "apt-get"; + apt-cache "apt-cache"; + }; + Etc "etc/apt/" + { + Preferences "preferences"; + }; +}; + +APT +{ + Install-Recommends "true"; + Immediate-Configure "false"; + Architecture "i586"; + Get + { + Assume-Yes "true"; + Force-Yes "true" + }; +}; + +DPkg::Options {"--root=${IMAGE_ROOTFS}";"--admindir=${IMAGE_ROOTFS}/var/dpkg";"--force-all";"--no-debsig"}; +}; diff --git a/recipes/apt/files/db_linking_hack.patch b/recipes/apt/files/db_linking_hack.patch new file mode 100644 index 0000000000..3c8368b1ed --- /dev/null +++ b/recipes/apt/files/db_linking_hack.patch @@ -0,0 +1,27 @@ +Index: apt-0.7.3/configure.in +=================================================================== +--- apt-0.7.3.orig/configure.in 2007-07-01 10:38:45.000000000 +0000 ++++ apt-0.7.3/configure.in 2007-08-21 13:39:26.000000000 +0000 +@@ -67,8 +67,20 @@ + [AC_DEFINE(HAVE_BDB) + BDBLIB="-ldb" + AC_MSG_RESULT(yes)], +- [BDBLIB="" +- AC_MSG_RESULT(no)] ++ ++ LIBS="$LIBS -lpthread" ++ [AC_MSG_CHECKING(if we can link against BerkeleyDB with pthread) ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM( ++ [#include ], ++ [int r, s, t; db_version(&r, &s, &t);] ++ )], ++ [AC_DEFINE(HAVE_BDB) ++ BDBLIB="-ldb -lpthread" ++ AC_MSG_RESULT(yes)], ++ [BDBLIB="" ++ AC_MSG_RESULT(no)] ++ )] + )] + ) + diff --git a/recipes/apt/files/environment.patch b/recipes/apt/files/environment.patch new file mode 100644 index 0000000000..5bea1a0130 --- /dev/null +++ b/recipes/apt/files/environment.patch @@ -0,0 +1,13 @@ +Index: apt-0.6.46.2/buildlib/environment.mak.in +=================================================================== +--- apt-0.6.46.2.orig/buildlib/environment.mak.in 2007-03-29 11:38:58.000000000 +0100 ++++ apt-0.6.46.2/buildlib/environment.mak.in 2007-03-29 11:39:12.000000000 +0100 +@@ -62,7 +62,7 @@ + + # Shared library things + HOST_OS = @host_os@ +-ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0) ++ifneq ($(words $(filter linux-gnu linux-gnueabi gnu% %gnu,$(HOST_OS))),0) + SONAME_MAGIC=-Wl,-soname -Wl, + LFLAGS_SO= + else diff --git a/recipes/apt/files/no-curl.patch b/recipes/apt/files/no-curl.patch new file mode 100644 index 0000000000..4e07c8f2dc --- /dev/null +++ b/recipes/apt/files/no-curl.patch @@ -0,0 +1,44 @@ +--- + configure.in | 6 ------ + methods/makefile | 7 ------- + 2 files changed, 13 deletions(-) + +--- apt-0.7.14.orig/configure.in ++++ apt-0.7.14/configure.in +@@ -84,16 +84,10 @@ AC_CHECK_HEADER(db.h, + )] + ) + + LIBS="$saveLIBS" + +-AC_CHECK_LIB(curl, curl_easy_init, +- [AC_CHECK_HEADER(curl/curl.h, +- curl_ok=yes, +- curl_ok=no)], +- AC_MSG_ERROR([failed: I need CURL due https support]), +-) + + AC_SUBST(BDBLIB) + + dnl Converts the ARCH to be something singular for this general CPU family + dnl This is often the dpkg architecture string. +--- apt-0.7.14.orig/methods/makefile ++++ apt-0.7.14/methods/makefile +@@ -50,17 +50,10 @@ PROGRAM=http + SLIBS = -lapt-pkg $(SOCKETLIBS) + LIB_MAKES = apt-pkg/makefile + SOURCE = http.cc rfc2553emu.cc connect.cc + include $(PROGRAM_H) + +-# The https method +-PROGRAM=https +-SLIBS = -lapt-pkg -lcurl +-LIB_MAKES = apt-pkg/makefile +-SOURCE = https.cc +-include $(PROGRAM_H) +- + # The ftp method + PROGRAM=ftp + SLIBS = -lapt-pkg $(SOCKETLIBS) + LIB_MAKES = apt-pkg/makefile + SOURCE = ftp.cc rfc2553emu.cc connect.cc -- cgit 1.2.3-korg