[OE-core] [PATCH] util-linux.inc: add fallocate & unshare to alternatives

[Ioan-Adrian Ratiu]

Ok, I'll send another patch since this one was already applied to
master. Thanks!

On Thu, 26 Jul 2018, Martin Jansa <martin.jansa at gmail.com> wrote:
> This is good, but the fallocate alternative should be added only for target
> build.
>
> nativesdk explicitly disables fallocate in
> meta/recipes-core/util-linux/util-linux_2.32.bb
>
> EXTRA_OECONF_class-nativesdk = "${SHARED_EXTRA_OECONF} \
>                                 --disable-fallocate \
>                                 --disable-use-tty-group \
> "
>
> so now nativesdk builds have new warning:
> WARNING: nativesdk-util-linux-2.32-r0 do_package: util-linux: alternative
> target (sdk/usr/bin/fallocate or sdk/usr/bin/fallocate.util-linux) does not
> exist, skipping...
> WARNING: nativesdk-util-linux-2.32-r0 do_package: util-linux: NOT adding
> alternative provide sdk/usr/bin/fallocate: sdk/usr/bin/fallocate.util-linux
> does not exist
> WARNING: nativesdk-util-linux-2.32-r0 do_package: util-linux: alt_link ==
> alt_target: sdk/usr/bin/fallocate == sdk/usr/bin/fallocate
>
>
> On Thu, Jul 5, 2018 at 10:56 AM Ioan-Adrian Ratiu <adrian.ratiu at ni.com>
> wrote:
>
>> These binaries can be provided by busybox triggering a conflict in
>> do_rootfs so update-alternatives needs to know about them to properly
>> create the symlinks.
>>
>> Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu at ni.com>
>> ---
>>  meta/recipes-core/util-linux/util-linux.inc | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-core/util-linux/util-linux.inc
>> b/meta/recipes-core/util-linux/util-linux.inc
>> index 8d8f3962ff..ed5c618750 100644
>> --- a/meta/recipes-core/util-linux/util-linux.inc
>> +++ b/meta/recipes-core/util-linux/util-linux.inc
>> @@ -206,7 +206,7 @@ do_install_append_class-native () {
>>  ALTERNATIVE_PRIORITY = "80"
>>
>>  ALTERNATIVE_${PN}  = "dmesg kill more mkswap blockdev pivot_root
>> switch_root"
>> -ALTERNATIVE_${PN} += "hexdump last lastb logger mesg renice wall"
>> +ALTERNATIVE_${PN} += "hexdump last lastb logger mesg renice wall
>> fallocate unshare"
>>  ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject nologin taskset"
>>
>>  ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
>> @@ -217,6 +217,8 @@ ALTERNATIVE_LINK_NAME[blockdev] =
>> "${base_sbindir}/blockdev"
>>  ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
>>  ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
>>  ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
>> +ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare"
>> +ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate"
>>  ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin"
>>
>>  ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1
>> nologin.8 sulogin.8 utmpdump.1 rfkill.8 kill.1 libblkid.3 blkid.8 findfs.8
>> fsck.8 uuid.3 eject.1 logger.1"
>> --
>> 2.18.0
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core at lists.openembedded.org
>> https://urldefense.proofpoint.com/v2/url?u=http-3A__lists.openembedded.org_mailman_listinfo_openembedded-2Dcore&d=DwIBaQ&c=I_0YwoKy7z5LMTVdyO6YCiE2uzI1jjZZuIPelcSjixA&r=fzwh7IUt7VYYiD6094geII0kSDP3DkEnN0B8zB62AxE&m=V1fZFZwpNWpU4wVVxA-URTy3cqjalPaY7s7P99Cn6xw&s=J2ilhEzLUQJ5xhlsLhxVBkxW-1jbHNDeulD8sKxaP7A&e=
>>