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:12 +0000 |
| commit | 80b408ae48eb091fc2af8b1570a7aac3cdc0b009 (patch) | |
| tree | d957c206bc1e693f50241fc6150c6f8f6605607e /meta/recipes-connectivity/avahi/avahi.inc | |
| parent | 59f1ee104d1a6c04b0690b7c8ce481449da174d6 (diff) | |
| download | openembedded-core-contrib-80b408ae48eb091fc2af8b1570a7aac3cdc0b009.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.
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>
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} " 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 |