summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/avahi
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-24 15:17:58 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-24 22:12:04 (GMT)
commit29a04dc676b26bf3f242c42a9be1630acc6fff22 (patch)
tree41f4152cdea6c4c54e76ac6cd03ac5f370881bb6 /meta/recipes-connectivity/avahi
parent1ec0cc3edb714be7dd4cc3a4ec89cd29cdc790ae (diff)
downloadpoky-29a04dc676b26bf3f242c42a9be1630acc6fff22.tar.gz
avahi-ui: Fix packaging and conflict with the avahi recipe
We need to remove the files from avahi-ui which conflict with the avahi recipe. If we don't do this they trigger packaging warnings and can also overwrite files in the sysroot unexpectedly causing build failures (if X depends on avahi, it expects avahi's files to stay there, not disappear as avahi-ui build/stages). This patch cleans up the packaging although I wish there were an alterantive to the do_install which makes my eyes bleed. [YOCTO #1770] [YOCTO #1722] (From OE-Core rev: 95b383781f875a0f10e5c1de039289bb89e421dd) 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.30.bb32
1 files changed, 29 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb
index e0733a9..c903087 100644
--- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb
+++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
6 6
7require avahi.inc 7require avahi.inc
8 8
9PR = "${INC_PR}.0" 9PR = "${INC_PR}.1"
10 10
11DEPENDS += "avahi gtk+ libglade" 11DEPENDS += "avahi gtk+ libglade"
12 12
@@ -14,7 +14,7 @@ AVAHI_GTK = "--enable-gtk --disable-gtk3"
14 14
15S = "${WORKDIR}/avahi-${PV}" 15S = "${WORKDIR}/avahi-${PV}"
16 16
17PACKAGES = "${PN} ${PN}-utils ${PN}-dbg ${PN}-dev python-avahi avahi-discover avahi-discover-standalone" 17PACKAGES = "${PN} ${PN}-utils ${PN}-dbg ${PN}-dev ${PN}-doc python-avahi avahi-discover avahi-discover-standalone"
18 18
19FILES_${PN} = "${libdir}/libavahi-ui*.so.*" 19FILES_${PN} = "${libdir}/libavahi-ui*.so.*"
20FILES_${PN}-dbg += "${libdir}/.debug/libavah-ui*" 20FILES_${PN}-dbg += "${libdir}/.debug/libavah-ui*"
@@ -25,7 +25,7 @@ FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*"
25FILES_python-avahi = "${PYTHON_SITEPACKAGES_DIR}/avahi/*" 25FILES_python-avahi = "${PYTHON_SITEPACKAGES_DIR}/avahi/*"
26FILES_avahi-discover = "${bindir}/avahi-discover \ 26FILES_avahi-discover = "${bindir}/avahi-discover \
27 ${datadir}/applications/avahi-discover.desktop \ 27 ${datadir}/applications/avahi-discover.desktop \
28 ${datadir}/avahi/interfaces/avahi-discover.glade" 28 ${datadir}/avahi/interfaces/avahi-discover*"
29FILES_avahi-discover-standalone = "${bindir}/avahi-discover-standalone \ 29FILES_avahi-discover-standalone = "${bindir}/avahi-discover-standalone \
30 ${datadir}/avahi/interfaces/avahi-discover.glade" 30 ${datadir}/avahi/interfaces/avahi-discover.glade"
31 31
@@ -35,3 +35,29 @@ RDEPENDS_python-avahi = "python-dbus"
35 35
36SRC_URI[md5sum] = "e4db89a2a403ff4c47d66ac66fad1f43" 36SRC_URI[md5sum] = "e4db89a2a403ff4c47d66ac66fad1f43"
37SRC_URI[sha256sum] = "f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f" 37SRC_URI[sha256sum] = "f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f"
38
39do_install_append () {
40 rm ${D}${sysconfdir} -rf
41 rm ${D}${base_libdir} -rf
42 rm ${D}${base_libdir} -rf
43 rm ${D}${bindir}/avahi-b*
44 rm ${D}${bindir}/avahi-p*
45 rm ${D}${bindir}/avahi-r*
46 rm ${D}${bindir}/avahi-s*
47 rm ${D}${includedir}/avahi-c* -rf
48 rm ${D}${includedir}/avahi-g* -rf
49 rm ${D}${libdir}/libavahi-c*
50 rm ${D}${libdir}/libavahi-g*
51 rm ${D}${libdir}/pkgconfig/avahi-c*
52 rm ${D}${libdir}/pkgconfig/avahi-g*
53 rmdir ${D}${libdir}/avahi
54 rm ${D}${sbindir} -rf
55 rm ${D}${datadir}/avahi/a*
56 rm ${D}${datadir}/avahi/s*
57 rm ${D}${datadir}/dbus* -rf
58 rm ${D}${mandir}/man1/a*
59 rm ${D}${mandir}/man5 -rf
60 rm ${D}${mandir}/man8 -rf
61 rmdir ${D}${localstatedir}
62}
63