summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-10-15 15:53:24 +0000
committerRichard Purdie <richard@openedhand.com>2007-10-15 15:53:24 +0000
commitd9e8ff1a66a75665f2de749d32a818da5898dfc4 (patch)
tree9ca4bf2eb689107bad6b26322fb3eade35df6c4a
parent7992bb11863be27d12b9111c9d8a8a160b07cf3f (diff)
downloadpoky-d9e8ff1a66a75665f2de749d32a818da5898dfc4.tar.gz
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.bb3
-rw-r--r--meta/packages/dpkg/dpkg.inc3
-rw-r--r--meta/packages/dpkg/dpkg_1.13.24.bb2
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 @@
1require dpkg.inc 1require dpkg.inc
2PR = "r3" 2DEPENDS += "ncurses-native bzip2-native zlib-native virtual/update-alternatives-native"
3DEPENDS += "zlib-native virtual/update-alternatives-native"
4SRC_URI += "file://noman.patch;patch=1" 3SRC_URI += "file://noman.patch;patch=1"
5 4
6inherit native 5inherit 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 @@
1DESCRIPTION = "Package maintenance system for Debian." 1DESCRIPTION = "Package maintenance system for Debian."
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "base" 3SECTION = "base"
4PR = "r5"
4 5
5SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \ 6SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \
6 file://ignore_extra_fields.patch;patch=1 \ 7 file://ignore_extra_fields.patch;patch=1 \
@@ -8,8 +9,6 @@ SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \
8 9
9S = "${WORKDIR}/dpkg-${PV}" 10S = "${WORKDIR}/dpkg-${PV}"
10 11
11DEPENDS_${PN} += "update-alternatives"
12
13PARALLEL_MAKE = "" 12PARALLEL_MAKE = ""
14 13
15inherit autotools gettext 14inherit 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 @@
1require dpkg.inc 1require dpkg.inc
2PR = "r4"
3DEPENDS += "ncurses zlib bzip2" 2DEPENDS += "ncurses zlib bzip2"
3RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}"
4SRC_URI += "file://noman.patch;patch=1" 4SRC_URI += "file://noman.patch;patch=1"
5 5
6EXTRA_OECONF = "--without-static-progs \ 6EXTRA_OECONF = "--without-static-progs \