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.inc | |
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.inc')
-rw-r--r-- | meta/recipes-connectivity/avahi/avahi.inc | 14 |
1 files changed, 4 insertions, 10 deletions
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} | |||
23 | " | 23 | " |
24 | UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/" | 24 | UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/" |
25 | 25 | ||
26 | # For gtk related PACKAGECONFIGs: gtk, gtk3 and pygtk | 26 | # For gtk related PACKAGECONFIGs: gtk, gtk3 |
27 | AVAHI_GTK ?= "" | 27 | AVAHI_GTK ?= "" |
28 | 28 | ||
29 | PACKAGECONFIG ??= "dbus ${AVAHI_GTK}" | 29 | PACKAGECONFIG ??= "dbus ${AVAHI_GTK}" |
30 | PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" | 30 | PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" |
31 | PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+" | 31 | PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+" |
32 | PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3" | 32 | PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3" |
33 | PACKAGECONFIG[pygtk] = "--enable-pygtk,--disable-pygtk," | ||
34 | 33 | ||
35 | USERADD_PACKAGES = "avahi-daemon avahi-autoipd" | 34 | USERADD_PACKAGES = "avahi-daemon avahi-autoipd" |
36 | USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ | 35 | USERADD_PARAM_avahi-daemon = "--system --home /run/avahi-daemon \ |
37 | --no-create-home --shell /bin/false \ | 36 | --no-create-home --shell /bin/false \ |
38 | --user-group avahi" | 37 | --user-group avahi" |
39 | 38 | ||
40 | USERADD_PARAM_avahi-autoipd = "--system --home /var/run/avahi-autoipd \ | 39 | USERADD_PARAM_avahi-autoipd = "--system --home /run/avahi-autoipd \ |
41 | --no-create-home --shell /bin/false \ | 40 | --no-create-home --shell /bin/false \ |
42 | --user-group \ | 41 | --user-group \ |
43 | -c \"Avahi autoip daemon\" \ | 42 | -c \"Avahi autoip daemon\" \ |
@@ -125,12 +124,7 @@ INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" | |||
125 | 124 | ||
126 | do_install() { | 125 | do_install() { |
127 | autotools_do_install | 126 | autotools_do_install |
128 | 127 | rm -rf ${D}/run | |
129 | # don't install /var/run when populating rootfs. Do it through volatile | ||
130 | # /var/run of current version is empty, so just remove it. | ||
131 | # if /var/run become non-empty in the future, need to install it via volatile | ||
132 | rm -rf ${D}${localstatedir}/run | ||
133 | rmdir --ignore-fail-on-non-empty ${D}${localstatedir} | ||
134 | rm -rf ${D}${datadir}/dbus-1/interfaces | 128 | rm -rf ${D}${datadir}/dbus-1/interfaces |
135 | test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1 | 129 | test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1 |
136 | rm -rf ${D}${libdir}/avahi | 130 | rm -rf ${D}${libdir}/avahi |