summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-04-11 21:43:34 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-12 22:50:21 +0100
commit57be6dddeb6ef24ad429fd7a10b1a059bc31743a (patch)
tree558d789aeea53fb6ccbbf94fd4f240a79e133a4c
parentacc1f968a047f83442aac1ac876212b2512756d9 (diff)
downloadpoky-57be6dddeb6ef24ad429fd7a10b1a059bc31743a.tar.gz
util-linux: take ownership of hwclock if installed
Previously util-linux had a lower priority for hwclock than busybox but the reasoning was lost in the mists of time, with just this enigmatic comment remaining: There seems to be problem, atleast on nslu2, with these, until they are fixed the busybox ones have higher priority. Chasing the comment back through history it first appeared in the following oe-classic commit: commit 5e01906b8433bc6a8c03be2e31758589641124c9 Author: David Karlstrom <daka@thg.se> Date: Sat Jul 23 13:36:38 2005 +0000 Updated to use update-alternatives and fix some FHS bugs Which doesn't really give a lot away. Let's assume that in the past eleven years both hwclock and hardware have improved, and restore util-linux's hwclock to it's intended priority. [ YOCTO #9103 ] (From OE-Core rev: 2ea1a73d264173d9dd8978d82de0d53e2c2164d3) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc5
1 files changed, 1 insertions, 4 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index c2a91e1086..a1614c22fa 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -132,7 +132,7 @@ SYSTEMD_AUTO_ENABLE_${PN}-fstrim = "disable"
132 132
133do_compile () { 133do_compile () {
134 set -e 134 set -e
135 oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}' 135 oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'
136} 136}
137 137
138do_install () { 138do_install () {
@@ -220,9 +220,6 @@ ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8"
220ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3" 220ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3"
221 221
222ALTERNATIVE_util-linux-hwclock = "hwclock" 222ALTERNATIVE_util-linux-hwclock = "hwclock"
223# There seems to be problem, atleast on nslu2, with these, untill they are
224# fixed the busybox ones have higher priority
225ALTERNATIVE_PRIORITY[hwclock] = "10"
226ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" 223ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock"
227 224
228ALTERNATIVE_util-linux-fdisk = "fdisk" 225ALTERNATIVE_util-linux-fdisk = "fdisk"