[oe-commits] Paul Eggleton : util-linux: restore zlib and ncurses dependencies for native

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 0038a030e605195284c98bc154f500a1343c252b
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=0038a030e605195284c98bc154f500a1343c252b

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Wed Mar 14 14:10:23 2012 +0000

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 <paul.eggleton at linux.intel.com>

---

 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(-)

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index e2d354f..024b55c 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 d899dd3..ab26fcd 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+