[OE-core] [PATCH 1/1] util-linux: adjust hwclock ALTERNATIVE_PRIORITY
Joe Slater
jslater at windriver.com
Mon May 20 19:30:42 UTC 2013
Make ALTERNATIVE_PRIORITY[hwclock] dependent on an
OVERRIDE so that the hwclock from busybox, if available,
will be used for the nslu2 bsp.
Independently, add util-linux-agetty to RRECOMMENDS.
Signed-off-by: Joe Slater <jslater at windriver.com>
---
meta/recipes-core/util-linux/util-linux.inc | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index c783385..10493aa 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -88,7 +88,9 @@ RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
RDEPENDS_util-linux-reset += "ncurses"
RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup"
-RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs "
+RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \
+ util-linux-mount util-linux-readprofile util-linux-mkfs \
+ util-linux-agetty "
RRECOMMENDS_${PN}_class-native = ""
RDEPENDS_${PN}_class-native = ""
@@ -175,9 +177,10 @@ ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8"
ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1"
ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1"
-# There seems to be problem, atleast on nslu2, with these, untill they are
+# There seems to be problems, at least on nslu2, with these, until they are
# fixed the busybox ones have higher priority
-ALTERNATIVE_PRIORITY[hwclock] = "10"
+#
+ALTERNATIVE_PRIORITY[hwclock] = "${@['100', '10']['${OVERRIDES}'.find('nslu2') != -1]}"
ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock"
ALTERNATIVE_util-linux-fdisk = "fdisk"
--
1.7.3.4
More information about the Openembedded-core
mailing list