summaryrefslogtreecommitdiff
path: root/meta/packages
diff options
context:
space:
mode:
authorDodji Seketeli <dodji@openedhand.com>2007-07-23 15:29:33 +0000
committerDodji Seketeli <dodji@openedhand.com>2007-07-23 15:29:33 +0000
commit60548d86c5aa663827c3a24c06ca963a45049789 (patch)
tree387b5294f548e8dea769b2c739147f3a637c9fe7 /meta/packages
parentd93f4d82ed2caeb137f858415ec7c7b410957926 (diff)
downloadopenembedded-core-60548d86c5aa663827c3a24c06ca963a45049789.tar.gz
openembedded-core-60548d86c5aa663827c3a24c06ca963a45049789.tar.bz2
openembedded-core-60548d86c5aa663827c3a24c06ca963a45049789.tar.xz
openembedded-core-60548d86c5aa663827c3a24c06ca963a45049789.zip
switch from apt 0.7.2 to 0.7.3
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2211 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/apt/apt-0.7.3/noconfigure.patch35
-rw-r--r--meta/packages/apt/apt-0.7.3/nodoc.patch15
-rw-r--r--meta/packages/apt/apt-native_0.7.3.bb4
-rw-r--r--meta/packages/apt/apt_0.7.3.bb9
4 files changed, 63 insertions, 0 deletions
diff --git a/meta/packages/apt/apt-0.7.3/noconfigure.patch b/meta/packages/apt/apt-0.7.3/noconfigure.patch
new file mode 100644
index 000000000..682a96da2
--- /dev/null
+++ b/meta/packages/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/meta/packages/apt/apt-0.7.3/nodoc.patch b/meta/packages/apt/apt-0.7.3/nodoc.patch
new file mode 100644
index 000000000..910184718
--- /dev/null
+++ b/meta/packages/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/meta/packages/apt/apt-native_0.7.3.bb b/meta/packages/apt/apt-native_0.7.3.bb
new file mode 100644
index 000000000..43f73889f
--- /dev/null
+++ b/meta/packages/apt/apt-native_0.7.3.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_0.7.3.bb b/meta/packages/apt/apt_0.7.3.bb
new file mode 100644
index 000000000..c4cf06544
--- /dev/null
+++ b/meta/packages/apt/apt_0.7.3.bb
@@ -0,0 +1,9 @@
+require apt.inc
+PR = "r1"
+
+SRC_URI += "file://nodoc.patch;patch=1"
+
+require apt-package.inc
+
+FILES_${PN} += "${bindir}/apt-key"
+apt-manpages += "doc/apt-key.8"