Since do_install fails when dbus is removed by .bbappend, add packageconfig to allow users to get rid of desktop ipc helper dbus.
Signed-off-by: Jens Rehsack <[email protected]> --- meta/recipes-connectivity/avahi/avahi.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index faa8ee8..435fbc5 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -14,7 +14,7 @@ SECTION = "network" # python scripts are under GPLv2+ LICENSE = "GPLv2+ & LGPLv2.1+" -DEPENDS = "expat libcap libdaemon dbus glib-2.0" +DEPENDS = "expat libcap libdaemon glib-2.0" SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz \ file://00avahi-autoipd \ @@ -23,6 +23,9 @@ SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV} " UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/"; +PACKAGECONFIG ??= "dbus" +PACKAGECONFIG[dbus] = ",--disable-dbus,dbus" + USERADD_PACKAGES = "avahi-daemon avahi-autoipd" USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ --no-create-home --shell /bin/false \ @@ -124,8 +127,8 @@ do_install() { # if /var/run become non-empty in the future, need to install it via volatile rm -rf ${D}${localstatedir}/run rmdir --ignore-fail-on-non-empty ${D}${localstatedir} - rm -rf ${D}${datadir}/dbus-1/interfaces - rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1 + ${@bb.utils.contains('PACKAGECONFIG','dbus','rm -rf ${D}${datadir}/dbus-1/interfaces','',d)} + ${@bb.utils.contains('PACKAGECONFIG','dbus','rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1','',d)} rm -rf ${D}${libdir}/avahi install -d ${D}${sysconfdir}/udhcpc.d -- 2.6.3 -- Jens Rehsack - [email protected]
signature.asc
Description: Message signed with OpenPGP using GPGMail
-- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
