summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDan McGregor <dan.mcgregor@usask.ca>2018-10-18 09:22:15 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-20 22:40:16 +0100
commit78db831a7b0c2361a266eb37c7cbf2e368d2280a (patch)
tree680ac7c7160da5ad1069d842dbba15499c574e03 /meta
parentd4bc9704a5bd5d11d937aae927aecc4cbb563342 (diff)
downloadpoky-78db831a7b0c2361a266eb37c7cbf2e368d2280a.tar.gz
util-linux: alternatify cal, rev, and ionice
These are also provided by toybox in its default configuration, and can be turned on in busybox. (From OE-Core rev: 33c8dc08c9b160a0bb1d71d8b421a99de6e6eeee) Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc9
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 3d8b3ff592..a05c1cabbe 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -93,7 +93,7 @@ FILES_util-linux-findfs = "${sbindir}/findfs"
93FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" 93FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}"
94FILES_util-linux-runuser = "${sbindir}/runuser" 94FILES_util-linux-runuser = "${sbindir}/runuser"
95FILES_util-linux-prlimit = "${bindir}/prlimit" 95FILES_util-linux-prlimit = "${bindir}/prlimit"
96FILES_util-linux-ionice = "${bindir}/ionice" 96FILES_util-linux-ionice = "${bindir}/ionice.${BPN}"
97FILES_util-linux-su = "${bindir}/su.util-linux ${sysconfdir}/pam.d/su-l" 97FILES_util-linux-su = "${bindir}/su.util-linux ${sysconfdir}/pam.d/su-l"
98CONFFILES_util-linux-su = "${sysconfdir}/pam.d/su-l" 98CONFFILES_util-linux-su = "${sysconfdir}/pam.d/su-l"
99 99
@@ -209,7 +209,7 @@ ALTERNATIVE_${PN} = " \
209 dmesg kill more mkswap blockdev pivot_root \ 209 dmesg kill more mkswap blockdev pivot_root \
210 hexdump last lastb logger mesg renice wall \ 210 hexdump last lastb logger mesg renice wall \
211 setsid chrt flock utmpdump eject nologin taskset fallocate \ 211 setsid chrt flock utmpdump eject nologin taskset fallocate \
212 fsfreeze nsenter \ 212 fsfreeze nsenter cal rev \
213" 213"
214 214
215ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" 215ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
@@ -218,8 +218,10 @@ ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more"
218ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" 218ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap"
219ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" 219ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev"
220ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" 220ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
221ALTERNATIVE_LINK_NAME[cal] = "${bindir}/cal"
221ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" 222ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
222ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate" 223ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate"
224ALTERNATIVE_LINK_NAME[rev] = "${bindir}/rev"
223ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" 225ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze"
224ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" 226ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin"
225 227
@@ -293,6 +295,9 @@ ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint"
293ALTERNATIVE_util-linux-unshare = "unshare" 295ALTERNATIVE_util-linux-unshare = "unshare"
294ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" 296ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare"
295 297
298ALTERNATIVE_util-linux-ionice = "ionice"
299ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice"
300
296ALTERNATIVE_util-linux-switch-root = "switch_root" 301ALTERNATIVE_util-linux-switch-root = "switch_root"
297ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" 302ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
298 303