* [PATCH] libpam: Fix build with DISTRO_FEATURES usrmerge
@ 2021-10-12 11:17 Zoltan Boszormenyi
2021-10-13 19:38 ` [OE-core] " Dan McGregor
0 siblings, 1 reply; 4+ messages in thread
From: Zoltan Boszormenyi @ 2021-10-12 11:17 UTC (permalink / raw)
To: openembedded-core; +Cc: Zoltán Böszörményi
From: Zoltán Böszörményi <zboszor@gmail.com>
Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
---
meta/recipes-extended/pam/libpam_1.5.2.bb | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/pam/libpam_1.5.2.bb b/meta/recipes-extended/pam/libpam_1.5.2.bb
index a3c4a50cb3..ee3a84a3b6 100644
--- a/meta/recipes-extended/pam/libpam_1.5.2.bb
+++ b/meta/recipes-extended/pam/libpam_1.5.2.bb
@@ -147,8 +147,10 @@ do_install() {
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session
fi
- install -d ${D}/${libdir}/
- mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/
+ if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then
+ install -d ${D}/${libdir}/
+ mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/
+ fi
}
do_install_ptest() {
--
2.31.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [OE-core] [PATCH] libpam: Fix build with DISTRO_FEATURES usrmerge
2021-10-12 11:17 [PATCH] libpam: Fix build with DISTRO_FEATURES usrmerge Zoltan Boszormenyi
@ 2021-10-13 19:38 ` Dan McGregor
2021-10-14 6:54 ` Zoltan Boszormenyi
0 siblings, 1 reply; 4+ messages in thread
From: Dan McGregor @ 2021-10-13 19:38 UTC (permalink / raw)
To: zboszor
Cc: Patches and discussions about the oe-core layer,
Zoltán Böszörményi
Thanks for this. I hit it pretty immediately.
On Tue, 12 Oct 2021 at 05:17, Zoltan Boszormenyi via
lists.openembedded.org <zboszor=pr.hu@lists.openembedded.org> wrote:
>
> From: Zoltán Böszörményi <zboszor@gmail.com>
>
> Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
> ---
> meta/recipes-extended/pam/libpam_1.5.2.bb | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-extended/pam/libpam_1.5.2.bb b/meta/recipes-extended/pam/libpam_1.5.2.bb
> index a3c4a50cb3..ee3a84a3b6 100644
> --- a/meta/recipes-extended/pam/libpam_1.5.2.bb
> +++ b/meta/recipes-extended/pam/libpam_1.5.2.bb
> @@ -147,8 +147,10 @@ do_install() {
> if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
> echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session
> fi
> - install -d ${D}/${libdir}/
> - mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/
> + if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then
In the patch I made that I kept local for now my condition was
if [ "${base_libdir}" != "${libdir}" ]
It could be that a user sets libdir and base_libdir to be equal
without enabling usrmerge, but both checks solve the immediate
problem.
> + install -d ${D}/${libdir}/
> + mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/
> + fi
> }
>
> do_install_ptest() {
> --
> 2.31.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#156873): https://lists.openembedded.org/g/openembedded-core/message/156873
> Mute This Topic: https://lists.openembedded.org/mt/86259670/3617261
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [danismostlikely@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [OE-core] [PATCH] libpam: Fix build with DISTRO_FEATURES usrmerge
2021-10-13 19:38 ` [OE-core] " Dan McGregor
@ 2021-10-14 6:54 ` Zoltan Boszormenyi
2021-10-14 11:39 ` Alexandre Belloni
0 siblings, 1 reply; 4+ messages in thread
From: Zoltan Boszormenyi @ 2021-10-14 6:54 UTC (permalink / raw)
To: Dan McGregor
Cc: Patches and discussions about the oe-core layer,
Zoltán Böszörményi
On 2021. 10. 13. 21:38, Dan McGregor wrote:
> Thanks for this. I hit it pretty immediately.
>
> On Tue, 12 Oct 2021 at 05:17, Zoltan Boszormenyi via
> lists.openembedded.org <zboszor=pr.hu@lists.openembedded.org> wrote:
>>
>> From: Zoltán Böszörményi <zboszor@gmail.com>
>>
>> Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
>> ---
>> meta/recipes-extended/pam/libpam_1.5.2.bb | 6 ++++--
>> 1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/recipes-extended/pam/libpam_1.5.2.bb b/meta/recipes-extended/pam/libpam_1.5.2.bb
>> index a3c4a50cb3..ee3a84a3b6 100644
>> --- a/meta/recipes-extended/pam/libpam_1.5.2.bb
>> +++ b/meta/recipes-extended/pam/libpam_1.5.2.bb
>> @@ -147,8 +147,10 @@ do_install() {
>> if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
>> echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session
>> fi
>> - install -d ${D}/${libdir}/
>> - mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/
>> + if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then
>
> In the patch I made that I kept local for now my condition was
>
> if [ "${base_libdir}" != "${libdir}" ]
>
> It could be that a user sets libdir and base_libdir to be equal
> without enabling usrmerge, but both checks solve the immediate
> problem.
Right, this is the correct solution.
>
>
>> + install -d ${D}/${libdir}/
>> + mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/
>> + fi
>> }
>>
>> do_install_ptest() {
>> --
>> 2.31.1
>>
>>
>>
>>
>>
>>
>>
>>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [OE-core] [PATCH] libpam: Fix build with DISTRO_FEATURES usrmerge
2021-10-14 6:54 ` Zoltan Boszormenyi
@ 2021-10-14 11:39 ` Alexandre Belloni
0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Belloni @ 2021-10-14 11:39 UTC (permalink / raw)
To: zboszor
Cc: Dan McGregor, Patches and discussions about the oe-core layer,
Zoltán Böszörményi
On 14/10/2021 08:54:35+0200, Zoltan Boszormenyi via lists.openembedded.org wrote:
> On 2021. 10. 13. 21:38, Dan McGregor wrote:
> > Thanks for this. I hit it pretty immediately.
> >
> > On Tue, 12 Oct 2021 at 05:17, Zoltan Boszormenyi via
> > lists.openembedded.org <zboszor=pr.hu@lists.openembedded.org> wrote:
> > >
> > > From: Zoltán Böszörményi <zboszor@gmail.com>
> > >
> > > Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
> > > ---
> > > meta/recipes-extended/pam/libpam_1.5.2.bb | 6 ++++--
> > > 1 file changed, 4 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/meta/recipes-extended/pam/libpam_1.5.2.bb b/meta/recipes-extended/pam/libpam_1.5.2.bb
> > > index a3c4a50cb3..ee3a84a3b6 100644
> > > --- a/meta/recipes-extended/pam/libpam_1.5.2.bb
> > > +++ b/meta/recipes-extended/pam/libpam_1.5.2.bb
> > > @@ -147,8 +147,10 @@ do_install() {
> > > if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
> > > echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session
> > > fi
> > > - install -d ${D}/${libdir}/
> > > - mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/
> > > + if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then
> >
> > In the patch I made that I kept local for now my condition was
> >
> > if [ "${base_libdir}" != "${libdir}" ]
> >
> > It could be that a user sets libdir and base_libdir to be equal
> > without enabling usrmerge, but both checks solve the immediate
> > problem.
>
> Right, this is the correct solution.
>
The patch was just merged in master so you'd have to rebase on that
> >
> >
> > > + install -d ${D}/${libdir}/
> > > + mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/
> > > + fi
> > > }
> > >
> > > do_install_ptest() {
> > > --
> > > 2.31.1
> > >
> > >
> > >
> > >
> > >
> > >
> > >
> > >
>
>
>
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-10-14 11:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-12 11:17 [PATCH] libpam: Fix build with DISTRO_FEATURES usrmerge Zoltan Boszormenyi
2021-10-13 19:38 ` [OE-core] " Dan McGregor
2021-10-14 6:54 ` Zoltan Boszormenyi
2021-10-14 11:39 ` Alexandre Belloni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).