diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-10-15 15:53:24 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-10-15 15:53:24 +0000 |
| commit | d9e8ff1a66a75665f2de749d32a818da5898dfc4 (patch) | |
| tree | 9ca4bf2eb689107bad6b26322fb3eade35df6c4a | |
| parent | 7992bb11863be27d12b9111c9d8a8a160b07cf3f (diff) | |
| download | openembedded-core-d9e8ff1a66a75665f2de749d32a818da5898dfc4.tar.gz openembedded-core-d9e8ff1a66a75665f2de749d32a818da5898dfc4.tar.bz2 openembedded-core-d9e8ff1a66a75665f2de749d32a818da5898dfc4.zip | |
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
| -rw-r--r-- | meta/packages/dpkg/dpkg-native_1.13.24.bb | 3 | ||||
| -rw-r--r-- | meta/packages/dpkg/dpkg.inc | 3 | ||||
| -rw-r--r-- | meta/packages/dpkg/dpkg_1.13.24.bb | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/meta/packages/dpkg/dpkg-native_1.13.24.bb b/meta/packages/dpkg/dpkg-native_1.13.24.bb index d97deab329..b21e95dd1f 100644 --- 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 5fab2a7e3a..1a8e7ec9aa 100644 --- 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 0d6ae5c5fb..81415f6b54 100644 --- 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 \ |