dpkg: Fix update-alternatives dependencies and remove bogus variables

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2883 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/dpkg/dpkg-native_1.13.24.bb b/meta/packages/dpkg/dpkg-native_1.13.24.bb
index d97deab3290d2eb83f3d970ac8fd250c474ffe59..b21e95dd1f1ed49dea0bc7df239160fe681e75a4 100644 (file)
--- a/meta/packages/dpkg/dpkg-native_1.13.24.bb
+++ b/meta/packages/dpkg/dpkg-native_1.13.24.bb
@@ -1,6 +1,5 @@
 require dpkg.inc
-PR = "r3"
-DEPENDS += "zlib-native virtual/update-alternatives-native"
+DEPENDS += "ncurses-native bzip2-native zlib-native virtual/update-alternatives-native"
 SRC_URI += "file://noman.patch;patch=1"
 
 inherit native

diff --git a/meta/packages/dpkg/dpkg.inc b/meta/packages/dpkg/dpkg.inc
index 5fab2a7e3aa483ecd978634be5dd93d878ea5561..1a8e7ec9aab66c2a56bb75f2a9e89857505e9c22 100644 (file)
--- a/meta/packages/dpkg/dpkg.inc
+++ b/meta/packages/dpkg/dpkg.inc
@@ -1,6 +1,7 @@
 DESCRIPTION = "Package maintenance system for Debian."
 LICENSE = "GPL"
 SECTION = "base"
+PR = "r5"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \
            file://ignore_extra_fields.patch;patch=1 \
@@ -8,8 +9,6 @@ SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \
 
 S = "${WORKDIR}/dpkg-${PV}"
 
-DEPENDS_${PN} += "update-alternatives"
-
 PARALLEL_MAKE = ""
 
 inherit autotools gettext

diff --git a/meta/packages/dpkg/dpkg_1.13.24.bb b/meta/packages/dpkg/dpkg_1.13.24.bb
index 0d6ae5c5fb0e92219a265cab0f36b3d3e5f06afb..81415f6b540d7d9cea653d0de526aff0012ebecd 100644 (file)
--- a/meta/packages/dpkg/dpkg_1.13.24.bb
+++ b/meta/packages/dpkg/dpkg_1.13.24.bb
@@ -1,6 +1,6 @@
 require dpkg.inc
-PR = "r4"
 DEPENDS += "ncurses zlib bzip2"
+RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}"
 SRC_URI += "file://noman.patch;patch=1"
 
 EXTRA_OECONF = "--without-static-progs \