avahi: upgrade to 0.7

PATCH In review Dengke Du 2 participants 5 messages Oct 31, 2017 – Nov 1, 2017

lore

Share & tools

lore

Dengke Du

author

2017-10-31 06:45 UTC #0 lore raw

cover avahi: upgrade to 0.7

The following changes since commit 65d23bd7986615fdfb0f1717b615534a2a14ab80:

README.qemu: qemuppc64 is not supported (2017-10-16 23:54:31 +0100)

are available in the git repository at:

https://github.com/DengkeDu/openembedded-core.git dengke/avahi-0.7
https://github.com//tree/dengke/avahi-0.7

Dengke Du (1):
avahi: upgrade to 0.7

 .../avahi/{avahi-ui_0.6.32.bb => avahi-ui_0.7.bb}  |  6 ++---
 meta/recipes-connectivity/avahi/avahi.inc          | 11 +++-----
 .../avahi/{avahi_0.6.32.bb => avahi_0.7.bb}        |  6 ++---
 ...c-install-GtkBuilder-interface-files-for-.patch | 29 ---------------------
 .../files/avahi-fix-resource-unavaiable.patch      | 30 ----------------------
 5 files changed, 7 insertions(+), 75 deletions(-)
 rename meta/recipes-connectivity/avahi/{avahi-ui_0.6.32.bb => avahi-ui_0.7.bb} (89%)
 rename meta/recipes-connectivity/avahi/{avahi_0.6.32.bb => avahi_0.7.bb} (78%)
 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

Signature · 1 line

2.7.4

Dengke Du

author

2017-10-31 06:45 UTC #1 lore raw

PATCH 1/1 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".

Signed-off-by Dengke Du <[email protected]>

---
 .../avahi/{avahi-ui_0.6.32.bb => avahi-ui_0.7.bb}  |  6 ++---
 meta/recipes-connectivity/avahi/avahi.inc          | 11 +++-----
 .../avahi/{avahi_0.6.32.bb => avahi_0.7.bb}        |  6 ++---
 ...c-install-GtkBuilder-interface-files-for-.patch | 29 ---------------------
 .../files/avahi-fix-resource-unavaiable.patch      | 30 ----------------------
 5 files changed, 7 insertions(+), 75 deletions(-)
 rename meta/recipes-connectivity/avahi/{avahi-ui_0.6.32.bb => avahi-ui_0.7.bb} (89%)
 rename meta/recipes-connectivity/avahi/{avahi_0.6.32.bb => avahi_0.7.bb} (78%)
 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

meta/recipes-connectivity/avahi/avahi-ui_0.7.bb renamed from meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb +2 -4

similarity index 89%
rename from meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
rename to meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
index ac36461..5648e38 100644
@@ -9,9 +9,8 @@ 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"
+SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6"
+SRC_URI[sha256sum] = "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804"
 
 DEPENDS += "avahi"

@@ -52,7 +51,6 @@ do_install_append () {
 	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*

meta/recipes-connectivity/avahi/avahi.inc +3 -8

index 7814464..e9819bf 100644
@@ -33,11 +33,11 @@ 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 +125,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

meta/recipes-connectivity/avahi/avahi_0.7.bb renamed from meta/recipes-connectivity/avahi/avahi_0.6.32.bb +2 -4

similarity index 78%
rename from meta/recipes-connectivity/avahi/avahi_0.6.32.bb
rename to meta/recipes-connectivity/avahi/avahi_0.7.bb
index bfa6304..7c91f10 100644
@@ -12,10 +12,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
                     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"
+SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6"
+SRC_URI[sha256sum] = "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804"
 
 DEPENDS += "intltool-native"

meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch deleted +0 ~~-29~~

deleted file mode 100644
index 942607a..0000000
@@ -1,29 +0,0 @@
-From 6ff255eff4fea6350b5e0462fee176fadc26fc1c Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <[email protected]>
-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 <[email protected]>
-Signed-off-by: Dengke Du <[email protected]>
----
- 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
-

meta/recipes-connectivity/avahi/files/avahi-fix-resource-unavaiable.patch deleted +0 ~~-30~~

deleted file mode 100644
index 5a2fd75..0000000
@@ -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 <[email protected]>
----
-From 5150983102ad5ad43f0dae203cb332c168eb5a71 Mon Sep 17 00:00:00 2001
-From: Hinnerk Haardt <[email protected]>
-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

Signature · 1 line

2.7.4

Khem Raj

2017-10-31 19:20 UTC #2 lore raw

Quoted 4 lines · Dengke Du

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".

if var/run is not empty then the content should be deleted as well.

Quoted 172 lines

Signed-off-by Dengke Du <[email protected]>

---
 .../avahi/{avahi-ui_0.6.32.bb => avahi-ui_0.7.bb}  |  6 ++---
 meta/recipes-connectivity/avahi/avahi.inc          | 11 +++-----
 .../avahi/{avahi_0.6.32.bb => avahi_0.7.bb}        |  6 ++---
 ...c-install-GtkBuilder-interface-files-for-.patch | 29 ---------------------
 .../files/avahi-fix-resource-unavaiable.patch      | 30 ----------------------
 5 files changed, 7 insertions(+), 75 deletions(-)
 rename meta/recipes-connectivity/avahi/{avahi-ui_0.6.32.bb => avahi-ui_0.7.bb} (89%)
 rename meta/recipes-connectivity/avahi/{avahi_0.6.32.bb => avahi_0.7.bb} (78%)
 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

meta/recipes-connectivity/avahi/avahi-ui_0.7.bb renamed from meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb +2 -4

similarity index 89%
rename from meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
rename to meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
index ac36461..5648e38 100644
@@ -9,9 +9,8 @@ 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"
+SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6"
+SRC_URI[sha256sum] = "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804"
 
 DEPENDS += "avahi"

@@ -52,7 +51,6 @@ do_install_append () {
        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*

meta/recipes-connectivity/avahi/avahi.inc +3 -8

index 7814464..e9819bf 100644
@@ -33,11 +33,11 @@ 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 +125,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

meta/recipes-connectivity/avahi/avahi_0.7.bb renamed from meta/recipes-connectivity/avahi/avahi_0.6.32.bb +2 -4

similarity index 78%
rename from meta/recipes-connectivity/avahi/avahi_0.6.32.bb
rename to meta/recipes-connectivity/avahi/avahi_0.7.bb
index bfa6304..7c91f10 100644
@@ -12,10 +12,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
                     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"
+SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6"
+SRC_URI[sha256sum] = "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804"
 
 DEPENDS += "intltool-native"

meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch deleted +0 ~~-29~~

deleted file mode 100644
index 942607a..0000000
@@ -1,29 +0,0 @@
-From 6ff255eff4fea6350b5e0462fee176fadc26fc1c Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <[email protected]>
-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 <[email protected]>
-Signed-off-by: Dengke Du <[email protected]>
----
- 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
-

meta/recipes-connectivity/avahi/files/avahi-fix-resource-unavaiable.patch deleted +0 ~~-31~~

deleted file mode 100644
index 5a2fd75..0000000
@@ -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 <[email protected]>
----
-From 5150983102ad5ad43f0dae203cb332c168eb5a71 Mon Sep 17 00:00:00 2001
-From: Hinnerk Haardt <[email protected]>
-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
--

2.7.4

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Dengke Du

author

2017-11-01 01:36 UTC #3 lore raw

Quoted 6 lines · Khem Raj

Quoted 4 lines · Dengke Du
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".
if var/run is not empty then the content should be deleted as well.

Hi Khem,

Yes, but the installation would not create the /var/run directory.

Quoted 172 lines

Signed-off-by Dengke Du <[email protected]>

---
  .../avahi/{avahi-ui_0.6.32.bb => avahi-ui_0.7.bb}  |  6 ++---
  meta/recipes-connectivity/avahi/avahi.inc          | 11 +++-----
  .../avahi/{avahi_0.6.32.bb => avahi_0.7.bb}        |  6 ++---
  ...c-install-GtkBuilder-interface-files-for-.patch | 29 ---------------------
  .../files/avahi-fix-resource-unavaiable.patch      | 30 ----------------------
  5 files changed, 7 insertions(+), 75 deletions(-)

rename meta/recipes-connectivity/avahi/{avahi-ui_0.6.32.bb => avahi-ui_0.7.bb} (89%)
rename meta/recipes-connectivity/avahi/{avahi_0.6.32.bb => avahi_0.7.bb} (78%)
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

meta/recipes-connectivity/avahi/avahi-ui_0.7.bb renamed from meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb +2 -4

similarity index 89%
rename from meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
rename to meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
index ac36461..5648e38 100644
@@ -9,9 +9,8 @@ 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"
+SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6"
+SRC_URI[sha256sum] = "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804"
 
  DEPENDS += "avahi"

@@ -52,7 +51,6 @@ do_install_append () {
         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*

meta/recipes-connectivity/avahi/avahi.inc +3 -8

index 7814464..e9819bf 100644
@@ -33,11 +33,11 @@ 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 +125,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

meta/recipes-connectivity/avahi/avahi_0.7.bb renamed from meta/recipes-connectivity/avahi/avahi_0.6.32.bb +2 -4

similarity index 78%
rename from meta/recipes-connectivity/avahi/avahi_0.6.32.bb
rename to meta/recipes-connectivity/avahi/avahi_0.7.bb
index bfa6304..7c91f10 100644
@@ -12,10 +12,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
                      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"
+SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6"
+SRC_URI[sha256sum] = "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804"
 
  DEPENDS += "intltool-native"

meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch deleted +0 ~~-29~~

deleted file mode 100644
index 942607a..0000000
@@ -1,29 +0,0 @@
-From 6ff255eff4fea6350b5e0462fee176fadc26fc1c Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <[email protected]>
-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 <[email protected]>
-Signed-off-by: Dengke Du <[email protected]>
----
- 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
-

meta/recipes-connectivity/avahi/files/avahi-fix-resource-unavaiable.patch deleted +0 ~~-31~~

deleted file mode 100644
index 5a2fd75..0000000
@@ -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 <[email protected]>
----
-From 5150983102ad5ad43f0dae203cb332c168eb5a71 Mon Sep 17 00:00:00 2001
-From: Hinnerk Haardt <[email protected]>
-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
--

2.7.4

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Khem Raj

2017-11-01 01:55 UTC #4 lore raw

Quoted 13 lines · Dengke Du

Quoted 10 lines · Khem Raj
Quoted 6 lines · Dengke Du
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".

Quoted 8 lines

Quoted 1 line
if var/run is not empty then the content should be deleted as well.
Hi Khem,
Yes, but the installation would not create the /var/run directory.

OK thanks for confirming

Quoted 205 lines

Quoted 203 lines
Quoted 203 lines
Signed-off-by Dengke Du <[email protected]>
---
  .../avahi/{avahi-ui_0.6.32.bb => avahi-ui_0.7.bb}  |  6 ++---
  meta/recipes-connectivity/avahi/avahi.inc          | 11 +++-----
  .../avahi/{avahi_0.6.32.bb => avahi_0.7.bb}        |  6 ++---
  ...c-install-GtkBuilder-interface-files-for-.patch | 29
---------------------
  .../files/avahi-fix-resource-unavaiable.patch      | 30
----------------------
  5 files changed, 7 insertions(+), 75 deletions(-)
rename meta/recipes-connectivity/avahi/{avahi-ui_0.6.32.bb =>
avahi-ui_0.7.bb} (89%)
rename meta/recipes-connectivity/avahi/{avahi_0.6.32.bb =>
avahi_0.7.bb} (78%)
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
meta/recipes-connectivity/avahi/avahi-ui_0.7.bb renamed from meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb +0 -1
similarity index 89%
rename from meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
rename to meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
index ac36461..5648e38 100644
@@ -9,9 +9,8 @@ require avahi.inc
  inherit distro_features_check
  ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
-SRC_URI +=
"file://0001-configure.ac-install-GtkBuilder-interface-files-for-.patch"
meta/recipes-connectivity/avahi/avahi-ui_0.7.bb renamed from meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb +0 -2
-SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013"
-SRC_URI[sha256sum] =
"d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454"
meta/recipes-connectivity/avahi/avahi-ui_0.7.bb renamed from meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb +2 -0
+SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6"
+SRC_URI[sha256sum] =
"57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804"
DEPENDS += "avahi"
meta/recipes-connectivity/avahi/avahi-ui_0.7.bb renamed from meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb +0 -1
@@ -52,7 +51,6 @@ do_install_append () {
         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*
meta/recipes-connectivity/avahi/avahi.inc +0 -0
index 7814464..e9819bf 100644
@@ -33,11 +33,11 @@ PACKAGECONFIG[gtk3] =
"--enable-gtk3,--disable-gtk3,gtk+3"
PACKAGECONFIG[pygtk] = "--enable-pygtk,--disable-pygtk,"
USERADD_PACKAGES = "avahi-daemon avahi-autoipd"
meta/recipes-connectivity/avahi/avahi.inc +2 -4
-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 +125,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
meta/recipes-connectivity/avahi/avahi.inc +0 -2
-       # /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
meta/recipes-connectivity/avahi/avahi.inc +1 -3
-       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
meta/recipes-connectivity/avahi/avahi_0.7.bb renamed from meta/recipes-connectivity/avahi/avahi_0.6.32.bb +0 -0
similarity index 78%
rename from meta/recipes-connectivity/avahi/avahi_0.6.32.bb
rename to meta/recipes-connectivity/avahi/avahi_0.7.bb
index bfa6304..7c91f10 100644
@@ -12,10 +12,8 @@ LIC_FILES_CHKSUM =
 "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 
 file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \
 
file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
meta/recipes-connectivity/avahi/avahi_0.7.bb renamed from meta/recipes-connectivity/avahi/avahi_0.6.32.bb +0 -4
-SRC_URI += "file://avahi-fix-resource-unavaiable.patch"
-
-SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013"
-SRC_URI[sha256sum] =
"d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454"
meta/recipes-connectivity/avahi/avahi_0.7.bb renamed from meta/recipes-connectivity/avahi/avahi_0.6.32.bb +2 -0
+SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6"
+SRC_URI[sha256sum] =
"57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804"
DEPENDS += "intltool-native"
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 942607a..0000000
---
a/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch +++ /dev/null
meta/recipes-connectivity/avahi/avahi_0.7.bb renamed from meta/recipes-connectivity/avahi/avahi_0.6.32.bb +0 -4
@@ -1,29 +0,0 @@
-From 6ff255eff4fea6350b5e0462fee176fadc26fc1c Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <[email protected]>
-Date: Sun, 12 Jun 2016 18:32:49 +0300
-Subject: [PATCH] configure.ac: install GtkBuilder interface files for
GTK+3
- too
meta/recipes-connectivity/avahi/avahi_0.7.bb renamed from meta/recipes-connectivity/avahi/avahi_0.6.32.bb +0 ~~-18~~
-
-Upstream-Status: Submitted [https://github.com/lathiat/avahi/pull/130]
-Signed-off-by: Jussi Kukkonen <[email protected]>
-Signed-off-by: Dengke Du <[email protected]>
----
- 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
meta/recipes-connectivity/avahi/avahi_0.7.bb renamed from meta/recipes-connectivity/avahi/avahi_0.6.32.bb +0 -6
-       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 5a2fd75..0000000
---
a/meta/recipes-connectivity/avahi/files/avahi-fix-resource-unavaiable.patch +++ /dev/null
meta/recipes-connectivity/avahi/avahi_0.7.bb renamed from meta/recipes-connectivity/avahi/avahi_0.6.32.bb +0 -6
@@ -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
meta/recipes-connectivity/avahi/avahi_0.7.bb renamed from meta/recipes-connectivity/avahi/avahi_0.6.32.bb +0 ~~-16~~
-from daemon process". It has same root cause with
-https://github.com/lxc/lxc/issues/25.
-
-Signed-off-by: Kai Kang <[email protected]>
----
-From 5150983102ad5ad43f0dae203cb332c168eb5a71 Mon Sep 17 00:00:00 2001
-From: Hinnerk Haardt <[email protected]>
-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
--
2.7.4
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core