[OE-core] [PATCH v2] util-linux: alternatify cal, rev, and ionice

[Randy MacLeod]

On 10/19/18 9:47 AM, Richard Purdie wrote:
> On Thu, 2018-10-18 at 09:22 -0600, Dan McGregor wrote:
>> From: Dan McGregor <dan.mcgregor at usask.ca>
>>
>> These are also provided by toybox in its default configuration,
>> and can be turned on in busybox.
>>
>> Signed-off-by: Dan McGregor <dan.mcgregor at usask.ca>
>> ---
>>   meta/recipes-core/util-linux/util-linux.inc | 10 ++++++----
>>   1 file changed, 6 insertions(+), 4 deletions(-)
>>
>> diff --git a/meta/recipes-core/util-linux/util-linux.inc
>> b/meta/recipes-core/util-linux/util-linux.inc
>> index 3d8b3ff592c..2f99e8409f5 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,8 +295,8 @@ ALTERNATIVE_LINK_NAME[mountpoint] =
>> "${base_bindir}/mountpoint"
>>   ALTERNATIVE_util-linux-unshare = "unshare"
>>   ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare"
>>   
>> -ALTERNATIVE_util-linux-switch-root = "switch_root"
>> -ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
>> +ALTERNATIVE_util-linux-ionice = "ionice"
>> +ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice"
> 
> 
> The rebase went wrong here. I'll try and fix this up in -next and
> retest so we can figure out if switch_root really is broken (cc
> Randy)...

Ah, so it seems. Deleting switch-root alternatives, eh... WTF Dan! :)

Thanks Richard.

../Randy

> 
> Cheers,
> 
> Richard
> 


-- 
# Randy MacLeod
# Wind River Linux