* [PATCH v2 1/7] dbus: merge .bb and .inc [not found] <1440666021-11411-1-git-send-email-andrew.shadura@collabora.co.uk> @ 2015-09-14 10:07 ` Andrew Shadura 2015-09-14 10:07 ` [PATCH v2 2/7] dbus: update the recipes to 1.10.0 Andrew Shadura ` (6 more replies) 2015-09-14 10:41 ` [PATCH v3 1/2] dbus: add user sessions support Andrew Shadura 1 sibling, 7 replies; 19+ messages in thread From: Andrew Shadura @ 2015-09-14 10:07 UTC (permalink / raw) To: openembedded-core The split is no longer necessary, and only makes it more complicated to do changes in external layers. --- meta/recipes-core/dbus/dbus.inc | 170 --------------------------------- meta/recipes-core/dbus/dbus_1.8.20.bb | 171 +++++++++++++++++++++++++++++++++- 2 files changed, 170 insertions(+), 171 deletions(-) delete mode 100644 meta/recipes-core/dbus/dbus.inc diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc deleted file mode 100644 index 3971081..0000000 --- a/meta/recipes-core/dbus/dbus.inc +++ /dev/null @@ -1,170 +0,0 @@ -SUMMARY = "D-Bus message bus" -DESCRIPTION = "D-Bus is a message bus system, a simple way for applications to talk to one another. In addition to interprocess communication, D-Bus helps coordinate process lifecycle; it makes it simple and reliable to code a \"single instance\" application or daemon, and to launch applications and daemons on demand when their services are needed." -HOMEPAGE = "http://dbus.freedesktop.org" -SECTION = "base" -LICENSE = "AFL-2 | GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ - file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" -DEPENDS = "expat virtual/libintl" -RDEPENDS_dbus_class-native = "" -RDEPENDS_dbus_class-nativesdk = "" -PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" -ALLOW_EMPTY_dbus-ptest = "1" -RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest" - -SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ - file://tmpdir.patch \ - file://dbus-1.init \ - file://os-test.patch \ - file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ -" - -inherit useradd autotools pkgconfig gettext update-rc.d - -INITSCRIPT_NAME = "dbus-1" -INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ." - -python __anonymous() { - if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): - d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") -} - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "-r netdev" -USERADD_PARAM_${PN} = "--system --home ${localstatedir}/lib/dbus \ - --no-create-home --shell /bin/false \ - --user-group messagebus" - -CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf" - -DEBIANNAME_${PN} = "dbus-1" - -PACKAGES =+ "${PN}-lib" - -OLDPKGNAME = "dbus-x11" -OLDPKGNAME_class-nativesdk = "" - -# for compatibility -RPROVIDES_${PN} = "${OLDPKGNAME}" -RREPLACES_${PN} += "${OLDPKGNAME}" - -FILES_${PN} = "${bindir}/dbus-daemon* \ - ${bindir}/dbus-uuidgen \ - ${bindir}/dbus-cleanup-sockets \ - ${bindir}/dbus-send \ - ${bindir}/dbus-monitor \ - ${bindir}/dbus-launch \ - ${bindir}/dbus-run-session \ - ${libexecdir}/dbus* \ - ${sysconfdir} \ - ${localstatedir} \ - ${datadir}/dbus-1/services \ - ${datadir}/dbus-1/system-services \ - ${systemd_unitdir}/system/" -FILES_${PN}-lib = "${libdir}/lib*.so.*" -RRECOMMENDS_${PN}-lib = "${PN}" -FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" - -pkg_postinst_dbus() { - # If both systemd and sysvinit are enabled, mask the dbus-1 init script - if ${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','true','false',d)}; then - if [ -n "$D" ]; then - OPTS="--root=$D" - fi - systemctl $OPTS mask dbus-1.service - fi - - if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then - /etc/init.d/populate-volatile.sh update - fi -} - -EXTRA_OECONF = "--disable-tests \ - --disable-xml-docs \ - --disable-doxygen-docs \ - --disable-libaudit \ - --disable-systemd \ - --without-dbus-glib" - -EXTRA_OECONF_append_class-native = " --disable-selinux" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" -PACKAGECONFIG_class-native = "" -PACKAGECONFIG_class-nativesdk = "" - -# Would like to --enable-systemd but that's a circular build-dependency between -# systemd<->dbus -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir" -PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" - -do_install() { - autotools_do_install - - if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/init.d - sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-1.init >${WORKDIR}/dbus-1.init.sh - install -m 0755 ${WORKDIR}/dbus-1.init.sh ${D}${sysconfdir}/init.d/dbus-1 - fi - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - for i in dbus.target.wants sockets.target.wants multi-user.target.wants; do \ - install -d ${D}${systemd_unitdir}/system/$i; done - install -m 0644 ${B}/bus/dbus.service ${B}/bus/dbus.socket ${D}${systemd_unitdir}/system/ - cd ${D}${systemd_unitdir}/system/dbus.target.wants/ - ln -fs ../dbus.socket ${D}${systemd_unitdir}/system/dbus.target.wants/dbus.socket - ln -fs ../dbus.socket ${D}${systemd_unitdir}/system/sockets.target.wants/dbus.socket - ln -fs ../dbus.service ${D}${systemd_unitdir}/system/multi-user.target.wants/dbus.service - fi - - install -d ${D}${sysconfdir}/default/volatiles - echo "d messagebus messagebus 0755 ${localstatedir}/run/dbus none" \ - > ${D}${sysconfdir}/default/volatiles/99_dbus - - - mkdir -p ${D}${localstatedir}/lib/dbus - - chown messagebus:messagebus ${D}${localstatedir}/lib/dbus - - chown root:messagebus ${D}${libexecdir}/dbus-daemon-launch-helper - chmod 4755 ${D}${libexecdir}/dbus-daemon-launch-helper - - # Remove Red Hat initscript - rm -rf ${D}${sysconfdir}/rc.d - - # Remove empty testexec directory as we don't build tests - rm -rf ${D}${libdir}/dbus-1.0/test - - # Remove /var/run as it is created on startup - rm -rf ${D}${localstatedir}/run -} - -do_install_class-native() { - autotools_do_install - - # for dbus-glib-native introspection generation - install -d ${D}${STAGING_DATADIR_NATIVE}/dbus/ - # N.B. is below install actually required? - install -m 0644 bus/session.conf ${D}${STAGING_DATADIR_NATIVE}/dbus/session.conf - - # dbus-glib-native and dbus-glib need this xml file - ./bus/dbus-daemon --introspect > ${D}${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml - - # dbus-launch has no X support so lets not install it in case the host - # has a more featured and useful version - rm -f ${D}${bindir}/dbus-launch -} - -do_install_class-nativesdk() { - autotools_do_install - - # dbus-launch has no X support so lets not install it in case the host - # has a more featured and useful version - rm -f ${D}${bindir}/dbus-launch - - # Remove /var/run to avoid QA error - rm -rf ${D}${localstatedir}/run -} -BBCLASSEXTEND = "native nativesdk" - -INSANE_SKIP_${PN}-ptest += "build-deps" diff --git a/meta/recipes-core/dbus/dbus_1.8.20.bb b/meta/recipes-core/dbus/dbus_1.8.20.bb index a8f2094..207a018 100644 --- a/meta/recipes-core/dbus/dbus_1.8.20.bb +++ b/meta/recipes-core/dbus/dbus_1.8.20.bb @@ -1,4 +1,173 @@ -include dbus.inc +SUMMARY = "D-Bus message bus" +DESCRIPTION = "D-Bus is a message bus system, a simple way for applications to talk to one another. In addition to interprocess communication, D-Bus helps coordinate process lifecycle; it makes it simple and reliable to code a \"single instance\" application or daemon, and to launch applications and daemons on demand when their services are needed." +HOMEPAGE = "http://dbus.freedesktop.org" +SECTION = "base" +LICENSE = "AFL-2 | GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ + file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" +DEPENDS = "expat virtual/libintl" +RDEPENDS_dbus_class-native = "" +RDEPENDS_dbus_class-nativesdk = "" +PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" +ALLOW_EMPTY_dbus-ptest = "1" +RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest" + +SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ + file://tmpdir.patch \ + file://dbus-1.init \ + file://os-test.patch \ + file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ +" SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b" SRC_URI[sha256sum] = "5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a" + +inherit useradd autotools pkgconfig gettext update-rc.d + +INITSCRIPT_NAME = "dbus-1" +INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ." + +python __anonymous() { + if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): + d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") +} + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "-r netdev" +USERADD_PARAM_${PN} = "--system --home ${localstatedir}/lib/dbus \ + --no-create-home --shell /bin/false \ + --user-group messagebus" + +CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf" + +DEBIANNAME_${PN} = "dbus-1" + +PACKAGES =+ "${PN}-lib" + +OLDPKGNAME = "dbus-x11" +OLDPKGNAME_class-nativesdk = "" + +# for compatibility +RPROVIDES_${PN} = "${OLDPKGNAME}" +RREPLACES_${PN} += "${OLDPKGNAME}" + +FILES_${PN} = "${bindir}/dbus-daemon* \ + ${bindir}/dbus-uuidgen \ + ${bindir}/dbus-cleanup-sockets \ + ${bindir}/dbus-send \ + ${bindir}/dbus-monitor \ + ${bindir}/dbus-launch \ + ${bindir}/dbus-run-session \ + ${libexecdir}/dbus* \ + ${sysconfdir} \ + ${localstatedir} \ + ${datadir}/dbus-1/services \ + ${datadir}/dbus-1/system-services \ + ${systemd_unitdir}/system/" +FILES_${PN}-lib = "${libdir}/lib*.so.*" +RRECOMMENDS_${PN}-lib = "${PN}" +FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" + +pkg_postinst_dbus() { + # If both systemd and sysvinit are enabled, mask the dbus-1 init script + if ${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','true','false',d)}; then + if [ -n "$D" ]; then + OPTS="--root=$D" + fi + systemctl $OPTS mask dbus-1.service + fi + + if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then + /etc/init.d/populate-volatile.sh update + fi +} + +EXTRA_OECONF = "--disable-tests \ + --disable-xml-docs \ + --disable-doxygen-docs \ + --disable-libaudit \ + --disable-systemd \ + --without-dbus-glib" + +EXTRA_OECONF_append_class-native = " --disable-selinux" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG_class-native = "" +PACKAGECONFIG_class-nativesdk = "" + +# Would like to --enable-systemd but that's a circular build-dependency between +# systemd<->dbus +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir" +PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" + +do_install() { + autotools_do_install + + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d + sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-1.init >${WORKDIR}/dbus-1.init.sh + install -m 0755 ${WORKDIR}/dbus-1.init.sh ${D}${sysconfdir}/init.d/dbus-1 + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + for i in dbus.target.wants sockets.target.wants multi-user.target.wants; do \ + install -d ${D}${systemd_unitdir}/system/$i; done + install -m 0644 ${B}/bus/dbus.service ${B}/bus/dbus.socket ${D}${systemd_unitdir}/system/ + cd ${D}${systemd_unitdir}/system/dbus.target.wants/ + ln -fs ../dbus.socket ${D}${systemd_unitdir}/system/dbus.target.wants/dbus.socket + ln -fs ../dbus.socket ${D}${systemd_unitdir}/system/sockets.target.wants/dbus.socket + ln -fs ../dbus.service ${D}${systemd_unitdir}/system/multi-user.target.wants/dbus.service + fi + + install -d ${D}${sysconfdir}/default/volatiles + echo "d messagebus messagebus 0755 ${localstatedir}/run/dbus none" \ + > ${D}${sysconfdir}/default/volatiles/99_dbus + + + mkdir -p ${D}${localstatedir}/lib/dbus + + chown messagebus:messagebus ${D}${localstatedir}/lib/dbus + + chown root:messagebus ${D}${libexecdir}/dbus-daemon-launch-helper + chmod 4755 ${D}${libexecdir}/dbus-daemon-launch-helper + + # Remove Red Hat initscript + rm -rf ${D}${sysconfdir}/rc.d + + # Remove empty testexec directory as we don't build tests + rm -rf ${D}${libdir}/dbus-1.0/test + + # Remove /var/run as it is created on startup + rm -rf ${D}${localstatedir}/run +} + +do_install_class-native() { + autotools_do_install + + # for dbus-glib-native introspection generation + install -d ${D}${STAGING_DATADIR_NATIVE}/dbus/ + # N.B. is below install actually required? + install -m 0644 bus/session.conf ${D}${STAGING_DATADIR_NATIVE}/dbus/session.conf + + # dbus-glib-native and dbus-glib need this xml file + ./bus/dbus-daemon --introspect > ${D}${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml + + # dbus-launch has no X support so lets not install it in case the host + # has a more featured and useful version + rm -f ${D}${bindir}/dbus-launch +} + +do_install_class-nativesdk() { + autotools_do_install + + # dbus-launch has no X support so lets not install it in case the host + # has a more featured and useful version + rm -f ${D}${bindir}/dbus-launch + + # Remove /var/run to avoid QA error + rm -rf ${D}${localstatedir}/run +} +BBCLASSEXTEND = "native nativesdk" + +INSANE_SKIP_${PN}-ptest += "build-deps" -- 2.1.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v2 2/7] dbus: update the recipes to 1.10.0 2015-09-14 10:07 ` [PATCH v2 1/7] dbus: merge .bb and .inc Andrew Shadura @ 2015-09-14 10:07 ` Andrew Shadura 2015-09-14 10:07 ` [PATCH v2 3/7] dbus: add apparmor support Andrew Shadura ` (5 subsequent siblings) 6 siblings, 0 replies; 19+ messages in thread From: Andrew Shadura @ 2015-09-14 10:07 UTC (permalink / raw) To: openembedded-core --- .../dbus/{dbus-test_1.8.20.bb => dbus-test_1.10.0.bb} | 6 +++--- meta/recipes-core/dbus/dbus/python-config.patch | 13 +++++++------ meta/recipes-core/dbus/{dbus_1.8.20.bb => dbus_1.10.0.bb} | 14 +++++++++----- 3 files changed, 19 insertions(+), 14 deletions(-) rename meta/recipes-core/dbus/{dbus-test_1.8.20.bb => dbus-test_1.10.0.bb} (91%) rename meta/recipes-core/dbus/{dbus_1.8.20.bb => dbus_1.10.0.bb} (93%) diff --git a/meta/recipes-core/dbus/dbus-test_1.8.20.bb b/meta/recipes-core/dbus/dbus-test_1.10.0.bb similarity index 91% rename from meta/recipes-core/dbus/dbus-test_1.8.20.bb rename to meta/recipes-core/dbus/dbus-test_1.10.0.bb index 704070b..7dec16e 100644 --- a/meta/recipes-core/dbus/dbus-test_1.8.20.bb +++ b/meta/recipes-core/dbus/dbus-test_1.10.0.bb @@ -5,7 +5,7 @@ LICENSE = "AFL-2 | GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" -DEPENDS = "python-pygobject dbus dbus-glib" +DEPENDS = "python-pygobject dbus" RDEPENDS_${PN} += "make" RDEPENDS_${PN}-dev = "" @@ -18,8 +18,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ " -SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b" -SRC_URI[sha256sum] = "5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a" +SRC_URI[md5sum] = "5af6297348107a906c8449817a728b3b" +SRC_URI[sha256sum] = "1dfb9745fb992f1ccd43c920490de8caddf6726a6222e8b803be6098293f924b" S="${WORKDIR}/dbus-${PV}" FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" diff --git a/meta/recipes-core/dbus/dbus/python-config.patch b/meta/recipes-core/dbus/dbus/python-config.patch index 2944002..fbb4ede 100644 --- a/meta/recipes-core/dbus/dbus/python-config.patch +++ b/meta/recipes-core/dbus/dbus/python-config.patch @@ -6,19 +6,20 @@ Disable the python module check for cross compiling. Upstream-Status: Inappropriate [oe specific] Signed-off-by: Mark Hatle <mark.hatle@windriver.com> +Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk> ---- dbus-1.6.8/configure.ac.orig 2013-07-11 14:15:58.834554799 -0500 -+++ dbus-1.6.8/configure.ac 2013-07-11 14:14:40.969554848 -0500 -@@ -257,13 +257,6 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -267,13 +267,6 @@ # full test coverage is required, Python is a hard dependency - AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, dbus-python, pygobject]) + AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, dbus-python, pygi]) AM_PATH_PYTHON([2.6]) - AC_MSG_CHECKING([for Python modules for full test coverage]) -- if "$PYTHON" -c "import dbus, gobject, dbus.mainloop.glib"; then +- if "$PYTHON" -c "import dbus, gi.repository.GObject, dbus.mainloop.glib"; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) -- AC_MSG_ERROR([cannot import dbus, gobject, dbus.mainloop.glib Python modules]) +- AC_MSG_ERROR([cannot import dbus, gi.repository.GObject, dbus.mainloop.glib Python modules]) - fi else # --enable-tests not given: do not abort if Python is missing diff --git a/meta/recipes-core/dbus/dbus_1.8.20.bb b/meta/recipes-core/dbus/dbus_1.10.0.bb similarity index 93% rename from meta/recipes-core/dbus/dbus_1.8.20.bb rename to meta/recipes-core/dbus/dbus_1.10.0.bb index 207a018..cbfdf05 100644 --- a/meta/recipes-core/dbus/dbus_1.8.20.bb +++ b/meta/recipes-core/dbus/dbus_1.10.0.bb @@ -19,8 +19,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ " -SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b" -SRC_URI[sha256sum] = "5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a" +SRC_URI[md5sum] = "5af6297348107a906c8449817a728b3b" +SRC_URI[sha256sum] = "1dfb9745fb992f1ccd43c920490de8caddf6726a6222e8b803be6098293f924b" inherit useradd autotools pkgconfig gettext update-rc.d @@ -58,15 +58,20 @@ FILES_${PN} = "${bindir}/dbus-daemon* \ ${bindir}/dbus-monitor \ ${bindir}/dbus-launch \ ${bindir}/dbus-run-session \ + ${bindir}/dbus-update-activation-environment \ ${libexecdir}/dbus* \ ${sysconfdir} \ ${localstatedir} \ ${datadir}/dbus-1/services \ ${datadir}/dbus-1/system-services \ + ${datadir}/dbus-1/session.d \ + ${datadir}/dbus-1/session.conf \ + ${datadir}/dbus-1/system.d \ + ${datadir}/dbus-1/system.conf \ ${systemd_unitdir}/system/" FILES_${PN}-lib = "${libdir}/lib*.so.*" RRECOMMENDS_${PN}-lib = "${PN}" -FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" +FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool ${bindir}/dbus-test-tool" pkg_postinst_dbus() { # If both systemd and sysvinit are enabled, mask the dbus-1 init script @@ -86,8 +91,7 @@ EXTRA_OECONF = "--disable-tests \ --disable-xml-docs \ --disable-doxygen-docs \ --disable-libaudit \ - --disable-systemd \ - --without-dbus-glib" + --disable-systemd" EXTRA_OECONF_append_class-native = " --disable-selinux" -- 2.1.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v2 3/7] dbus: add apparmor support 2015-09-14 10:07 ` [PATCH v2 1/7] dbus: merge .bb and .inc Andrew Shadura 2015-09-14 10:07 ` [PATCH v2 2/7] dbus: update the recipes to 1.10.0 Andrew Shadura @ 2015-09-14 10:07 ` Andrew Shadura 2015-09-14 10:07 ` [PATCH v2 4/7] systemd: don't build against dbus unless required Andrew Shadura ` (4 subsequent siblings) 6 siblings, 0 replies; 19+ messages in thread From: Andrew Shadura @ 2015-09-14 10:07 UTC (permalink / raw) To: openembedded-core --- meta/recipes-core/dbus/dbus_1.10.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/dbus/dbus_1.10.0.bb b/meta/recipes-core/dbus/dbus_1.10.0.bb index cbfdf05..31cbef0 100644 --- a/meta/recipes-core/dbus/dbus_1.10.0.bb +++ b/meta/recipes-core/dbus/dbus_1.10.0.bb @@ -104,6 +104,7 @@ PACKAGECONFIG_class-nativesdk = "" # systemd<->dbus PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir" PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" +PACKAGECONFIG[apparmor] = "--enable-apparmor,--disable-apparmor,libapparmor" do_install() { autotools_do_install -- 2.1.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v2 4/7] systemd: don't build against dbus unless required 2015-09-14 10:07 ` [PATCH v2 1/7] dbus: merge .bb and .inc Andrew Shadura 2015-09-14 10:07 ` [PATCH v2 2/7] dbus: update the recipes to 1.10.0 Andrew Shadura 2015-09-14 10:07 ` [PATCH v2 3/7] dbus: add apparmor support Andrew Shadura @ 2015-09-14 10:07 ` Andrew Shadura 2015-09-14 10:07 ` [PATCH v2 5/7] systemd: add gnuefi package configuration option, switched off by default Andrew Shadura ` (3 subsequent siblings) 6 siblings, 0 replies; 19+ messages in thread From: Andrew Shadura @ 2015-09-14 10:07 UTC (permalink / raw) To: openembedded-core Modern systemd doesn't need dbus libraries normally, as it ships with its own dbus library. This is required to proceed with systemd support in dbus, as otherwise dependency loops occur. --- meta/recipes-core/systemd/systemd_225.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_225.bb b/meta/recipes-core/systemd/systemd_225.bb index 6ac99cd..5751bea 100644 --- a/meta/recipes-core/systemd/systemd_225.bb +++ b/meta/recipes-core/systemd/systemd_225.bb @@ -18,7 +18,7 @@ PROVIDES = "udev" PE = "1" -DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native util-linux" +DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline libcap libcgroup glib-2.0 qemu-native util-linux" SECTION = "base/shell" @@ -87,6 +87,7 @@ PACKAGECONFIG[iptc] = "--enable-libiptc,--disable-libiptc,iptables" PACKAGECONFIG[ldconfig] = "--enable-ldconfig,--disable-ldconfig,," PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" PACKAGECONFIG[valgrind] = "ac_cv_header_valgrind_memcheck_h=yes ac_cv_header_valgrind_valgrind_h=yes ,ac_cv_header_valgrind_memcheck_h=no ac_cv_header_valgrind_valgrind_h=no ,valgrind" +PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill" CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod" -- 2.1.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v2 5/7] systemd: add gnuefi package configuration option, switched off by default 2015-09-14 10:07 ` [PATCH v2 1/7] dbus: merge .bb and .inc Andrew Shadura ` (2 preceding siblings ...) 2015-09-14 10:07 ` [PATCH v2 4/7] systemd: don't build against dbus unless required Andrew Shadura @ 2015-09-14 10:07 ` Andrew Shadura 2015-09-14 10:07 ` [PATCH v2 6/7] dbus: add user sessions support Andrew Shadura ` (2 subsequent siblings) 6 siblings, 0 replies; 19+ messages in thread From: Andrew Shadura @ 2015-09-14 10:07 UTC (permalink / raw) To: openembedded-core --- meta/recipes-core/systemd/systemd_225.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/systemd/systemd_225.bb b/meta/recipes-core/systemd/systemd_225.bb index 5751bea..942f6ce 100644 --- a/meta/recipes-core/systemd/systemd_225.bb +++ b/meta/recipes-core/systemd/systemd_225.bb @@ -88,6 +88,7 @@ PACKAGECONFIG[ldconfig] = "--enable-ldconfig,--disable-ldconfig,," PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" PACKAGECONFIG[valgrind] = "ac_cv_header_valgrind_memcheck_h=yes ac_cv_header_valgrind_valgrind_h=yes ,ac_cv_header_valgrind_memcheck_h=no ac_cv_header_valgrind_valgrind_h=no ,valgrind" PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" +PACKAGECONFIG[efi] = "--enable-gnuefi,--disable-gnuefi,gnu-efi" CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill" CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod" -- 2.1.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v2 6/7] dbus: add user sessions support 2015-09-14 10:07 ` [PATCH v2 1/7] dbus: merge .bb and .inc Andrew Shadura ` (3 preceding siblings ...) 2015-09-14 10:07 ` [PATCH v2 5/7] systemd: add gnuefi package configuration option, switched off by default Andrew Shadura @ 2015-09-14 10:07 ` Andrew Shadura 2015-09-14 10:07 ` [PATCH v2 7/7] dbus: build with systemd support Andrew Shadura 2015-09-29 12:39 ` [PATCH v2 1/7] dbus: merge .bb and .inc Andrew Shadura 6 siblings, 0 replies; 19+ messages in thread From: Andrew Shadura @ 2015-09-14 10:07 UTC (permalink / raw) To: openembedded-core --- meta/recipes-core/dbus/dbus_1.10.0.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/dbus/dbus_1.10.0.bb b/meta/recipes-core/dbus/dbus_1.10.0.bb index 31cbef0..58210f4 100644 --- a/meta/recipes-core/dbus/dbus_1.10.0.bb +++ b/meta/recipes-core/dbus/dbus_1.10.0.bb @@ -68,7 +68,9 @@ FILES_${PN} = "${bindir}/dbus-daemon* \ ${datadir}/dbus-1/session.conf \ ${datadir}/dbus-1/system.d \ ${datadir}/dbus-1/system.conf \ - ${systemd_unitdir}/system/" + ${systemd_unitdir}/system/ \ + ${libdir}/systemd/user/* \ +" FILES_${PN}-lib = "${libdir}/lib*.so.*" RRECOMMENDS_${PN}-lib = "${PN}" FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool ${bindir}/dbus-test-tool" @@ -105,6 +107,7 @@ PACKAGECONFIG_class-nativesdk = "" PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir" PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" PACKAGECONFIG[apparmor] = "--enable-apparmor,--disable-apparmor,libapparmor" +PACKAGECONFIG[user-session] = "--enable-user-session,--disable-user-session" do_install() { autotools_do_install -- 2.1.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v2 7/7] dbus: build with systemd support 2015-09-14 10:07 ` [PATCH v2 1/7] dbus: merge .bb and .inc Andrew Shadura ` (4 preceding siblings ...) 2015-09-14 10:07 ` [PATCH v2 6/7] dbus: add user sessions support Andrew Shadura @ 2015-09-14 10:07 ` Andrew Shadura 2015-09-29 12:39 ` [PATCH v2 1/7] dbus: merge .bb and .inc Andrew Shadura 6 siblings, 0 replies; 19+ messages in thread From: Andrew Shadura @ 2015-09-14 10:07 UTC (permalink / raw) To: openembedded-core --- meta/recipes-core/dbus/dbus_1.10.0.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/recipes-core/dbus/dbus_1.10.0.bb b/meta/recipes-core/dbus/dbus_1.10.0.bb index 58210f4..d2bea13 100644 --- a/meta/recipes-core/dbus/dbus_1.10.0.bb +++ b/meta/recipes-core/dbus/dbus_1.10.0.bb @@ -92,8 +92,7 @@ pkg_postinst_dbus() { EXTRA_OECONF = "--disable-tests \ --disable-xml-docs \ --disable-doxygen-docs \ - --disable-libaudit \ - --disable-systemd" + --disable-libaudit" EXTRA_OECONF_append_class-native = " --disable-selinux" @@ -102,9 +101,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', PACKAGECONFIG_class-native = "" PACKAGECONFIG_class-nativesdk = "" -# Would like to --enable-systemd but that's a circular build-dependency between -# systemd<->dbus -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir" +PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/,--disable-systemd --without-systemdsystemunitdir,systemd" PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" PACKAGECONFIG[apparmor] = "--enable-apparmor,--disable-apparmor,libapparmor" PACKAGECONFIG[user-session] = "--enable-user-session,--disable-user-session" -- 2.1.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH v2 1/7] dbus: merge .bb and .inc 2015-09-14 10:07 ` [PATCH v2 1/7] dbus: merge .bb and .inc Andrew Shadura ` (5 preceding siblings ...) 2015-09-14 10:07 ` [PATCH v2 7/7] dbus: build with systemd support Andrew Shadura @ 2015-09-29 12:39 ` Andrew Shadura 2015-09-29 14:41 ` Burton, Ross 6 siblings, 1 reply; 19+ messages in thread From: Andrew Shadura @ 2015-09-29 12:39 UTC (permalink / raw) To: openembedded-core [-- Attachment #1: Type: text/plain, Size: 144 bytes --] Hi all, There hasn't been anything on this for two weeks already, has anyone considered merging these patches? -- Cheers, Andrew [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 1/7] dbus: merge .bb and .inc 2015-09-29 12:39 ` [PATCH v2 1/7] dbus: merge .bb and .inc Andrew Shadura @ 2015-09-29 14:41 ` Burton, Ross 2015-09-29 14:48 ` Andrew Shadura 2015-09-29 14:50 ` Richard Purdie 0 siblings, 2 replies; 19+ messages in thread From: Burton, Ross @ 2015-09-29 14:41 UTC (permalink / raw) To: Andrew Shadura; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 479 bytes --] Hi Andrew, On 29 September 2015 at 13:39, Andrew Shadura < andrew.shadura@collabora.co.uk> wrote: > There hasn't been anything on this for two weeks already, has anyone > considered merging these patches? > Sorry but they didn't quite make the M3 deadline (well, the patches did, but reviewing didn't as we were heads down trying to fix the build). If you can rebase and resend when master re-opens (when 2.0 is released) that would be much appreciated. Ross [-- Attachment #2: Type: text/html, Size: 933 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 1/7] dbus: merge .bb and .inc 2015-09-29 14:41 ` Burton, Ross @ 2015-09-29 14:48 ` Andrew Shadura 2015-09-29 14:54 ` Burton, Ross 2015-09-29 14:50 ` Richard Purdie 1 sibling, 1 reply; 19+ messages in thread From: Andrew Shadura @ 2015-09-29 14:48 UTC (permalink / raw) To: Burton, Ross; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 698 bytes --] On 29/09/15 16:41, Burton, Ross wrote: > On 29 September 2015 at 13:39, Andrew Shadura > <andrew.shadura@collabora.co.uk <mailto:andrew.shadura@collabora.co.uk>> > wrote: > >> There hasn't been anything on this for two weeks already, has anyone >> considered merging these patches? > Sorry but they didn't quite make the M3 deadline (well, the patches did, > but reviewing didn't as we were heads down trying to fix the build). If > you can rebase and resend when master re-opens (when 2.0 is released) > that would be much appreciated. Cool thanks, at least I won't feel being ignored anymore :) So, what is the planned date for the release? -- Cheers, Andrew [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 1/7] dbus: merge .bb and .inc 2015-09-29 14:48 ` Andrew Shadura @ 2015-09-29 14:54 ` Burton, Ross 0 siblings, 0 replies; 19+ messages in thread From: Burton, Ross @ 2015-09-29 14:54 UTC (permalink / raw) To: Andrew Shadura; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 188 bytes --] On 29 September 2015 at 15:48, Andrew Shadura < andrew.shadura@collabora.co.uk> wrote: > So, what is the planned date for the release? > It's scheduled for early October. Ross [-- Attachment #2: Type: text/html, Size: 585 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 1/7] dbus: merge .bb and .inc 2015-09-29 14:41 ` Burton, Ross 2015-09-29 14:48 ` Andrew Shadura @ 2015-09-29 14:50 ` Richard Purdie 2015-09-29 14:52 ` Andrew Shadura 1 sibling, 1 reply; 19+ messages in thread From: Richard Purdie @ 2015-09-29 14:50 UTC (permalink / raw) To: Burton, Ross; +Cc: Andrew Shadura, OE-core On Tue, 2015-09-29 at 15:41 +0100, Burton, Ross wrote: > On 29 September 2015 at 13:39, Andrew Shadura > <andrew.shadura@collabora.co.uk> wrote: > There hasn't been anything on this for two weeks already, has > anyone > considered merging these patches? > > Sorry but they didn't quite make the M3 deadline (well, the patches > did, but reviewing didn't as we were heads down trying to fix the > build). If you can rebase and resend when master re-opens (when 2.0 > is released) that would be much appreciated. Just to add that what would help is a little bit more explanation about what happened in the patches. It looks like dbus-glib isn't needed for example but the commit message doesn't mention why? Cheers, Richard ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 1/7] dbus: merge .bb and .inc 2015-09-29 14:50 ` Richard Purdie @ 2015-09-29 14:52 ` Andrew Shadura 0 siblings, 0 replies; 19+ messages in thread From: Andrew Shadura @ 2015-09-29 14:52 UTC (permalink / raw) To: Richard Purdie, Burton, Ross; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 921 bytes --] On 29/09/15 16:50, Richard Purdie wrote: > On Tue, 2015-09-29 at 15:41 +0100, Burton, Ross wrote: >> > On 29 September 2015 at 13:39, Andrew Shadura >> > <andrew.shadura@collabora.co.uk> wrote: >> >> There hasn't been anything on this for two weeks already, has >> >> anyone >> >> considered merging these patches? >> > >> > Sorry but they didn't quite make the M3 deadline (well, the patches >> > did, but reviewing didn't as we were heads down trying to fix the >> > build). If you can rebase and resend when master re-opens (when 2.0 >> > is released) that would be much appreciated. > Just to add that what would help is a little bit more explanation about > what happened in the patches. It looks like dbus-glib isn't needed for > example but the commit message doesn't mention why? Thanks. I will update the patches when I submit them next time. -- Cheers, Andrew [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v3 1/2] dbus: add user sessions support [not found] <1440666021-11411-1-git-send-email-andrew.shadura@collabora.co.uk> 2015-09-14 10:07 ` [PATCH v2 1/7] dbus: merge .bb and .inc Andrew Shadura @ 2015-09-14 10:41 ` Andrew Shadura 2015-09-14 10:41 ` [PATCH v3 2/2] dbus: build with systemd support Andrew Shadura 2015-09-15 11:36 ` [PATCH v3 1/2] dbus: add user sessions support Tanu Kaskinen 1 sibling, 2 replies; 19+ messages in thread From: Andrew Shadura @ 2015-09-14 10:41 UTC (permalink / raw) To: openembedded-core --- meta/recipes-core/dbus/dbus_1.10.0.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/dbus/dbus_1.10.0.bb b/meta/recipes-core/dbus/dbus_1.10.0.bb index 31cbef0..e099f4b 100644 --- a/meta/recipes-core/dbus/dbus_1.10.0.bb +++ b/meta/recipes-core/dbus/dbus_1.10.0.bb @@ -68,7 +68,9 @@ FILES_${PN} = "${bindir}/dbus-daemon* \ ${datadir}/dbus-1/session.conf \ ${datadir}/dbus-1/system.d \ ${datadir}/dbus-1/system.conf \ - ${systemd_unitdir}/system/" + ${systemd_system_unitdir} \ + ${systemd_user_unitdir} \ +" FILES_${PN}-lib = "${libdir}/lib*.so.*" RRECOMMENDS_${PN}-lib = "${PN}" FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool ${bindir}/dbus-test-tool" @@ -105,6 +107,7 @@ PACKAGECONFIG_class-nativesdk = "" PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir" PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" PACKAGECONFIG[apparmor] = "--enable-apparmor,--disable-apparmor,libapparmor" +PACKAGECONFIG[user-session] = "--enable-user-session,--disable-user-session" do_install() { autotools_do_install -- 2.1.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v3 2/2] dbus: build with systemd support 2015-09-14 10:41 ` [PATCH v3 1/2] dbus: add user sessions support Andrew Shadura @ 2015-09-14 10:41 ` Andrew Shadura 2015-09-15 11:36 ` [PATCH v3 1/2] dbus: add user sessions support Tanu Kaskinen 1 sibling, 0 replies; 19+ messages in thread From: Andrew Shadura @ 2015-09-14 10:41 UTC (permalink / raw) To: openembedded-core --- meta/recipes-core/dbus/dbus_1.10.0.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/recipes-core/dbus/dbus_1.10.0.bb b/meta/recipes-core/dbus/dbus_1.10.0.bb index e099f4b..a2bb493 100644 --- a/meta/recipes-core/dbus/dbus_1.10.0.bb +++ b/meta/recipes-core/dbus/dbus_1.10.0.bb @@ -92,8 +92,7 @@ pkg_postinst_dbus() { EXTRA_OECONF = "--disable-tests \ --disable-xml-docs \ --disable-doxygen-docs \ - --disable-libaudit \ - --disable-systemd" + --disable-libaudit" EXTRA_OECONF_append_class-native = " --disable-selinux" @@ -102,9 +101,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', PACKAGECONFIG_class-native = "" PACKAGECONFIG_class-nativesdk = "" -# Would like to --enable-systemd but that's a circular build-dependency between -# systemd<->dbus -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir" +PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/,--disable-systemd --without-systemdsystemunitdir,systemd" PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" PACKAGECONFIG[apparmor] = "--enable-apparmor,--disable-apparmor,libapparmor" PACKAGECONFIG[user-session] = "--enable-user-session,--disable-user-session" -- 2.1.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH v3 1/2] dbus: add user sessions support 2015-09-14 10:41 ` [PATCH v3 1/2] dbus: add user sessions support Andrew Shadura 2015-09-14 10:41 ` [PATCH v3 2/2] dbus: build with systemd support Andrew Shadura @ 2015-09-15 11:36 ` Tanu Kaskinen 2015-09-15 11:48 ` Pau Espin Pedrol 2015-09-15 12:53 ` Andrew Shadura 1 sibling, 2 replies; 19+ messages in thread From: Tanu Kaskinen @ 2015-09-15 11:36 UTC (permalink / raw) To: Andrew Shadura, openembedded-core On Mon, 2015-09-14 at 12:41 +0200, Andrew Shadura wrote: > --- > meta/recipes-core/dbus/dbus_1.10.0.bb | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-core/dbus/dbus_1.10.0.bb b/meta/recipes-core/dbus/dbus_1.10.0.bb > index 31cbef0..e099f4b 100644 > --- a/meta/recipes-core/dbus/dbus_1.10.0.bb > +++ b/meta/recipes-core/dbus/dbus_1.10.0.bb > @@ -68,7 +68,9 @@ FILES_${PN} = "${bindir}/dbus-daemon* \ > ${datadir}/dbus-1/session.conf \ > ${datadir}/dbus-1/system.d \ > ${datadir}/dbus-1/system.conf \ > - ${systemd_unitdir}/system/" > + ${systemd_system_unitdir} \ > + ${systemd_user_unitdir} \ > +" > FILES_${PN}-lib = "${libdir}/lib*.so.*" > RRECOMMENDS_${PN}-lib = "${PN}" > FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool ${bindir}/dbus-test-tool" > @@ -105,6 +107,7 @@ PACKAGECONFIG_class-nativesdk = "" > PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir" > PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" > PACKAGECONFIG[apparmor] = "--enable-apparmor,--disable-apparmor,libapparmor" > +PACKAGECONFIG[user-session] = "--enable-user-session,--disable-user-session" I think user-session should be enabled by default when systemd is in DISTRO_FEATURES. Some services, e.g. PulseAudio, can fully enable their systemd integration only if dbus is compiled with --enable-user -session. -- Tanu ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v3 1/2] dbus: add user sessions support 2015-09-15 11:36 ` [PATCH v3 1/2] dbus: add user sessions support Tanu Kaskinen @ 2015-09-15 11:48 ` Pau Espin Pedrol 2015-09-15 12:53 ` Andrew Shadura 1 sibling, 0 replies; 19+ messages in thread From: Pau Espin Pedrol @ 2015-09-15 11:48 UTC (permalink / raw) To: Tanu Kaskinen; +Cc: Andrew Shadura, OE-core [-- Attachment #1: Type: text/plain, Size: 2139 bytes --] Hi, I agree with Tanu. +1 enabling for user-session by default if systemd is used. Pau Espin Pedrol mail/jabber: pespin.shar@gmail.com http://blog.espeweb.net 2015-09-15 13:36 GMT+02:00 Tanu Kaskinen <tanuk@iki.fi>: > On Mon, 2015-09-14 at 12:41 +0200, Andrew Shadura wrote: > > --- > > meta/recipes-core/dbus/dbus_1.10.0.bb | 5 ++++- > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/meta/recipes-core/dbus/dbus_1.10.0.bb > b/meta/recipes-core/dbus/dbus_1.10.0.bb > > index 31cbef0..e099f4b 100644 > > --- a/meta/recipes-core/dbus/dbus_1.10.0.bb > > +++ b/meta/recipes-core/dbus/dbus_1.10.0.bb > > @@ -68,7 +68,9 @@ FILES_${PN} = "${bindir}/dbus-daemon* \ > > ${datadir}/dbus-1/session.conf \ > > ${datadir}/dbus-1/system.d \ > > ${datadir}/dbus-1/system.conf \ > > - ${systemd_unitdir}/system/" > > + ${systemd_system_unitdir} \ > > + ${systemd_user_unitdir} \ > > +" > > FILES_${PN}-lib = "${libdir}/lib*.so.*" > > RRECOMMENDS_${PN}-lib = "${PN}" > > FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool > ${bindir}/dbus-test-tool" > > @@ -105,6 +107,7 @@ PACKAGECONFIG_class-nativesdk = "" > > PACKAGECONFIG[systemd] = > "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir" > > PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x > --disable-x11-autolaunch, virtual/libx11 libsm" > > PACKAGECONFIG[apparmor] = > "--enable-apparmor,--disable-apparmor,libapparmor" > > +PACKAGECONFIG[user-session] = > "--enable-user-session,--disable-user-session" > > I think user-session should be enabled by default when systemd is in > DISTRO_FEATURES. Some services, e.g. PulseAudio, can fully enable their > systemd integration only if dbus is compiled with --enable-user > -session. > > -- > Tanu > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > [-- Attachment #2: Type: text/html, Size: 3550 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v3 1/2] dbus: add user sessions support 2015-09-15 11:36 ` [PATCH v3 1/2] dbus: add user sessions support Tanu Kaskinen 2015-09-15 11:48 ` Pau Espin Pedrol @ 2015-09-15 12:53 ` Andrew Shadura 2015-09-15 13:49 ` Tanu Kaskinen 1 sibling, 1 reply; 19+ messages in thread From: Andrew Shadura @ 2015-09-15 12:53 UTC (permalink / raw) To: Tanu Kaskinen, openembedded-core [-- Attachment #1: Type: text/plain, Size: 363 bytes --] On 15/09/15 13:36, Tanu Kaskinen wrote: > I think user-session should be enabled by default when systemd is in > DISTRO_FEATURES. Some services, e.g. PulseAudio, can fully enable their > systemd integration only if dbus is compiled with --enable-user > -session. I think so too, but I think it's worth a separate patch, right? -- Cheers, Andrew [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v3 1/2] dbus: add user sessions support 2015-09-15 12:53 ` Andrew Shadura @ 2015-09-15 13:49 ` Tanu Kaskinen 0 siblings, 0 replies; 19+ messages in thread From: Tanu Kaskinen @ 2015-09-15 13:49 UTC (permalink / raw) To: Andrew Shadura, openembedded-core On Tue, 2015-09-15 at 14:53 +0200, Andrew Shadura wrote: > On 15/09/15 13:36, Tanu Kaskinen wrote: > > I think user-session should be enabled by default when systemd is in > > DISTRO_FEATURES. Some services, e.g. PulseAudio, can fully enable their > > systemd integration only if dbus is compiled with --enable-user > > -session. > > I think so too, but I think it's worth a separate patch, right? I think this patch could already have it "right", but I don't really mind either way. -- Tanu ^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2015-09-29 14:54 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1440666021-11411-1-git-send-email-andrew.shadura@collabora.co.uk>
2015-09-14 10:07 ` [PATCH v2 1/7] dbus: merge .bb and .inc Andrew Shadura
2015-09-14 10:07 ` [PATCH v2 2/7] dbus: update the recipes to 1.10.0 Andrew Shadura
2015-09-14 10:07 ` [PATCH v2 3/7] dbus: add apparmor support Andrew Shadura
2015-09-14 10:07 ` [PATCH v2 4/7] systemd: don't build against dbus unless required Andrew Shadura
2015-09-14 10:07 ` [PATCH v2 5/7] systemd: add gnuefi package configuration option, switched off by default Andrew Shadura
2015-09-14 10:07 ` [PATCH v2 6/7] dbus: add user sessions support Andrew Shadura
2015-09-14 10:07 ` [PATCH v2 7/7] dbus: build with systemd support Andrew Shadura
2015-09-29 12:39 ` [PATCH v2 1/7] dbus: merge .bb and .inc Andrew Shadura
2015-09-29 14:41 ` Burton, Ross
2015-09-29 14:48 ` Andrew Shadura
2015-09-29 14:54 ` Burton, Ross
2015-09-29 14:50 ` Richard Purdie
2015-09-29 14:52 ` Andrew Shadura
2015-09-14 10:41 ` [PATCH v3 1/2] dbus: add user sessions support Andrew Shadura
2015-09-14 10:41 ` [PATCH v3 2/2] dbus: build with systemd support Andrew Shadura
2015-09-15 11:36 ` [PATCH v3 1/2] dbus: add user sessions support Tanu Kaskinen
2015-09-15 11:48 ` Pau Espin Pedrol
2015-09-15 12:53 ` Andrew Shadura
2015-09-15 13:49 ` Tanu Kaskinen
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.