Re: [OE-core] [PATCH] libpam: Fix build with DISTRO_FEATURES usrmerge
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 wrote:
> > >
> > > From: Zoltán Böszörményi
> > >
> > > Signed-off-by: Zoltán Böszörményi
> > > ---
> > > 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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#156935):
https://lists.openembedded.org/g/openembedded-core/message/156935
Mute This Topic: https://lists.openembedded.org/mt/86259670/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] libpam: Fix build with DISTRO_FEATURES usrmerge
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 wrote:
From: Zoltán Böszörményi
Signed-off-by: Zoltán Böszörményi
---
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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#156929):
https://lists.openembedded.org/g/openembedded-core/message/156929
Mute This Topic: https://lists.openembedded.org/mt/86259670/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] libpam: Fix build with DISTRO_FEATURES usrmerge
Thanks for this. I hit it pretty immediately.
On Tue, 12 Oct 2021 at 05:17, Zoltan Boszormenyi via
lists.openembedded.org wrote:
>
> From: Zoltán Böszörményi
>
> Signed-off-by: Zoltán Böszörményi
> ---
> 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 (#156921):
https://lists.openembedded.org/g/openembedded-core/message/156921
Mute This Topic: https://lists.openembedded.org/mt/86259670/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
