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