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>
This commit is contained in:
parent
1ec0cc3edb
commit
29a04dc676
|
@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
|
|||
|
||||
require avahi.inc
|
||||
|
||||
PR = "${INC_PR}.0"
|
||||
PR = "${INC_PR}.1"
|
||||
|
||||
DEPENDS += "avahi gtk+ libglade"
|
||||
|
||||
|
@ -14,7 +14,7 @@ AVAHI_GTK = "--enable-gtk --disable-gtk3"
|
|||
|
||||
S = "${WORKDIR}/avahi-${PV}"
|
||||
|
||||
PACKAGES = "${PN} ${PN}-utils ${PN}-dbg ${PN}-dev python-avahi avahi-discover avahi-discover-standalone"
|
||||
PACKAGES = "${PN} ${PN}-utils ${PN}-dbg ${PN}-dev ${PN}-doc python-avahi avahi-discover avahi-discover-standalone"
|
||||
|
||||
FILES_${PN} = "${libdir}/libavahi-ui*.so.*"
|
||||
FILES_${PN}-dbg += "${libdir}/.debug/libavah-ui*"
|
||||
|
@ -25,7 +25,7 @@ FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*"
|
|||
FILES_python-avahi = "${PYTHON_SITEPACKAGES_DIR}/avahi/*"
|
||||
FILES_avahi-discover = "${bindir}/avahi-discover \
|
||||
${datadir}/applications/avahi-discover.desktop \
|
||||
${datadir}/avahi/interfaces/avahi-discover.glade"
|
||||
${datadir}/avahi/interfaces/avahi-discover*"
|
||||
FILES_avahi-discover-standalone = "${bindir}/avahi-discover-standalone \
|
||||
${datadir}/avahi/interfaces/avahi-discover.glade"
|
||||
|
||||
|
@ -35,3 +35,29 @@ RDEPENDS_python-avahi = "python-dbus"
|
|||
|
||||
SRC_URI[md5sum] = "e4db89a2a403ff4c47d66ac66fad1f43"
|
||||
SRC_URI[sha256sum] = "f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f"
|
||||
|
||||
do_install_append () {
|
||||
rm ${D}${sysconfdir} -rf
|
||||
rm ${D}${base_libdir} -rf
|
||||
rm ${D}${base_libdir} -rf
|
||||
rm ${D}${bindir}/avahi-b*
|
||||
rm ${D}${bindir}/avahi-p*
|
||||
rm ${D}${bindir}/avahi-r*
|
||||
rm ${D}${bindir}/avahi-s*
|
||||
rm ${D}${includedir}/avahi-c* -rf
|
||||
rm ${D}${includedir}/avahi-g* -rf
|
||||
rm ${D}${libdir}/libavahi-c*
|
||||
rm ${D}${libdir}/libavahi-g*
|
||||
rm ${D}${libdir}/pkgconfig/avahi-c*
|
||||
rm ${D}${libdir}/pkgconfig/avahi-g*
|
||||
rmdir ${D}${libdir}/avahi
|
||||
rm ${D}${sbindir} -rf
|
||||
rm ${D}${datadir}/avahi/a*
|
||||
rm ${D}${datadir}/avahi/s*
|
||||
rm ${D}${datadir}/dbus* -rf
|
||||
rm ${D}${mandir}/man1/a*
|
||||
rm ${D}${mandir}/man5 -rf
|
||||
rm ${D}${mandir}/man8 -rf
|
||||
rmdir ${D}${localstatedir}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue