dpkg: sync with poky

poky rev 696: "Add dpkg, modified from upstream oe."
poky rev 728: "Sync up.. all the deb/dpkg changes which I have locally are now in svn."
poky rev 843: "enable noman.patch to avoid building man directory (results in significant speedup)"
poky rev 844: "move noman.patch inclusion from dpkg.inc to dpkg_1.13.22.bb"

diff --git a/packages/dpkg/dpkg-native_1.13.22.bb b/packages/dpkg/dpkg-native_1.13.22.bb
index d5f439b..67e9306 100644 (file)
--- a/packages/dpkg/dpkg-native_1.13.22.bb
+++ b/packages/dpkg/dpkg-native_1.13.22.bb
@@ -1,5 +1,5 @@
 require dpkg.inc
-PR = "r0"
+PR = "r1"
 DEPENDS += "ncurses-native zlib-native virtual/update-alternatives-native"
 SRC_URI += "file://noman.patch;patch=1"
 

diff --git a/packages/dpkg/dpkg.inc b/packages/dpkg/dpkg.inc
index fb82fa4..90173aa 100644 (file)
--- a/packages/dpkg/dpkg.inc
+++ b/packages/dpkg/dpkg.inc
@@ -1,13 +1,14 @@
 DESCRIPTION = "Package maintenance system for Debian."
 LICENSE = "GPL"
 SECTION = "base"
-DEPENDS = "ncurses zlib"
-DEPENDS_${PN} += "update-alternatives"
 
+SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \
+           file://noupdalt.patch;patch=1"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz"
 S = "${WORKDIR}/dpkg-${PV}"
 
+RDEPENDS_${PN} += "update-alternatives"
+
 PARALLEL_MAKE = ""
 
 inherit autotools gettext

diff --git a/packages/dpkg/dpkg_1.13.22.bb b/packages/dpkg/dpkg_1.13.22.bb
index fd97f9f..deccb32 100644 (file)
--- a/packages/dpkg/dpkg_1.13.22.bb
+++ b/packages/dpkg/dpkg_1.13.22.bb
@@ -1,6 +1,7 @@
 require dpkg.inc
 PR = "r0"
 DEPENDS += "ncurses zlib bzip2"
+SRC_URI += "file://noman.patch;patch=1"
 
 EXTRA_OECONF = "--without-static-progs \
                --without-dselect \