[OE-core] [PATCH v3] coreutils: add alternative target for nice

[Martin Jansa]

LGTM

On Thu, Sep 13, 2018 at 11:25 AM Jens Rehsack <sno at netbsd.org> wrote:

> Avoid coreutils conflicts with nice from other recipes, like
> busybox - even if that's not enabled by default.
> In situations, where coreutils is a dependency for -dev images
> and small busybox nice is available always, it avoids extra
> effort for coreutils for those users.
>
> Signed-off-by: Jens Rehsack <sno at netbsd.org>
> ---
>  meta/recipes-core/coreutils/coreutils_8.30.bb | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-core/coreutils/coreutils_8.30.bb
> b/meta/recipes-core/coreutils/coreutils_8.30.bb
> index 053891f6ea..eb1dd2a93a 100644
> --- a/meta/recipes-core/coreutils/coreutils_8.30.bb
> +++ b/meta/recipes-core/coreutils/coreutils_8.30.bb
> @@ -42,10 +42,10 @@ PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"
>  PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr,"
>  PACKAGECONFIG[single-binary] =
> "--enable-single-binary,--disable-single-binary,,"
>
> -# [ df mktemp base64 gets a special treatment and is not included in this
> +# [ df mktemp nice base64 gets a special treatment and is not included in
> this
>  bindir_progs = "arch basename chcon cksum comm csplit cut dir dircolors
> dirname du \
>                  env expand expr factor fmt fold groups head hostid id
> install \
> -                join link logname md5sum mkfifo nice nl nohup nproc od
> paste pathchk \
> +                join link logname md5sum mkfifo nl nohup nproc od paste
> pathchk \
>                  pinky pr printenv printf ptx readlink realpath runcon seq
> sha1sum sha224sum sha256sum \
>                  sha384sum sha512sum shred shuf sort split stdbuf sum tac
> tail tee test timeout\
>                  tr truncate tsort tty unexpand uniq unlink uptime users
> vdir wc who whoami yes"
> @@ -77,7 +77,7 @@ do_install_class-native() {
>  }
>
>  do_install_append() {
> -       for i in df mktemp base64; do mv ${D}${bindir}/$i
> ${D}${bindir}/$i.${BPN}; done
> +       for i in df mktemp nice base64; do mv ${D}${bindir}/$i
> ${D}${bindir}/$i.${BPN}; done
>
>         install -d ${D}${base_bindir}
>         [ "${base_bindir}" != "${bindir}" ] && for i in
> ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${BPN};
> done
> @@ -96,8 +96,8 @@ inherit update-alternatives
>  ALTERNATIVE_PRIORITY = "100"
>  # Make hostname's priority higher than busybox but lower than net-tools
>  ALTERNATIVE_PRIORITY[hostname] = "90"
> -ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs}
> ${sbindir_progs} base64 mktemp df"
> -ALTERNATIVE_${PN}-doc = "base64.1 mktemp.1 df.1 groups.1 kill.1 uptime.1
> stat.1  hostname.1"
> +ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs}
> ${sbindir_progs} base64 nice mktemp df"
> +ALTERNATIVE_${PN}-doc = "base64.1 nice.1 mktemp.1 df.1 groups.1 kill.1
> uptime.1 stat.1 hostname.1"
>
>  ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1"
>
> @@ -113,6 +113,10 @@ ALTERNATIVE_LINK_NAME[df] = "${base_bindir}/df"
>  ALTERNATIVE_TARGET[df] = "${bindir}/df.${BPN}"
>  ALTERNATIVE_LINK_NAME[df.1] = "${mandir}/man1/df.1"
>
> +ALTERNATIVE_LINK_NAME[nice] = "${base_bindir}/nice"
> +ALTERNATIVE_TARGET[nice] = "${bindir}/nice.${BPN}"
> +ALTERNATIVE_LINK_NAME[nice.1] = "${mandir}/man1/nice.1"
> +
>  ALTERNATIVE_LINK_NAME[lbracket] = "${bindir}/["
>  ALTERNATIVE_TARGET[lbracket] = "${bindir}/lbracket.${BPN}"
>
> --
> 2.17.1
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20180913/2c569870/attachment-0002.html>