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-11 21:56:28 +0100
commit2ea1a73d264173d9dd8978d82de0d53e2c2164d3 (patch)
treeb748878b7c6817f33742efd339c9101221fd6290
parent1485d7cae88adb3575c6eaa47784fe50820d2740 (diff)
downloadopenembedded-core-contrib-2ea1a73d264173d9dd8978d82de0d53e2c2164d3.tar.gz
openembedded-core-contrib-2ea1a73d264173d9dd8978d82de0d53e2c2164d3.tar.bz2
openembedded-core-contrib-2ea1a73d264173d9dd8978d82de0d53e2c2164d3.zip
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 ] 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"
do_compile () {
set -e
- oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'
+ oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'
}
do_install () {
@@ -220,9 +220,6 @@ ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8"
ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3"
ALTERNATIVE_util-linux-hwclock = "hwclock"
-# There seems to be problem, atleast on nslu2, with these, untill they are
-# fixed the busybox ones have higher priority
-ALTERNATIVE_PRIORITY[hwclock] = "10"
ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock"
ALTERNATIVE_util-linux-fdisk = "fdisk"