summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-01-17 15:31:11 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-01 16:28:40 +0000
commitf0a81bbe0449a29edfcaba944e568e9731fe716d (patch)
tree43655d9e79c345ddb234112223760b1a35c89e26
parentc75ad4694cdbe72571d1ceb8224a7738dba18f1b (diff)
downloadpoky-f0a81bbe0449a29edfcaba944e568e9731fe716d.tar.gz
avahi: prevent unnecessary runtime dependency on gtk+
* Move avahi-discover-standalone to avahi-ui-utils as it's a GUI tool * Split out avahi-ui dev files from avahi-dev to a libavahi-ui-dev package (using the new nodeprrecs flag to avoid automatic RRECOMMENDS calculation for avahi-dev) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc9
-rw-r--r--meta/recipes-connectivity/avahi/avahi_0.6.28.bb2
2 files changed, 9 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 5c3b4dd75e..9f83d8dadc 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -37,11 +37,14 @@ EXTRA_OECONF = "--with-distro=debian \
37 --disable-python \ 37 --disable-python \
38 --disable-doxygen-doc" 38 --disable-doxygen-doc"
39 39
40PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-gobject avahi-autoipd avahi-utils libavahi-ui avahi-ui-utils" 40PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-gobject avahi-autoipd avahi-ui-utils avahi-utils libavahi-ui libavahi-ui-dev"
41 41
42FILES_libavahi-common = "${libdir}/libavahi-common.so.*" 42FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
43FILES_libavahi-core = "${libdir}/libavahi-core.so.*" 43FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
44FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*" 44FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*"
45FILES_libavahi-ui-dev = "${libdir}/libavahi-ui.* \
46 ${includedir}/avahi-ui/* \
47 ${libdir}/pkgconfig/avahi-ui.pc"
45FILES_avahi-daemon = "${sbindir}/avahi-daemon \ 48FILES_avahi-daemon = "${sbindir}/avahi-daemon \
46 ${sysconfdir}/avahi/avahi-daemon.conf \ 49 ${sysconfdir}/avahi/avahi-daemon.conf \
47 ${sysconfdir}/avahi/hosts \ 50 ${sysconfdir}/avahi/hosts \
@@ -59,9 +62,13 @@ FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
59FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*" 62FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*"
60FILES_avahi-utils = "${bindir}/avahi-*" 63FILES_avahi-utils = "${bindir}/avahi-*"
61FILES_avahi-ui-utils = "${bindir}/bssh ${bindir}/bvnc ${bindir}/bshell \ 64FILES_avahi-ui-utils = "${bindir}/bssh ${bindir}/bvnc ${bindir}/bshell \
65 ${bindir}/avahi-discover-standalone \
62 ${datadir}/applications \ 66 ${datadir}/applications \
63 ${datadir}/avahi/interfaces" 67 ${datadir}/avahi/interfaces"
64 68
69RRECOMMENDS_avahi-dev = "gettext-dev expat-dev libcap-dev libdaemon-dev dbus-dev glib-2.0-dev update-rc.d-dev"
70RRECOMMENDS_avahi-dev[nodeprrecs] = 1
71
65CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" 72CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
66 73
67INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" 74INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.28.bb b/meta/recipes-connectivity/avahi/avahi_0.6.28.bb
index fb339e79ab..6e034b0508 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.6.28.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.6.28.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
7 file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" 7 file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
8 8
9RDEPENDS_avahi-daemon = "sysvinit-pidof" 9RDEPENDS_avahi-daemon = "sysvinit-pidof"
10PR = "r1" 10PR = "r2"
11 11
12EXTRA_OECONF += "--disable-gtk3" 12EXTRA_OECONF += "--disable-gtk3"
13 13