| Message ID | 20250718091518.1608493-2-pascal.weisser.ext@karlstorz.com |
|---|---|
| State | Accepted, archived |
| Commit | 272aafbf0a2a1a158fdff42b6ce295fe861f1327 |
| Headers | show |
| Series | Add traditional-activation PACKAGECONFIG to DBus recipe. | expand |
On Fri, 18 Jul 2025 at 11:15, Weisser, Pascal.ext via lists.openembedded.org <Pascal.Weisser.ext=karlstorz.com@lists.openembedded.org> wrote: > > Add traditional-activation PACKAGECONFIG to DBus recipe in order to allow > users to enable or disable that DBus feature. It would help to explain what the feature provides. > Signed-off-by: Weisser, Pascal <pascal.weisser.ext@karlstorz.com> > --- > meta/recipes-core/dbus/dbus_1.16.2.bb | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-core/dbus/dbus_1.16.2.bb b/meta/recipes-core/dbus/dbus_1.16.2.bb > index 65f7028b4f..aabc4c3efb 100644 > --- a/meta/recipes-core/dbus/dbus_1.16.2.bb > +++ b/meta/recipes-core/dbus/dbus_1.16.2.bb > @@ -28,7 +28,7 @@ EXTRA_OEMESON = "-Dxml_docs=disabled \ > " > > PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ > - user-session \ > + traditional-activation user-session \ Why is it also enabled by default? > - chown root:messagebus ${D}${libexecdir}/dbus-daemon-launch-helper > - chmod 4755 ${D}${libexecdir}/dbus-daemon-launch-helper > + if [ "${@bb.utils.contains('PACKAGECONFIG', 'traditional-activation', '1', '0', d)}" = "1" ] > + then > + chown root:messagebus ${D}${libexecdir}/dbus-daemon-launch-helper > + chmod 4755 ${D}${libexecdir}/dbus-daemon-launch-helper > + fi Why does this need to be wrapped in a condition? All answers into the commit message please. Alex
diff --git a/meta/recipes-core/dbus/dbus_1.16.2.bb b/meta/recipes-core/dbus/dbus_1.16.2.bb index 65f7028b4f..aabc4c3efb 100644 --- a/meta/recipes-core/dbus/dbus_1.16.2.bb +++ b/meta/recipes-core/dbus/dbus_1.16.2.bb @@ -28,7 +28,7 @@ EXTRA_OEMESON = "-Dxml_docs=disabled \ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ - user-session \ + traditional-activation user-session \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ " PACKAGECONFIG:class-native = "" @@ -36,6 +36,7 @@ PACKAGECONFIG:class-nativesdk = "" PACKAGECONFIG[systemd] = "-Dsystemd=enabled -Dsystemd_system_unitdir=${systemd_system_unitdir},-Dsystemd=disabled,systemd" PACKAGECONFIG[x11] = "-Dx11_autolaunch=enabled,-Dx11_autolaunch=disabled, virtual/libx11 libsm" +PACKAGECONFIG[traditional-activation] = "-Dtraditional_activation=true,-Dtraditional_activation=false" PACKAGECONFIG[user-session] = "-Duser_session=true -Dsystemd_user_unitdir=${systemd_user_unitdir},-Duser_session=false" PACKAGECONFIG[verbose-mode] = "-Dverbose_mode=true,-Dverbose_mode=false,," PACKAGECONFIG[audit] = "-Dlibaudit=enabled,-Dlibaudit=disabled,audit" @@ -152,8 +153,11 @@ do_install:append:class-target() { chown messagebus:messagebus ${D}${localstatedir}/lib/dbus - chown root:messagebus ${D}${libexecdir}/dbus-daemon-launch-helper - chmod 4755 ${D}${libexecdir}/dbus-daemon-launch-helper + if [ "${@bb.utils.contains('PACKAGECONFIG', 'traditional-activation', '1', '0', d)}" = "1" ] + then + chown root:messagebus ${D}${libexecdir}/dbus-daemon-launch-helper + chmod 4755 ${D}${libexecdir}/dbus-daemon-launch-helper + fi # Remove Red Hat initscript rm -rf ${D}${sysconfdir}/rc.d
Add traditional-activation PACKAGECONFIG to DBus recipe in order to allow users to enable or disable that DBus feature. Signed-off-by: Weisser, Pascal <pascal.weisser.ext@karlstorz.com> --- meta/recipes-core/dbus/dbus_1.16.2.bb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)