Patchwork [1/1] util-linux: adjust hwclock ALTERNATIVE_PRIORITY

login
register
mail settings
Submitter Joe Slater
Date May 20, 2013, 7:30 p.m.
Message ID <1369078242-4032-2-git-send-email-jslater@windriver.com>
Download mbox | patch
Permalink /patch/50187/
State New
Headers show

Comments

Joe Slater - May 20, 2013, 7:30 p.m.
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@windriver.com>
---
 meta/recipes-core/util-linux/util-linux.inc |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
Saul Wold - May 30, 2013, 1:34 a.m.
On 05/21/2013 04:30 AM, Joe Slater wrote:
> 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@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 "
>
I think this patch should be sperated out since it has nothing to do 
with hwclock.

>   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"
>
I am not sure this is the right way to go with this, as I think it will 
make util-linux be MACHINE specific, which it should not be.

Can the nslu2 layer which seems to be maintained by Khem Raj take a 
patch that will set the ALTERNATIVE_PRIORITY of hwclock to 10, we might 
need to have a patch here:

ALTERNATIVE_PRIORITY[hwclock] ?= "100" so that it can be overridden by 
the layer?

Thoughts

Sau!


>   ALTERNATIVE_util-linux-fdisk = "fdisk"
>
Khem Raj - May 30, 2013, 2:23 a.m.
On Wed, May 29, 2013 at 6:34 PM, Saul Wold <sgw@linux.intel.com> wrote:
>
> Can the nslu2 layer which seems to be maintained by Khem Raj take a patch
> that will set the ALTERNATIVE_PRIORITY of hwclock to 10, we might need to
> have a patch here:

sure.

Patch

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"