[oe-commits] Thomas Zimmermann : shr/merge: utils-linux-ng: fix build

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 3cb3a0e5d2162444e9d4ff8bef1d7c5b14f15a3c
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3cb3a0e5d2162444e9d4ff8bef1d7c5b14f15a3c

Author: Thomas Zimmermann <zimmermann at vdm-design.de>
Date:   Wed Oct 14 20:17:35 2009 +0000

shr/merge: utils-linux-ng: fix build

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 conf/distro/include/preferred-shr-versions.inc |    4 ++--
 recipes/blktool/blktool_4.bb                   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 2052577..0ae6ae3 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -1378,7 +1378,7 @@ PREFERRED_VERSION_opensp ?= "1.5"
 PREFERRED_VERSION_opensp-native ?= "1.5"
 PREFERRED_VERSION_openssh ?= "4.6p1"
 PREFERRED_VERSION_openssl ?= "0.9.8j"
-PREFERRED_VERSION_openssl-native ?= "0.9.8g"
+PREFERRED_VERSION_openssl-native ?= "0.9.8j"
 PREFERRED_VERSION_openswan ?= "2.4.7"
 PREFERRED_VERSION_openttd ?= "0.6.3"
 PREFERRED_VERSION_openvpn ?= "2.0.9"
@@ -1932,7 +1932,7 @@ PREFERRED_VERSION_usound ?= "0.2.0"
 PREFERRED_VERSION_usrp ?= "0.12"
 PREFERRED_VERSION_util-linux ?= "2.12r"
 PREFERRED_VERSION_util-linux-native ?= "2.12r"
-PREFERRED_VERSION_util-linux-ng ?= "2.15"
+PREFERRED_VERSION_util-linux-ng ?= "2.16"
 PREFERRED_VERSION_util-macros ?= "1.1.5"
 PREFERRED_VERSION_util-macros-native ?= "1.1.5"
 PREFERRED_VERSION_uucp ?= "1.07"
diff --git a/recipes/blktool/blktool_4.bb b/recipes/blktool/blktool_4.bb
index 628c42b..8375f4d 100644
--- a/recipes/blktool/blktool_4.bb
+++ b/recipes/blktool/blktool_4.bb
@@ -2,10 +2,10 @@ DESCRIPTION = "Display or change block device settings"
 LICENSE = "GPLv2"
 
 DEPENDS = "glib-2.0"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/b/blktool/blktool_4.orig.tar.gz"
 
 S = "${WORKDIR}/${PN}-${PV}.orig"
 
-inherit pkgconfig
+inherit pkgconfig autotools