From 78db831a7b0c2361a266eb37c7cbf2e368d2280a Mon Sep 17 00:00:00 2001 From: Dan McGregor Date: Thu, 18 Oct 2018 09:22:15 -0600 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-core/util-linux/util-linux.inc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core/util-linux') 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" FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" FILES_util-linux-runuser = "${sbindir}/runuser" FILES_util-linux-prlimit = "${bindir}/prlimit" -FILES_util-linux-ionice = "${bindir}/ionice" +FILES_util-linux-ionice = "${bindir}/ionice.${BPN}" FILES_util-linux-su = "${bindir}/su.util-linux ${sysconfdir}/pam.d/su-l" CONFFILES_util-linux-su = "${sysconfdir}/pam.d/su-l" @@ -209,7 +209,7 @@ ALTERNATIVE_${PN} = " \ dmesg kill more mkswap blockdev pivot_root \ hexdump last lastb logger mesg renice wall \ setsid chrt flock utmpdump eject nologin taskset fallocate \ - fsfreeze nsenter \ + fsfreeze nsenter cal rev \ " ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" @@ -218,8 +218,10 @@ ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" +ALTERNATIVE_LINK_NAME[cal] = "${bindir}/cal" ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate" +ALTERNATIVE_LINK_NAME[rev] = "${bindir}/rev" ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" @@ -293,6 +295,9 @@ ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" ALTERNATIVE_util-linux-unshare = "unshare" ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" +ALTERNATIVE_util-linux-ionice = "ionice" +ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" + ALTERNATIVE_util-linux-switch-root = "switch_root" ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" -- cgit v1.2.3-54-g00ecf