[oe-commits] org.oe.dev apt: sync with poky
koen commit
openembedded-commits at lists.openembedded.org
Thu Aug 30 18:04:52 UTC 2007
apt: sync with poky
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 8a70ab8f28a3fdee3b2fc36c606b5813d99541ff
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8a70ab8f28a3fdee3b2fc36c606b5813d99541ff
Files:
1
packages/apt/apt-0.7.2
packages/apt/apt-0.7.2/noconfigure.patch
packages/apt/apt-0.7.2/nodoc.patch
packages/apt/apt-0.7.3/noconfigure.patch
packages/apt/apt-0.7.3/nodoc.patch
packages/apt/apt-native_0.7.3.bb
packages/apt/apt_0.7.2.bb
packages/apt/files/db_linking_hack.patch
packages/apt/apt-native.inc
packages/apt/apt-native_0.7.2.bb
packages/apt/apt-package.inc
packages/apt/apt.inc
packages/apt/apt_0.7.3.bb
packages/apt/files/apt.conf
Diffs:
#
# mt diff -rcfd703527d2707c8ebc507b2439a7420f5e5b6b6 -r8a70ab8f28a3fdee3b2fc36c606b5813d99541ff
#
#
#
# add_dir "packages/apt/apt-0.7.2"
#
# add_file "packages/apt/apt-0.7.2/noconfigure.patch"
# content [7a699aa22ec66db96f1c74509c516248667eecc6]
#
# add_file "packages/apt/apt-0.7.2/nodoc.patch"
# content [431fc02b36a1717361e00c039d9b5e76fed2400e]
#
# add_file "packages/apt/apt-0.7.3/noconfigure.patch"
# content [7a699aa22ec66db96f1c74509c516248667eecc6]
#
# add_file "packages/apt/apt-0.7.3/nodoc.patch"
# content [431fc02b36a1717361e00c039d9b5e76fed2400e]
#
# add_file "packages/apt/apt-native_0.7.3.bb"
# content [8dc4f447d98f36e642ab9f2f30fcdbee93e157fa]
#
# add_file "packages/apt/apt_0.7.2.bb"
# content [63322e840f089261ba0cacb99e97bda6eb5b1998]
#
# add_file "packages/apt/files/db_linking_hack.patch"
# content [78e814b56591e57d0dc5f24daa3ddffd16c9cb75]
#
# patch "packages/apt/apt-native.inc"
# from [a769f6140c62cd893e6a1e6db61328f9fcedd298]
# to [7d71c4e22b26c5f9a8250469cdc9224ede94d19b]
#
# patch "packages/apt/apt-native_0.7.2.bb"
# from [4fff433a631dd3b390cedffba74b1a4f6e27c067]
# to [df9f37be753866b1cc3ed597d51f32c1b95bfb30]
#
# patch "packages/apt/apt-package.inc"
# from [98879b990295f5dc07b4370ea749543c96919432]
# to [776b438ed4e20204678a1baba2ed113b69e73334]
#
# patch "packages/apt/apt.inc"
# from [c2c9cd779cbedaf6c40ab6784a3a8396eed51497]
# to [d69d638878972a4e5bbfd066a98930704fc107e5]
#
# patch "packages/apt/apt_0.7.3.bb"
# from [f19c6a43f30f0f7b3b2bb4f99efa8133afc8082c]
# to [b35d540f7bc7597c24ad2ee48b326f68b11b2a73]
#
# patch "packages/apt/files/apt.conf"
# from [a11cde2c27f3b4a221c40eeca244e9a87cdf1a09]
# to [efa1759f4e7e6b32306177bf4462c89759ca5466]
#
============================================================
--- packages/apt/apt-0.7.2/noconfigure.patch 7a699aa22ec66db96f1c74509c516248667eecc6
+++ packages/apt/apt-0.7.2/noconfigure.patch 7a699aa22ec66db96f1c74509c516248667eecc6
@@ -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;
+ }
============================================================
--- packages/apt/apt-0.7.2/nodoc.patch 431fc02b36a1717361e00c039d9b5e76fed2400e
+++ packages/apt/apt-0.7.2/nodoc.patch 431fc02b36a1717361e00c039d9b5e76fed2400e
@@ -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
============================================================
--- packages/apt/apt-0.7.3/noconfigure.patch 7a699aa22ec66db96f1c74509c516248667eecc6
+++ packages/apt/apt-0.7.3/noconfigure.patch 7a699aa22ec66db96f1c74509c516248667eecc6
@@ -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;
+ }
============================================================
--- packages/apt/apt-0.7.3/nodoc.patch 431fc02b36a1717361e00c039d9b5e76fed2400e
+++ packages/apt/apt-0.7.3/nodoc.patch 431fc02b36a1717361e00c039d9b5e76fed2400e
@@ -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
============================================================
--- packages/apt/apt-native_0.7.3.bb 8dc4f447d98f36e642ab9f2f30fcdbee93e157fa
+++ packages/apt/apt-native_0.7.3.bb 8dc4f447d98f36e642ab9f2f30fcdbee93e157fa
@@ -0,0 +1,5 @@
+require apt-native.inc
+PR = "r2"
+
+SRC_URI += "file://nodoc.patch;patch=1 \
+ file://noconfigure.patch;patch=1"
============================================================
--- packages/apt/apt_0.7.2.bb 63322e840f089261ba0cacb99e97bda6eb5b1998
+++ packages/apt/apt_0.7.2.bb 63322e840f089261ba0cacb99e97bda6eb5b1998
@@ -0,0 +1,9 @@
+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"
============================================================
--- packages/apt/files/db_linking_hack.patch 78e814b56591e57d0dc5f24daa3ddffd16c9cb75
+++ packages/apt/files/db_linking_hack.patch 78e814b56591e57d0dc5f24daa3ddffd16c9cb75
@@ -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 <db.h>],
++ [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)]
++ )]
+ )]
+ )
+
============================================================
--- packages/apt/apt-native.inc a769f6140c62cd893e6a1e6db61328f9fcedd298
+++ packages/apt/apt-native.inc 7d71c4e22b26c5f9a8250469cdc9224ede94d19b
@@ -1,11 +1,13 @@ inherit native
require apt.inc
inherit native
-DEPENDS += "dpkg-native curl-native"
+DEPENDS += "dpkg-native curl-native db-native"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/apt-${PV}"
PACKAGES = ""
USE_NLS = "no"
+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)
@@ -22,7 +24,7 @@ python do_stage_config () {
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')
+ outpath = os.path.join(outdir, 'apt.conf.sample')
outfile = file(outpath, 'w')
outfile.write(data)
@@ -35,7 +37,7 @@ do_stage_base () {
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-ftparchive ${bindir}/
install -m 0755 bin/apt-sortpkgs ${bindir}/
install -m 0755 bin/apt-extracttemplates ${bindir}/
============================================================
--- packages/apt/apt-native_0.7.2.bb 4fff433a631dd3b390cedffba74b1a4f6e27c067
+++ packages/apt/apt-native_0.7.2.bb df9f37be753866b1cc3ed597d51f32c1b95bfb30
@@ -1,4 +1,5 @@ require apt-native.inc
require apt-native.inc
+PR = "r1"
SRC_URI += "file://nodoc.patch;patch=1 \
file://noconfigure.patch;patch=1"
============================================================
--- packages/apt/apt-package.inc 98879b990295f5dc07b4370ea749543c96919432
+++ packages/apt/apt-package.inc 776b438ed4e20204678a1baba2ed113b69e73334
@@ -77,18 +77,11 @@ do_install () {
install -m 0755 bin/apt-sortpkgs ${D}${bindir}/
install -m 0755 bin/apt-extracttemplates ${D}${bindir}/
- install -d ${D}${libdir}
eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'`
- eval `cat apt-pkg/makefile | grep ^MAJOR | sed -e's, = ,=,'`
- eval `cat apt-pkg/makefile | grep ^MINOR | sed -e's, = ,=,'`
- install bin/libapt-pkg$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/
- ln -sf libapt-pkg$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-pkg$GLIBC_VER-6.so.$MAJOR
- ln -sf libapt-pkg$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-pkg.so
- eval `cat apt-inst/makefile | grep ^MAJOR | sed -e's, = ,=,'`
- eval `cat apt-inst/makefile | grep ^MINOR | sed -e's, = ,=,'`
- install bin/libapt-inst$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/
- ln -sf libapt-inst$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-inst$GLIBC_VER-6.so.$MAJOR
- ln -sf libapt-inst$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-inst.so
+ 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/
============================================================
--- packages/apt/apt.inc c2c9cd779cbedaf6c40ab6784a3a8396eed51497
+++ packages/apt/apt.inc d69d638878972a4e5bbfd066a98930704fc107e5
@@ -1,6 +1,8 @@ SECTION = "base"
DESCRIPTION = "Advanced front-end for dpkg."
LICENSE = "GPL"
SECTION = "base"
+DEPENDS = "curl db"
+RDEPENDS = "dpkg"
SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \
file://environment.patch;patch=1"
@@ -10,10 +12,14 @@ EXTRA_AUTORECONF = "--exclude=autopoint,
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)
+# 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"
-FILES_${PN}-dbg += "${libdir}/apt/methods/.debug"
-
============================================================
--- packages/apt/apt_0.7.3.bb f19c6a43f30f0f7b3b2bb4f99efa8133afc8082c
+++ packages/apt/apt_0.7.3.bb b35d540f7bc7597c24ad2ee48b326f68b11b2a73
@@ -1,4 +1,5 @@ require apt.inc
require apt.inc
+PR = "r1"
SRC_URI += "file://nodoc.patch;patch=1"
@@ -6,6 +7,3 @@ apt-manpages += "doc/apt-key.8"
FILES_${PN} += "${bindir}/apt-key"
apt-manpages += "doc/apt-key.8"
-
-PR = "r1"
-
============================================================
--- packages/apt/files/apt.conf a11cde2c27f3b4a221c40eeca244e9a87cdf1a09
+++ packages/apt/files/apt.conf efa1759f4e7e6b32306177bf4462c89759ca5466
@@ -29,6 +29,7 @@ APT
APT
{
+ Install-Recommends "true";
Immediate-Configure "false";
Architecture "i586";
Get
More information about the Openembedded-commits
mailing list