diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2018-09-17 05:48:42 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-20 05:41:31 -0700 |
commit | 23a0378f1873c2cffc647d318eafcb47143aa8d7 (patch) | |
tree | 9c7e38430f70dbd535086d132e28cb130c1443b7 /meta/recipes-core/coreutils | |
parent | 19c64533eb3f039ab18be21b436f7cc9d0897916 (diff) | |
download | poky-23a0378f1873c2cffc647d318eafcb47143aa8d7.tar.gz |
coreutils: update printenv's ALTERNATIVE_LINK_NAME
* use base_bindir like busybox does to prevent conflicting u-a configs
(From OE-Core rev: ae947ffd0c1531b6a3df250199bff38cce2f5533)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/coreutils')
-rw-r--r-- | meta/recipes-core/coreutils/coreutils_8.30.bb | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/meta/recipes-core/coreutils/coreutils_8.30.bb b/meta/recipes-core/coreutils/coreutils_8.30.bb index eb1dd2a93a..205ba4a0aa 100644 --- a/meta/recipes-core/coreutils/coreutils_8.30.bb +++ b/meta/recipes-core/coreutils/coreutils_8.30.bb | |||
@@ -42,12 +42,12 @@ PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," | |||
42 | PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," | 42 | PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," |
43 | PACKAGECONFIG[single-binary] = "--enable-single-binary,--disable-single-binary,," | 43 | PACKAGECONFIG[single-binary] = "--enable-single-binary,--disable-single-binary,," |
44 | 44 | ||
45 | # [ df mktemp nice base64 gets a special treatment and is not included in this | 45 | # [ df mktemp nice printenv base64 gets a special treatment and is not included in this |
46 | bindir_progs = "arch basename chcon cksum comm csplit cut dir dircolors dirname du \ | 46 | bindir_progs = "arch basename chcon cksum comm csplit cut dir dircolors dirname du \ |
47 | env expand expr factor fmt fold groups head hostid id install \ | 47 | env expand expr factor fmt fold groups head hostid id install \ |
48 | join link logname md5sum mkfifo nl nohup nproc od paste pathchk \ | 48 | join link logname md5sum mkfifo nl nohup nproc od paste pathchk \ |
49 | pinky pr printenv printf ptx readlink realpath runcon seq sha1sum sha224sum sha256sum \ | 49 | pinky pr printf ptx readlink realpath runcon seq sha1sum sha224sum sha256sum \ |
50 | sha384sum sha512sum shred shuf sort split stdbuf sum tac tail tee test timeout\ | 50 | sha384sum sha512sum shred shuf sort split stdbuf sum tac tail tee test timeout \ |
51 | tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes" | 51 | tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes" |
52 | 52 | ||
53 | # hostname gets a special treatment and is not included in this | 53 | # hostname gets a special treatment and is not included in this |
@@ -77,7 +77,7 @@ do_install_class-native() { | |||
77 | } | 77 | } |
78 | 78 | ||
79 | do_install_append() { | 79 | do_install_append() { |
80 | for i in df mktemp nice base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${BPN}; done | 80 | for i in df mktemp nice printenv base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${BPN}; done |
81 | 81 | ||
82 | install -d ${D}${base_bindir} | 82 | install -d ${D}${base_bindir} |
83 | [ "${base_bindir}" != "${bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${BPN}; done | 83 | [ "${base_bindir}" != "${bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${BPN}; done |
@@ -96,7 +96,7 @@ inherit update-alternatives | |||
96 | ALTERNATIVE_PRIORITY = "100" | 96 | ALTERNATIVE_PRIORITY = "100" |
97 | # Make hostname's priority higher than busybox but lower than net-tools | 97 | # Make hostname's priority higher than busybox but lower than net-tools |
98 | ALTERNATIVE_PRIORITY[hostname] = "90" | 98 | ALTERNATIVE_PRIORITY[hostname] = "90" |
99 | ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 nice mktemp df" | 99 | ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 nice printenv mktemp df" |
100 | ALTERNATIVE_${PN}-doc = "base64.1 nice.1 mktemp.1 df.1 groups.1 kill.1 uptime.1 stat.1 hostname.1" | 100 | ALTERNATIVE_${PN}-doc = "base64.1 nice.1 mktemp.1 df.1 groups.1 kill.1 uptime.1 stat.1 hostname.1" |
101 | 101 | ||
102 | ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" | 102 | ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" |
@@ -117,6 +117,9 @@ ALTERNATIVE_LINK_NAME[nice] = "${base_bindir}/nice" | |||
117 | ALTERNATIVE_TARGET[nice] = "${bindir}/nice.${BPN}" | 117 | ALTERNATIVE_TARGET[nice] = "${bindir}/nice.${BPN}" |
118 | ALTERNATIVE_LINK_NAME[nice.1] = "${mandir}/man1/nice.1" | 118 | ALTERNATIVE_LINK_NAME[nice.1] = "${mandir}/man1/nice.1" |
119 | 119 | ||
120 | ALTERNATIVE_LINK_NAME[printenv] = "${base_bindir}/printenv" | ||
121 | ALTERNATIVE_TARGET[printenv] = "${bindir}/printenv.${BPN}" | ||
122 | |||
120 | ALTERNATIVE_LINK_NAME[lbracket] = "${bindir}/[" | 123 | ALTERNATIVE_LINK_NAME[lbracket] = "${bindir}/[" |
121 | ALTERNATIVE_TARGET[lbracket] = "${bindir}/lbracket.${BPN}" | 124 | ALTERNATIVE_TARGET[lbracket] = "${bindir}/lbracket.${BPN}" |
122 | 125 | ||