Patchwork util-linux: fix PACKAGECONFIG options

login
register
mail settings
Submitter Koen Kooi
Date July 25, 2013, 2:51 p.m.
Message ID <1374763888-7315-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/54507/
State Accepted
Commit 1cbabdbd06fd6c9328c94776df372d26396cf9f9
Headers show

Comments

Koen Kooi - July 25, 2013, 2:51 p.m.
The ??= operator is too weak and it's setting a non-existent PACKAGECONFIG option ('libpam' instead of 'pam').

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-core/util-linux/util-linux.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Koen Kooi - July 26, 2013, 7:01 a.m.
Op 25 jul. 2013, om 16:51 heeft Koen Kooi <koen@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@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

*sigh*
Hongxu Jia - July 26, 2013, 9:01 a.m.
On 07/26/2013 03:01 PM, Koen Kooi wrote:
> Op 25 jul. 2013, om 16:51 heeft Koen Kooi <koen@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@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@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Khem Raj - July 30, 2013, 8:52 a.m.
On Jul 26, 2013, at 12:01 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:

> 
> Op 25 jul. 2013, om 16:51 heeft Koen Kooi <koen@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@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
> 
> *sigh*

+*sigh*

has this been fixed yet ? just ran into same issue

| Collected errors:
|  * check_data_file_clashes: Package util-linux wants to install file /builds1/angstrom/build/tmp-angstrom_next-uclibc/work/qemuarm-angstrom-linux-uclibceabi/systemd-image/1.0-r0/rootfs/usr/bin/su
|       But that file is already provided by package  * shadow
|  * opkg_install_cmd: Cannot install package packagegroup-target-sdk.
| ERROR: Function failed: do_rootfs (log file is located at /builds1/angstrom/build/tmp-angstrom_next-uclibc/work/qemuarm-angstrom-linux-uclibceabi/systemd-image/1.0-r0/temp/log.do_rootfs.27649)
NOTE: recipe systemd-image-1.0-r0: task do_rootfs: Failed


> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Paul Eggleton - July 30, 2013, 10:50 a.m.
On Tuesday 30 July 2013 01:52:42 Khem Raj wrote:
> On Jul 26, 2013, at 12:01 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> > Op 25 jul. 2013, om 16:51 heeft Koen Kooi <koen@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@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-ang
> > |  strom-linux-gnueabi/cloud9-image/1.0-r0/rootfs/usr/bin/su> |  
> > |       But that file is already provided by package  * shadow
> > 
> > *sigh*
> 
> +*sigh*
> 
> has this been fixed yet ? just ran into same issue

The patch to fix it is in Saul's most recent consolidated pull.

Cheers,
Paul
Khem Raj - July 30, 2013, 3:31 p.m.
On Jul 30, 2013, at 3:50 AM, Paul Eggleton <paul.eggleton@linux.intel.com> wrote:

> On Tuesday 30 July 2013 01:52:42 Khem Raj wrote:
>> On Jul 26, 2013, at 12:01 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>>> Op 25 jul. 2013, om 16:51 heeft Koen Kooi <koen@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@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-ang
>>> |  strom-linux-gnueabi/cloud9-image/1.0-r0/rootfs/usr/bin/su> |  
>>> |       But that file is already provided by package  * shadow
>>> 
>>> *sigh*
>> 
>> +*sigh*
>> 
>> has this been fixed yet ? just ran into same issue
> 
> The patch to fix it is in Saul's most recent consolidated pull.
> 

which one is it ? I am at 

commit 09deeef20ee5a0c12ad4fd89cace6e0fb832d5b1
Author: Saul Wold <sgw@linux.intel.com>
Date:   Thu Jul 25 14:15:18 2013 -0700

    external-sourcery: add missing providers
    

> Cheers,
> Paul
> 
> -- 
> 
> Paul Eggleton
> Intel Open Source Technology Centre
Saul Wold - July 30, 2013, 3:35 p.m.
On 07/30/2013 08:31 AM, Khem Raj wrote:
>
> On Jul 30, 2013, at 3:50 AM, Paul Eggleton <paul.eggleton@linux.intel.com> wrote:
>
>> On Tuesday 30 July 2013 01:52:42 Khem Raj wrote:
>>> On Jul 26, 2013, at 12:01 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>>>> Op 25 jul. 2013, om 16:51 heeft Koen Kooi <koen@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@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-ang
>>>> |  strom-linux-gnueabi/cloud9-image/1.0-r0/rootfs/usr/bin/su> |
>>>> |       But that file is already provided by package  * shadow
>>>>
>>>> *sigh*
>>>
>>> +*sigh*
>>>
>>> has this been fixed yet ? just ran into same issue
>>
>> The patch to fix it is in Saul's most recent consolidated pull.
>>
>
> which one is it ? I am at
>
> commit 09deeef20ee5a0c12ad4fd89cace6e0fb832d5b1
> Author: Saul Wold <sgw@linux.intel.com>
> Date:   Thu Jul 25 14:15:18 2013 -0700
>
>      external-sourcery: add missing providers
>
>
It's pending on oe-contrib/sgw/stage, a series of 3 Update-Alternatives 
for busybox, util-linux and shadow,

Sau!


>> Cheers,
>> Paul
>>
>> --
>>
>> Paul Eggleton
>> Intel Open Source Technology Centre
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
Khem Raj - July 30, 2013, 5:30 p.m.
On Jul 30, 2013, at 8:35 AM, Saul Wold <sgw@linux.intel.com> wrote:

> It's pending on oe-contrib/sgw/stage, a series of 3 Update-Alternatives for busybox, util-linux and shadow,
> 

I see. thx

Patch

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"