aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Rehsack <rehsack@gmail.com>2016-03-01 13:49:44 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-09 16:36:32 +0000
commit93b6ac66a90a6f2cca18ee4cae15f899da7ecb15 (patch)
treeeaf29f9f9bb7856a9b719e2935c118d93c229e16
parent0073679c60c813c7c8d62bff997feb30ce64543c (diff)
downloadopenembedded-core-contrib-93b6ac66a90a6f2cca18ee4cae15f899da7ecb15.tar.gz
openembedded-core-contrib-93b6ac66a90a6f2cca18ee4cae15f899da7ecb15.tar.bz2
openembedded-core-contrib-93b6ac66a90a6f2cca18ee4cae15f899da7ecb15.zip
avahi: make dbus optional but default
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 <sno@netbsd.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index faa8ee87e5..8ee461b610 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] = "--enable-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 \
@@ -125,7 +128,7 @@ do_install() {
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
+ test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1
rm -rf ${D}${libdir}/avahi
install -d ${D}${sysconfdir}/udhcpc.d