summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-03-14 14:10:23 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-16 10:57:09 +0000
commit24d15606096b79bdf9961f99b6857ae138fa3da1 (patch)
tree3a2b98b33d3d804dee78cb214e19132bb98b9801
parent510feb640a46b94fea3777c08b7b2f233d59c600 (diff)
downloadpoky-24d15606096b79bdf9961f99b6857ae138fa3da1.tar.gz
util-linux: restore zlib and ncurses dependencies for native
OE-Core commit 4a158b6ef125b555225472eefbe1ea226dc47c2c unintentionally removed the dependencies for util-linux-native on zlib-native and ncurses-native by getting append and virtclass-native overrides swapped around; later this was tidied up to remove the append (which did not change anything functionally). These libraries are required, so add them back in. (From OE-Core rev: 0038a030e605195284c98bc154f500a1343c252b) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc2
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.21.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index e2d354f948..024b55cf85 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=9c920d811858a74b67a36ba23cbaa95f
17 17
18inherit autotools gettext pkgconfig 18inherit autotools gettext pkgconfig
19DEPENDS = "zlib ncurses" 19DEPENDS = "zlib ncurses"
20DEPENDS_virtclass-native = " lzo-native" 20DEPENDS_append_virtclass-native = " lzo-native"
21 21
22SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \ 22SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \
23 file://MCONFIG \ 23 file://MCONFIG \
diff --git a/meta/recipes-core/util-linux/util-linux_2.21.bb b/meta/recipes-core/util-linux/util-linux_2.21.bb
index d899dd3b1b..ab26fcd99a 100644
--- a/meta/recipes-core/util-linux/util-linux_2.21.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.21.bb
@@ -1,5 +1,5 @@
1MAJOR_VERSION = "2.21" 1MAJOR_VERSION = "2.21"
2PR = "r4" 2PR = "r5"
3require util-linux.inc 3require util-linux.inc
4 4
5# note that `lscpu' is under GPLv3+ 5# note that `lscpu' is under GPLv3+