diff options
author | Dengke Du <dengke.du@windriver.com> | 2017-12-12 09:46:23 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-02 17:24:37 +0000 |
commit | ff6d3524c18578dcdcdb44e0a457b9c20fa91230 (patch) | |
tree | c42d98d1346904d0bfda4e9fb5cd096e7cd6aef4 /meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb | |
parent | bbef2327f8e006162b7978f696ddc24a9dc74e91 (diff) | |
download | poky-ff6d3524c18578dcdcdb44e0a457b9c20fa91230.tar.gz |
avahi: upgrade to 0.7
Delete the unneeded patch, because the upstream contains the needed changes.
The new version of avahi 0.7 use "/run" directory to place some run-time
variable data, not /var/run, so in avahi.inc, we should remove the "/run"
not "/var/run".
Remove PACKAGECONFIG for pygtk which already dropped in upstream.
(From OE-Core rev: 80b408ae48eb091fc2af8b1570a7aac3cdc0b009)
Signed-off-by: Dengke Du <dengke.du@windriver.com>
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb')
-rw-r--r-- | meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb deleted file mode 100644 index ac364618e4..0000000000 --- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ | ||
2 | file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \ | ||
3 | file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \ | ||
4 | file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \ | ||
5 | file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" | ||
6 | |||
7 | require avahi.inc | ||
8 | |||
9 | inherit distro_features_check | ||
10 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | ||
11 | |||
12 | SRC_URI += "file://0001-configure.ac-install-GtkBuilder-interface-files-for-.patch" | ||
13 | SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013" | ||
14 | SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454" | ||
15 | |||
16 | DEPENDS += "avahi" | ||
17 | |||
18 | AVAHI_GTK = "gtk3" | ||
19 | |||
20 | S = "${WORKDIR}/avahi-${PV}" | ||
21 | |||
22 | PACKAGES = "${PN} ${PN}-utils ${PN}-dbg ${PN}-dev ${PN}-staticdev ${PN}-doc avahi-discover" | ||
23 | |||
24 | FILES_${PN} = "${libdir}/libavahi-ui*.so.*" | ||
25 | FILES_${PN}-dev += "${libdir}/libavahi-ui${SOLIBSDEV}" | ||
26 | FILES_${PN}-staticdev += "${libdir}/libavahi-ui.a" | ||
27 | |||
28 | FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*" | ||
29 | |||
30 | FILES_avahi-discover = "${datadir}/applications/avahi-discover.desktop \ | ||
31 | ${datadir}/avahi/interfaces/avahi-discover.ui \ | ||
32 | ${bindir}/avahi-discover-standalone \ | ||
33 | " | ||
34 | |||
35 | do_install_append () { | ||
36 | rm ${D}${sysconfdir} -rf | ||
37 | rm ${D}${base_libdir} -rf | ||
38 | rm ${D}${systemd_unitdir} -rf | ||
39 | # The ${systemd_unitdir} is /lib/systemd, so we need rmdir /lib, | ||
40 | # but not ${base_libdir} here. And the /lib may not exist | ||
41 | # whithout systemd. | ||
42 | [ ! -d ${D}/lib ] || rmdir ${D}/lib --ignore-fail-on-non-empty | ||
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 | rm ${D}${sbindir} -rf | ||
54 | rm ${D}${datadir}/avahi/a* | ||
55 | rm ${D}${datadir}/avahi/s* | ||
56 | rm ${D}${datadir}/locale/ -rf | ||
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 | rm ${D}${libdir}/girepository-1.0/ -rf | ||
62 | rm ${D}${datadir}/gir-1.0/ -rf | ||
63 | } | ||
64 | |||