[oe-commits] [openembedded-core] 03/08: util-linux: take ownership of hwclock if installed

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 2ea1a73d264173d9dd8978d82de0d53e2c2164d3
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Mon Apr 11 21:43:34 2016 +0100

    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 at 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 at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-core/util-linux/util-linux.inc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index c2a91e1..a1614c2 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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.