diff options
author | Dan McGregor <dan.mcgregor@usask.ca> | 2018-10-18 09:22:15 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-20 22:40:16 +0100 |
commit | 78db831a7b0c2361a266eb37c7cbf2e368d2280a (patch) | |
tree | 680ac7c7160da5ad1069d842dbba15499c574e03 /meta/recipes-core/util-linux | |
parent | d4bc9704a5bd5d11d937aae927aecc4cbb563342 (diff) | |
download | poky-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/recipes-core/util-linux')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 9 |
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" | |||
93 | FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" | 93 | FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" |
94 | FILES_util-linux-runuser = "${sbindir}/runuser" | 94 | FILES_util-linux-runuser = "${sbindir}/runuser" |
95 | FILES_util-linux-prlimit = "${bindir}/prlimit" | 95 | FILES_util-linux-prlimit = "${bindir}/prlimit" |
96 | FILES_util-linux-ionice = "${bindir}/ionice" | 96 | FILES_util-linux-ionice = "${bindir}/ionice.${BPN}" |
97 | FILES_util-linux-su = "${bindir}/su.util-linux ${sysconfdir}/pam.d/su-l" | 97 | FILES_util-linux-su = "${bindir}/su.util-linux ${sysconfdir}/pam.d/su-l" |
98 | CONFFILES_util-linux-su = "${sysconfdir}/pam.d/su-l" | 98 | CONFFILES_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 | ||
215 | ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" | 215 | ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" |
@@ -218,8 +218,10 @@ ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" | |||
218 | ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" | 218 | ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" |
219 | ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" | 219 | ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" |
220 | ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" | 220 | ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" |
221 | ALTERNATIVE_LINK_NAME[cal] = "${bindir}/cal" | ||
221 | ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" | 222 | ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" |
222 | ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate" | 223 | ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate" |
224 | ALTERNATIVE_LINK_NAME[rev] = "${bindir}/rev" | ||
223 | ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" | 225 | ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" |
224 | ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" | 226 | ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" |
225 | 227 | ||
@@ -293,6 +295,9 @@ ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" | |||
293 | ALTERNATIVE_util-linux-unshare = "unshare" | 295 | ALTERNATIVE_util-linux-unshare = "unshare" |
294 | ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" | 296 | ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" |
295 | 297 | ||
298 | ALTERNATIVE_util-linux-ionice = "ionice" | ||
299 | ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" | ||
300 | |||
296 | ALTERNATIVE_util-linux-switch-root = "switch_root" | 301 | ALTERNATIVE_util-linux-switch-root = "switch_root" |
297 | ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" | 302 | ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" |
298 | 303 | ||