diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-01-17 15:31:11 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-01 16:28:40 +0000 |
| commit | f0a81bbe0449a29edfcaba944e568e9731fe716d (patch) | |
| tree | 43655d9e79c345ddb234112223760b1a35c89e26 | |
| parent | c75ad4694cdbe72571d1ceb8224a7738dba18f1b (diff) | |
| download | openembedded-core-f0a81bbe0449a29edfcaba944e568e9731fe716d.tar.gz openembedded-core-f0a81bbe0449a29edfcaba944e568e9731fe716d.tar.bz2 openembedded-core-f0a81bbe0449a29edfcaba944e568e9731fe716d.zip | |
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.inc | 9 | ||||
| -rw-r--r-- | meta/recipes-connectivity/avahi/avahi_0.6.28.bb | 2 |
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 \ --disable-python \ --disable-doxygen-doc" -PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-gobject avahi-autoipd avahi-utils libavahi-ui avahi-ui-utils" +PACKAGES =+ "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" FILES_libavahi-common = "${libdir}/libavahi-common.so.*" FILES_libavahi-core = "${libdir}/libavahi-core.so.*" FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*" +FILES_libavahi-ui-dev = "${libdir}/libavahi-ui.* \ + ${includedir}/avahi-ui/* \ + ${libdir}/pkgconfig/avahi-ui.pc" FILES_avahi-daemon = "${sbindir}/avahi-daemon \ ${sysconfdir}/avahi/avahi-daemon.conf \ ${sysconfdir}/avahi/hosts \ @@ -59,9 +62,13 @@ FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*" FILES_avahi-utils = "${bindir}/avahi-*" FILES_avahi-ui-utils = "${bindir}/bssh ${bindir}/bvnc ${bindir}/bshell \ + ${bindir}/avahi-discover-standalone \ ${datadir}/applications \ ${datadir}/avahi/interfaces" +RRECOMMENDS_avahi-dev = "gettext-dev expat-dev libcap-dev libdaemon-dev dbus-dev glib-2.0-dev update-rc.d-dev" +RRECOMMENDS_avahi-dev[nodeprrecs] = 1 + CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" INITSCRIPT_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 \ file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" RDEPENDS_avahi-daemon = "sysvinit-pidof" -PR = "r1" +PR = "r2" EXTRA_OECONF += "--disable-gtk3" |