summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/avahi
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2013-06-10 16:15:49 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-11 15:56:00 +0100
commitb1f2f49945aa0f0261cd1c1db995a16ba0dea1ff (patch)
tree0c74a576aa4dccf4086527e24b30a6f0070549e9 /meta/recipes-connectivity/avahi
parent8331d0ad41469a99c481c7ebdb0ff0ca54217502 (diff)
downloadpoky-b1f2f49945aa0f0261cd1c1db995a16ba0dea1ff.tar.gz
avahi: inherit python classes, use PACKAGECONFIG
Without using our python classes and having appropriate dependencies, the build is nondeterministic, and whether a python-avahi package is produced will vary depending on the host environment, yet avahi-discover is always produced, and it depends on python-avahi. (From OE-Core rev: 4599ef630c13224506671bf84569bfc240cd3032) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/avahi')
-rw-r--r--meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb9
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
index 7d56dad641..557c1c1651 100644
--- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
+++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
@@ -6,6 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
6 6
7require avahi.inc 7require avahi.inc
8 8
9inherit python-dir pythonnative
10
11PACKAGECONFIG ??= "python"
12PACKAGECONFIG[python] = "--enable-python,--disable-python,python-native python"
13
9PR = "${INC_PR}.0" 14PR = "${INC_PR}.0"
10 15
11SRC_URI[md5sum] = "2f22745b8f7368ad5a0a3fddac343f2d" 16SRC_URI[md5sum] = "2f22745b8f7368ad5a0a3fddac343f2d"
@@ -26,7 +31,7 @@ FILES_${PN}-staticdev += "${libdir}/libavahi-ui.a"
26 31
27FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*" 32FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*"
28 33
29FILES_python-avahi = "${PYTHON_SITEPACKAGES_DIR}/avahi/*" 34FILES_python-avahi = "${PYTHON_SITEPACKAGES_DIR}/avahi ${PYTHON_SITEPACKAGES_DIR}/avahi_discover"
30FILES_avahi-discover = "${bindir}/avahi-discover \ 35FILES_avahi-discover = "${bindir}/avahi-discover \
31 ${datadir}/applications/avahi-discover.desktop \ 36 ${datadir}/applications/avahi-discover.desktop \
32 ${datadir}/avahi/interfaces/avahi-discover*" 37 ${datadir}/avahi/interfaces/avahi-discover*"
@@ -34,7 +39,7 @@ FILES_avahi-discover-standalone = "${bindir}/avahi-discover-standalone \
34 ${datadir}/avahi/interfaces/avahi-discover.glade" 39 ${datadir}/avahi/interfaces/avahi-discover.glade"
35 40
36RDEPENDS_avahi-discover = "python-avahi python-pygtk" 41RDEPENDS_avahi-discover = "python-avahi python-pygtk"
37RDEPENDS_python-avahi = "python-dbus" 42RDEPENDS_python-avahi = "python-core python-dbus"
38 43
39 44
40do_install_append () { 45do_install_append () {