From 0038a030e605195284c98bc154f500a1343c252b Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 14 Mar 2012 14:10:23 +0000 Subject: 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. Signed-off-by: Paul Eggleton --- meta/recipes-core/util-linux/util-linux.inc | 2 +- meta/recipes-core/util-linux/util-linux_2.21.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta') 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 inherit autotools gettext pkgconfig DEPENDS = "zlib ncurses" -DEPENDS_virtclass-native = " lzo-native" +DEPENDS_append_virtclass-native = " lzo-native" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \ 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 @@ MAJOR_VERSION = "2.21" -PR = "r4" +PR = "r5" require util-linux.inc # note that `lscpu' is under GPLv3+ -- cgit v1.2.3