| Message ID | 20260423031717.4186749-1-wenlin.kang@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-xfce] xfce4-session: Make libpam and systemd dependencies conditional | expand |
Hi Wenlin, On 4/23/26 11:17, wenlin.kang@windriver.com via lists.openembedded.org wrote: > From: Wenlin Kang <wenlin.kang@windriver.com> > > libpam and systemd require the settings below: > INIT_MANAGER = "systemd" > DISTRO_FEATURES:append = " pam systemd usrmerge" > > So remove hardcoded libpam and systemd dependencies from DEPENDS. > Add conditional logic to include these dependencies only when > the corresponding DISTRO_FEATURES are enabled. > > Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> > --- > .../xfce4-screensaver/xfce4-screensaver_4.20.2.bb | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.20.2.bb b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.20.2.bb > index b95bfc170c..191c49b216 100644 > --- a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.20.2.bb > +++ b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.20.2.bb > @@ -10,7 +10,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ > XFCE_COMPRESS_TYPE = "xz" > XFCEBASEBUILDCLASS = "meson" > > -DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf libwnck3 libpam systemd" > +DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf libwnck3" > + > +EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '-Dauthentication-scheme=none', d)}" > +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" > + > +EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '-Dsession-manager=none', d)}" > +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" I think it would be better to use PACKAGECONFIG. //Yi > > inherit xfce-app > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#126567): https://lists.openembedded.org/g/openembedded-devel/message/126567 > Mute This Topic: https://lists.openembedded.org/mt/118966722/7283133 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [yi.zhao@eng.windriver.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On Wed, Apr 22, 2026 at 8:40 PM Yi Zhao via lists.openembedded.org <yi.zhao= eng.windriver.com@lists.openembedded.org> wrote: > Hi Wenlin, > > On 4/23/26 11:17, wenlin.kang@windriver.com via lists.openembedded.org > wrote: > > From: Wenlin Kang <wenlin.kang@windriver.com> > > > > libpam and systemd require the settings below: > > INIT_MANAGER = "systemd" > > DISTRO_FEATURES:append = " pam systemd usrmerge" > > > > So remove hardcoded libpam and systemd dependencies from DEPENDS. > > Add conditional logic to include these dependencies only when > > the corresponding DISTRO_FEATURES are enabled. > > > > Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> > > --- > > .../xfce4-screensaver/xfce4-screensaver_4.20.2.bb | 8 +++++++- > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > diff --git a/meta-xfce/recipes-apps/xfce4-screensaver/ > xfce4-screensaver_4.20.2.bb b/meta-xfce/recipes-apps/xfce4-screensaver/ > xfce4-screensaver_4.20.2.bb > > index b95bfc170c..191c49b216 100644 > > --- a/meta-xfce/recipes-apps/xfce4-screensaver/ > xfce4-screensaver_4.20.2.bb > > +++ b/meta-xfce/recipes-apps/xfce4-screensaver/ > xfce4-screensaver_4.20.2.bb > > @@ -10,7 +10,13 @@ LIC_FILES_CHKSUM = > "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ > > XFCE_COMPRESS_TYPE = "xz" > > XFCEBASEBUILDCLASS = "meson" > > > > -DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver > virtual/libx11 xfconf libwnck3 libpam systemd" > > +DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver > virtual/libx11 xfconf libwnck3" > > + > > +EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', > '-Dauthentication-scheme=none', d)}" > > +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', > '', d)}" > > + > > +EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', > '', '-Dsession-manager=none', d)}" > > +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', > 'systemd', '', d)}" > > how did you test it for runtime correctness > I think it would be better to use PACKAGECONFIG. > > > > //Yi > > > > > inherit xfce-app > > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#126568): > https://lists.openembedded.org/g/openembedded-devel/message/126568 > Mute This Topic: https://lists.openembedded.org/mt/118966722/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [ > raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
diff --git a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.20.2.bb b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.20.2.bb index b95bfc170c..191c49b216 100644 --- a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.20.2.bb +++ b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.20.2.bb @@ -10,7 +10,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ XFCE_COMPRESS_TYPE = "xz" XFCEBASEBUILDCLASS = "meson" -DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf libwnck3 libpam systemd" +DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf libwnck3" + +EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '-Dauthentication-scheme=none', d)}" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" + +EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '-Dsession-manager=none', d)}" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" inherit xfce-app