[OE-core] [PATCH] util-linux: fix PACKAGECONFIG options

[Hongxu Jia]

On 07/26/2013 03:01 PM, Koen Kooi wrote:
> Op 25 jul. 2013, om 16:51 heeft Koen Kooi <koen at dominion.thruhere.net> het volgende geschreven:
>
>> The ??= operator is too weak and it's setting a non-existent PACKAGECONFIG option ('libpam' instead of 'pam').
>>
>> Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
>> ---
>> meta/recipes-core/util-linux/util-linux.inc | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
>> index d373cec..3d1198a 100644
>> --- a/meta/recipes-core/util-linux/util-linux.inc
>> +++ b/meta/recipes-core/util-linux/util-linux.inc
>> @@ -47,9 +47,9 @@ EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
>>                  --enable-libuuid --enable-libblkid --enable-fsck --without-udev \
>> 		usrsbin_execdir='${sbindir}' \
>> "
>> -PACKAGECONFIG_class-target ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \
>> +PACKAGECONFIG_class-target ?= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
>>                                  ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} "
>> -PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, pam,"
>> +PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam,"
>>
>> # Respect the systemd feature for uuidd
>> PACKAGECONFIG[systemd] = "--enable-socket-activation --with-systemdsystemunitdir=${systemd_unitdir}/system/, --disable-socket-activation --without-systemdsystemunitdir"
> And of course this will trigger another bug:
>
> |  * check_data_file_clashes: Package util-linux wants to install file /build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/work/beaglebone-angstrom-linux-gnueabi/cloud9-image/1.0-r0/rootfs/usr/bin/su
> |       But that file is already provided by package  * shadow
Hi Koen,

I am working on this issue and the patch will be sent later.

Thanks,
Hongxu
>
> *sigh*
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core