From ff6d3524c18578dcdcdb44e0a457b9c20fa91230 Mon Sep 17 00:00:00 2001 From: Dengke Du Date: Tue, 12 Dec 2017 09:46:23 +0800 Subject: 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 Signed-off-by: Yi Zhao Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb | 64 ---------------------- meta/recipes-connectivity/avahi/avahi-ui_0.7.bb | 62 +++++++++++++++++++++ meta/recipes-connectivity/avahi/avahi.inc | 14 ++--- meta/recipes-connectivity/avahi/avahi_0.6.32.bb | 22 -------- meta/recipes-connectivity/avahi/avahi_0.7.bb | 20 +++++++ ...c-install-GtkBuilder-interface-files-for-.patch | 29 ---------- .../files/avahi-fix-resource-unavaiable.patch | 30 ---------- 7 files changed, 86 insertions(+), 155 deletions(-) delete mode 100644 meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb create mode 100644 meta/recipes-connectivity/avahi/avahi-ui_0.7.bb delete mode 100644 meta/recipes-connectivity/avahi/avahi_0.6.32.bb create mode 100644 meta/recipes-connectivity/avahi/avahi_0.7.bb delete mode 100644 meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch delete mode 100644 meta/recipes-connectivity/avahi/files/avahi-fix-resource-unavaiable.patch (limited to 'meta/recipes-connectivity/avahi') 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 @@ -LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \ - file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \ - file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \ - file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" - -require avahi.inc - -inherit distro_features_check -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -SRC_URI += "file://0001-configure.ac-install-GtkBuilder-interface-files-for-.patch" -SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013" -SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454" - -DEPENDS += "avahi" - -AVAHI_GTK = "gtk3" - -S = "${WORKDIR}/avahi-${PV}" - -PACKAGES = "${PN} ${PN}-utils ${PN}-dbg ${PN}-dev ${PN}-staticdev ${PN}-doc avahi-discover" - -FILES_${PN} = "${libdir}/libavahi-ui*.so.*" -FILES_${PN}-dev += "${libdir}/libavahi-ui${SOLIBSDEV}" -FILES_${PN}-staticdev += "${libdir}/libavahi-ui.a" - -FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*" - -FILES_avahi-discover = "${datadir}/applications/avahi-discover.desktop \ - ${datadir}/avahi/interfaces/avahi-discover.ui \ - ${bindir}/avahi-discover-standalone \ - " - -do_install_append () { - rm ${D}${sysconfdir} -rf - rm ${D}${base_libdir} -rf - rm ${D}${systemd_unitdir} -rf - # The ${systemd_unitdir} is /lib/systemd, so we need rmdir /lib, - # but not ${base_libdir} here. And the /lib may not exist - # whithout systemd. - [ ! -d ${D}/lib ] || rmdir ${D}/lib --ignore-fail-on-non-empty - 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* - rm ${D}${sbindir} -rf - rm ${D}${datadir}/avahi/a* - rm ${D}${datadir}/avahi/s* - rm ${D}${datadir}/locale/ -rf - rm ${D}${datadir}/dbus* -rf - rm ${D}${mandir}/man1/a* - rm ${D}${mandir}/man5 -rf - rm ${D}${mandir}/man8 -rf - rm ${D}${libdir}/girepository-1.0/ -rf - rm ${D}${datadir}/gir-1.0/ -rf -} - diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb new file mode 100644 index 0000000000..5648e386b3 --- /dev/null +++ b/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb @@ -0,0 +1,62 @@ +LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \ + file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \ + file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \ + file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" + +require avahi.inc + +inherit distro_features_check +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6" +SRC_URI[sha256sum] = "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804" + +DEPENDS += "avahi" + +AVAHI_GTK = "gtk3" + +S = "${WORKDIR}/avahi-${PV}" + +PACKAGES = "${PN} ${PN}-utils ${PN}-dbg ${PN}-dev ${PN}-staticdev ${PN}-doc avahi-discover" + +FILES_${PN} = "${libdir}/libavahi-ui*.so.*" +FILES_${PN}-dev += "${libdir}/libavahi-ui${SOLIBSDEV}" +FILES_${PN}-staticdev += "${libdir}/libavahi-ui.a" + +FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*" + +FILES_avahi-discover = "${datadir}/applications/avahi-discover.desktop \ + ${datadir}/avahi/interfaces/avahi-discover.ui \ + ${bindir}/avahi-discover-standalone \ + " + +do_install_append () { + rm ${D}${sysconfdir} -rf + rm ${D}${base_libdir} -rf + rm ${D}${systemd_unitdir} -rf + # The ${systemd_unitdir} is /lib/systemd, so we need rmdir /lib, + # but not ${base_libdir} here. And the /lib may not exist + # whithout systemd. + [ ! -d ${D}/lib ] || rmdir ${D}/lib --ignore-fail-on-non-empty + 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* + rm ${D}${sbindir} -rf + rm ${D}${datadir}/avahi/a* + rm ${D}${datadir}/locale/ -rf + rm ${D}${datadir}/dbus* -rf + rm ${D}${mandir}/man1/a* + rm ${D}${mandir}/man5 -rf + rm ${D}${mandir}/man8 -rf + rm ${D}${libdir}/girepository-1.0/ -rf + rm ${D}${datadir}/gir-1.0/ -rf +} + diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index 7814464940..ef655dec44 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -23,21 +23,20 @@ SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV} " UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/" -# For gtk related PACKAGECONFIGs: gtk, gtk3 and pygtk +# For gtk related PACKAGECONFIGs: gtk, gtk3 AVAHI_GTK ?= "" PACKAGECONFIG ??= "dbus ${AVAHI_GTK}" PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+" PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3" -PACKAGECONFIG[pygtk] = "--enable-pygtk,--disable-pygtk," USERADD_PACKAGES = "avahi-daemon avahi-autoipd" -USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ +USERADD_PARAM_avahi-daemon = "--system --home /run/avahi-daemon \ --no-create-home --shell /bin/false \ --user-group avahi" -USERADD_PARAM_avahi-autoipd = "--system --home /var/run/avahi-autoipd \ +USERADD_PARAM_avahi-autoipd = "--system --home /run/avahi-autoipd \ --no-create-home --shell /bin/false \ --user-group \ -c \"Avahi autoip daemon\" \ @@ -125,12 +124,7 @@ INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" do_install() { autotools_do_install - - # don't install /var/run when populating rootfs. Do it through volatile - # /var/run of current version is empty, so just remove it. - # if /var/run become non-empty in the future, need to install it via volatile - rm -rf ${D}${localstatedir}/run - rmdir --ignore-fail-on-non-empty ${D}${localstatedir} + rm -rf ${D}/run rm -rf ${D}${datadir}/dbus-1/interfaces test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1 rm -rf ${D}${libdir}/avahi diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.32.bb b/meta/recipes-connectivity/avahi/avahi_0.6.32.bb deleted file mode 100644 index bfa63044ea..0000000000 --- a/meta/recipes-connectivity/avahi/avahi_0.6.32.bb +++ /dev/null @@ -1,22 +0,0 @@ -require avahi.inc - -inherit systemd - -SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-dnsconfd" -SYSTEMD_SERVICE_${PN}-daemon = "avahi-daemon.service" -SYSTEMD_SERVICE_${PN}-dnsconfd = "avahi-dnsconfd.service" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \ - file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \ - file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \ - file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" - -SRC_URI += "file://avahi-fix-resource-unavaiable.patch" - -SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013" -SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454" - -DEPENDS += "intltool-native" - -PACKAGES =+ "libavahi-gobject" diff --git a/meta/recipes-connectivity/avahi/avahi_0.7.bb b/meta/recipes-connectivity/avahi/avahi_0.7.bb new file mode 100644 index 0000000000..7c91f10f11 --- /dev/null +++ b/meta/recipes-connectivity/avahi/avahi_0.7.bb @@ -0,0 +1,20 @@ +require avahi.inc + +inherit systemd + +SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-dnsconfd" +SYSTEMD_SERVICE_${PN}-daemon = "avahi-daemon.service" +SYSTEMD_SERVICE_${PN}-dnsconfd = "avahi-dnsconfd.service" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \ + file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \ + file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \ + file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" + +SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6" +SRC_URI[sha256sum] = "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804" + +DEPENDS += "intltool-native" + +PACKAGES =+ "libavahi-gobject" diff --git a/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch b/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch deleted file mode 100644 index 942607a846..0000000000 --- a/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6ff255eff4fea6350b5e0462fee176fadc26fc1c Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Sun, 12 Jun 2016 18:32:49 +0300 -Subject: [PATCH] configure.ac: install GtkBuilder interface files for GTK+3 - too - -Upstream-Status: Submitted [https://github.com/lathiat/avahi/pull/130] -Signed-off-by: Jussi Kukkonen -Signed-off-by: Dengke Du ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 87a9a17..9860dcc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -965,7 +965,7 @@ AC_SUBST(avahi_socket) - # - # Avahi interfaces dir - # --if test "x$HAVE_PYTHON_DBUS" = "xyes" -o "x$HAVE_GTK" = "xyes"; then -+if test "x$HAVE_PYTHON_DBUS" = "xyes" -o "x$HAVE_GTK" = "xyes" -o "x$HAVE_GTK3" = "xyes"; then - interfacesdir="${datadir}/${PACKAGE}/interfaces/" - AC_SUBST(interfacesdir) - fi --- -2.8.1 - diff --git a/meta/recipes-connectivity/avahi/files/avahi-fix-resource-unavaiable.patch b/meta/recipes-connectivity/avahi/files/avahi-fix-resource-unavaiable.patch deleted file mode 100644 index 5a2fd75f55..0000000000 --- a/meta/recipes-connectivity/avahi/files/avahi-fix-resource-unavaiable.patch +++ /dev/null @@ -1,30 +0,0 @@ -Upstream-Status: Backport - -Backport from: -https://github.com/experimental-platform/platform-hostname-avahi/pull/9 - -It sometimes fails to run avahi with error: "Could not receive return value -from daemon process". It has same root cause with -https://github.com/lxc/lxc/issues/25. - -Signed-off-by: Kai Kang ---- -From 5150983102ad5ad43f0dae203cb332c168eb5a71 Mon Sep 17 00:00:00 2001 -From: Hinnerk Haardt -Date: Thu, 17 Dec 2015 11:52:19 +0100 -Subject: [PATCH] Fix `chroot.c: fork() failed: Resource temporarily - unavailable` as per https://github.com/lxc/lxc/issues/25. - ---- - avahi-daemon/avahi-daemon.conf | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/avahi-daemon/avahi-daemon.conf b/avahi-daemon/avahi-daemon.conf -index 95166f8..3d5b7a6 100644 ---- a/avahi-daemon/avahi-daemon.conf -+++ b/avahi-daemon/avahi-daemon.conf -@@ -65,4 +65,3 @@ rlimit-data=4194304 - rlimit-fsize=0 - rlimit-nofile=768 - rlimit-stack=4194304 --rlimit-nproc=3 -- cgit v1.2.3-54-g00ecf