From 1e6f5d36fe5b595b4d36c19ff243a32c6fa0d750 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 1 Jul 2007 17:05:43 +0000 Subject: apt: 0.6.46 -> 0.7.2 (and fix DEPENDS/RDEPENDS) git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2070 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/apt/apt-0.6.46.2/noconfigure.patch | 35 ------------------------ meta/packages/apt/apt-0.6.46.2/nodoc.patch | 15 ---------- meta/packages/apt/apt-0.7.2/noconfigure.patch | 35 ++++++++++++++++++++++++ meta/packages/apt/apt-0.7.2/nodoc.patch | 15 ++++++++++ meta/packages/apt/apt-native.inc | 2 +- meta/packages/apt/apt-native_0.6.46.2.bb | 4 --- meta/packages/apt/apt-native_0.7.2.bb | 4 +++ meta/packages/apt/apt.inc | 2 ++ meta/packages/apt/apt_0.6.46.2.bb | 9 ------ meta/packages/apt/apt_0.7.2.bb | 9 ++++++ 10 files changed, 66 insertions(+), 64 deletions(-) delete mode 100644 meta/packages/apt/apt-0.6.46.2/noconfigure.patch delete mode 100644 meta/packages/apt/apt-0.6.46.2/nodoc.patch create mode 100644 meta/packages/apt/apt-0.7.2/noconfigure.patch create mode 100644 meta/packages/apt/apt-0.7.2/nodoc.patch delete mode 100644 meta/packages/apt/apt-native_0.6.46.2.bb create mode 100644 meta/packages/apt/apt-native_0.7.2.bb delete mode 100644 meta/packages/apt/apt_0.6.46.2.bb create mode 100644 meta/packages/apt/apt_0.7.2.bb (limited to 'meta/packages') diff --git a/meta/packages/apt/apt-0.6.46.2/noconfigure.patch b/meta/packages/apt/apt-0.6.46.2/noconfigure.patch deleted file mode 100644 index 682a96da24..0000000000 --- a/meta/packages/apt/apt-0.6.46.2/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/meta/packages/apt/apt-0.6.46.2/nodoc.patch b/meta/packages/apt/apt-0.6.46.2/nodoc.patch deleted file mode 100644 index 9101847189..0000000000 --- a/meta/packages/apt/apt-0.6.46.2/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/meta/packages/apt/apt-0.7.2/noconfigure.patch b/meta/packages/apt/apt-0.7.2/noconfigure.patch new file mode 100644 index 0000000000..682a96da24 --- /dev/null +++ b/meta/packages/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/meta/packages/apt/apt-0.7.2/nodoc.patch b/meta/packages/apt/apt-0.7.2/nodoc.patch new file mode 100644 index 0000000000..9101847189 --- /dev/null +++ b/meta/packages/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/meta/packages/apt/apt-native.inc b/meta/packages/apt/apt-native.inc index 763ab17d13..942f4991d3 100644 --- a/meta/packages/apt/apt-native.inc +++ b/meta/packages/apt/apt-native.inc @@ -1,7 +1,7 @@ require apt.inc inherit native -DEPENDS += "dpkg-native" +DEPENDS += "dpkg-native curl-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/apt-${PV}" PACKAGES = "" USE_NLS = "no" diff --git a/meta/packages/apt/apt-native_0.6.46.2.bb b/meta/packages/apt/apt-native_0.6.46.2.bb deleted file mode 100644 index 43f73889f7..0000000000 --- a/meta/packages/apt/apt-native_0.6.46.2.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/meta/packages/apt/apt-native_0.7.2.bb b/meta/packages/apt/apt-native_0.7.2.bb new file mode 100644 index 0000000000..43f73889f7 --- /dev/null +++ b/meta/packages/apt/apt-native_0.7.2.bb @@ -0,0 +1,4 @@ +require apt-native.inc + +SRC_URI += "file://nodoc.patch;patch=1 \ + file://noconfigure.patch;patch=1" diff --git a/meta/packages/apt/apt.inc b/meta/packages/apt/apt.inc index 972828c6d9..6c9632e8ff 100644 --- a/meta/packages/apt/apt.inc +++ b/meta/packages/apt/apt.inc @@ -1,6 +1,8 @@ DESCRIPTION = "Advanced front-end for dpkg." LICENSE = "GPL" SECTION = "base" +DEPENDS = "curl" +RDEPENDS = "dpkg" SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \ file://environment.patch;patch=1" diff --git a/meta/packages/apt/apt_0.6.46.2.bb b/meta/packages/apt/apt_0.6.46.2.bb deleted file mode 100644 index 2a7f963d2f..0000000000 --- a/meta/packages/apt/apt_0.6.46.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -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/meta/packages/apt/apt_0.7.2.bb b/meta/packages/apt/apt_0.7.2.bb new file mode 100644 index 0000000000..2a7f963d2f --- /dev/null +++ b/meta/packages/apt/apt_0.7.2.bb @@ -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" -- cgit v1.2.3