| Message ID | 20240905093005.2731956-1-yoann.congal@smile.fr |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-oe,v2,1/2] polkit: Switch PAM files to common-* | expand |
Should we rather define ‘openembedded’ as an option and submit that upstream? Alex On Thu 5. Sep 2024 at 11.30, Yoann Congal via lists.openembedded.org <yoann.congal=smile.fr@lists.openembedded.org> wrote: > From: Yoann Congal <yoann.congal@smile.fr> > > Polkit meson.build tries to autodetect host OS to change PAM include > file to match distro. Force the distro to Suse which happens to match > OE-Core libpam configuration. > > NB: This also may fix a non-reproducibility bug. > > Fixes: https://github.com/openembedded/meta-openembedded/issues/860 > > Signed-off-by: Yoann Congal <yoann.congal@smile.fr> > --- > v1->v2: removed patch and switch to the preexisting "Suse" OS config. > --- > meta-oe/recipes-extended/polkit/polkit_125.bb | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/meta-oe/recipes-extended/polkit/polkit_125.bb > b/meta-oe/recipes-extended/polkit/polkit_125.bb > index fe1ee467c3..54a2b3636f 100644 > --- a/meta-oe/recipes-extended/polkit/polkit_125.bb > +++ b/meta-oe/recipes-extended/polkit/polkit_125.bb > @@ -16,6 +16,10 @@ inherit meson pkgconfig useradd systemd gettext > gobject-introspection features_c > > REQUIRED_DISTRO_FEATURES = "polkit" > > +# meson.build try to autodetect host OS to change PAM include file to > match distro. > +# Force the distro to Suse which happens to match OE-Core libpam > configuration. > +EXTRA_OEMESON = "-Dos_type=suse" > + > PACKAGECONFIG = " \ > ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ > ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', > 'consolekit', d)} \ > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#112099): > https://lists.openembedded.org/g/openembedded-devel/message/112099 > Mute This Topic: https://lists.openembedded.org/mt/108281789/1686489 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [ > alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
Le jeu. 5 sept. 2024 à 12:16, Alexander Kanavin <alex.kanavin@gmail.com> a écrit : > Should we rather define ‘openembedded’ as an option and submit that > upstream? > You mean submit the patch in v1 upstream? https://lists.openembedded.org/g/openembedded-devel/message/112093 Why not! I'll do it, let's see what upstream says. Thanks! Alex > > On Thu 5. Sep 2024 at 11.30, Yoann Congal via lists.openembedded.org > <yoann.congal=smile.fr@lists.openembedded.org> wrote: > >> From: Yoann Congal <yoann.congal@smile.fr> >> >> Polkit meson.build tries to autodetect host OS to change PAM include >> file to match distro. Force the distro to Suse which happens to match >> OE-Core libpam configuration. >> >> NB: This also may fix a non-reproducibility bug. >> >> Fixes: https://github.com/openembedded/meta-openembedded/issues/860 >> >> Signed-off-by: Yoann Congal <yoann.congal@smile.fr> >> --- >> v1->v2: removed patch and switch to the preexisting "Suse" OS config. >> --- >> meta-oe/recipes-extended/polkit/polkit_125.bb | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/meta-oe/recipes-extended/polkit/polkit_125.bb >> b/meta-oe/recipes-extended/polkit/polkit_125.bb >> index fe1ee467c3..54a2b3636f 100644 >> --- a/meta-oe/recipes-extended/polkit/polkit_125.bb >> +++ b/meta-oe/recipes-extended/polkit/polkit_125.bb >> @@ -16,6 +16,10 @@ inherit meson pkgconfig useradd systemd gettext >> gobject-introspection features_c >> >> REQUIRED_DISTRO_FEATURES = "polkit" >> >> +# meson.build try to autodetect host OS to change PAM include file to >> match distro. >> +# Force the distro to Suse which happens to match OE-Core libpam >> configuration. >> +EXTRA_OEMESON = "-Dos_type=suse" >> + >> PACKAGECONFIG = " \ >> ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ >> ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', >> 'consolekit', d)} \ >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#112099): >> https://lists.openembedded.org/g/openembedded-devel/message/112099 >> Mute This Topic: https://lists.openembedded.org/mt/108281789/1686489 >> Group Owner: openembedded-devel+owner@lists.openembedded.org >> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [ >> alex.kanavin@gmail.com] >> -=-=-=-=-=-=-=-=-=-=-=- >> >>
On Thu, 5 Sept 2024 at 13:07, Yoann Congal <yoann.congal@smile.fr> wrote: > You mean submit the patch in v1 upstream? > https://lists.openembedded.org/g/openembedded-devel/message/112093 > > Why not! I'll do it, let's see what upstream says. Yes - another possibility is to convince them to define an option named 'generic', so we don't run the risk of future suse-specific changes getting in the way and causing regressions. I definitely prefer v1 patch, if it's sent usptream. Alex
Le jeu. 5 sept. 2024 à 13:36, Alexander Kanavin <alex.kanavin@gmail.com> a écrit : > On Thu, 5 Sept 2024 at 13:07, Yoann Congal <yoann.congal@smile.fr> wrote: > > You mean submit the patch in v1 upstream? > > https://lists.openembedded.org/g/openembedded-devel/message/112093 > > > > Why not! I'll do it, let's see what upstream says. > > Yes - another possibility is to convince them to define an option > named 'generic', so we don't run the risk of future suse-specific > changes getting in the way and causing regressions. > > I definitely prefer v1 patch, if it's sent usptream. > Submitted here: https://github.com/polkit-org/polkit/pull/497 :) I'll send a v3 with the Upstream-Status: Submitted
diff --git a/meta-oe/recipes-extended/polkit/polkit_125.bb b/meta-oe/recipes-extended/polkit/polkit_125.bb index fe1ee467c3..54a2b3636f 100644 --- a/meta-oe/recipes-extended/polkit/polkit_125.bb +++ b/meta-oe/recipes-extended/polkit/polkit_125.bb @@ -16,6 +16,10 @@ inherit meson pkgconfig useradd systemd gettext gobject-introspection features_c REQUIRED_DISTRO_FEATURES = "polkit" +# meson.build try to autodetect host OS to change PAM include file to match distro. +# Force the distro to Suse which happens to match OE-Core libpam configuration. +EXTRA_OEMESON = "-Dos_type=suse" + PACKAGECONFIG = " \ ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)} \