summaryrefslogtreecommitdiffstats
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:58:11 +0000
commit72f9e399757e3c15a0505d18448a3f6a9aabacf5 (patch)
treec61bb99b0db0f205f8fb325efdcc586f28ed44fe
parent424466b91fa3755c3cced9781d562f60fa7bfa62 (diff)
downloadpoky-72f9e399757e3c15a0505d18448a3f6a9aabacf5.tar.gz
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. (From OE-Core rev: 93b6ac66a90a6f2cca18ee4cae15f899da7ecb15) 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"
14# python scripts are under GPLv2+ 14# python scripts are under GPLv2+
15LICENSE = "GPLv2+ & LGPLv2.1+" 15LICENSE = "GPLv2+ & LGPLv2.1+"
16 16
17DEPENDS = "expat libcap libdaemon dbus glib-2.0" 17DEPENDS = "expat libcap libdaemon glib-2.0"
18 18
19SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz \ 19SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz \
20 file://00avahi-autoipd \ 20 file://00avahi-autoipd \
@@ -23,6 +23,9 @@ SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}
23 " 23 "
24UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/" 24UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/"
25 25
26PACKAGECONFIG ??= "dbus"
27PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
28
26USERADD_PACKAGES = "avahi-daemon avahi-autoipd" 29USERADD_PACKAGES = "avahi-daemon avahi-autoipd"
27USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ 30USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \
28 --no-create-home --shell /bin/false \ 31 --no-create-home --shell /bin/false \
@@ -125,7 +128,7 @@ do_install() {
125 rm -rf ${D}${localstatedir}/run 128 rm -rf ${D}${localstatedir}/run
126 rmdir --ignore-fail-on-non-empty ${D}${localstatedir} 129 rmdir --ignore-fail-on-non-empty ${D}${localstatedir}
127 rm -rf ${D}${datadir}/dbus-1/interfaces 130 rm -rf ${D}${datadir}/dbus-1/interfaces
128 rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1 131 test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1
129 rm -rf ${D}${libdir}/avahi 132 rm -rf ${D}${libdir}/avahi
130 133
131 install -d ${D}${sysconfdir}/udhcpc.d 134 install -d ${D}${sysconfdir}/udhcpc.d