From 1a3c0f079a5450110eec9c7d97ff05bbf85948fc Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Mon, 5 Aug 2019 15:05:19 +0200 Subject: Revert "Do not create connman's resolv.conf symlink at boot" This reverts commit 2c72b0ce1f5cb77f043176ed94e97572ac81d9bf. The problem is already fixed in connman >= 1.36 (1.37 on master) Signed-off-by: Laurent Bonnans --- recipes-connectivity/connman/connman_%.bbappend | 5 ----- ...ript-do-not-create-the-resolv.conf-symlin.patch | 22 ---------------------- 2 files changed, 27 deletions(-) delete mode 100644 recipes-connectivity/connman/files/0001-tmpfiles-script-do-not-create-the-resolv.conf-symlin.patch diff --git a/recipes-connectivity/connman/connman_%.bbappend b/recipes-connectivity/connman/connman_%.bbappend index 08ec832..b3633cc 100644 --- a/recipes-connectivity/connman/connman_%.bbappend +++ b/recipes-connectivity/connman/connman_%.bbappend @@ -1,6 +1 @@ RPROVIDES_${PN} += "virtual/network-configuration" - -# patch to not create the resolv.conf symlink at run-time, as it's already -# handled in the recipe and messes up with ostree -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI += "file://0001-tmpfiles-script-do-not-create-the-resolv.conf-symlin.patch" diff --git a/recipes-connectivity/connman/files/0001-tmpfiles-script-do-not-create-the-resolv.conf-symlin.patch b/recipes-connectivity/connman/files/0001-tmpfiles-script-do-not-create-the-resolv.conf-symlin.patch deleted file mode 100644 index 9b4a78c..0000000 --- a/recipes-connectivity/connman/files/0001-tmpfiles-script-do-not-create-the-resolv.conf-symlin.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 9e724a61f015304c9d72d829a66178d20e3fa980 Mon Sep 17 00:00:00 2001 -From: Laurent Bonnans -Date: Wed, 31 Jul 2019 18:15:47 +0200 -Subject: [PATCH] tmpfiles script: do not create the resolv.conf symlink - -It's handled by yocto in our case - -Signed-off-by: Laurent Bonnans ---- - scripts/connman_resolvconf.conf.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/scripts/connman_resolvconf.conf.in b/scripts/connman_resolvconf.conf.in -index 2d61dfe1..8a7d3071 100644 ---- a/scripts/connman_resolvconf.conf.in -+++ b/scripts/connman_resolvconf.conf.in -@@ -1,2 +1 @@ - d @runstatedir@/connman - - - - --L+ /etc/resolv.conf - - - - @runstatedir@/connman/resolv.conf --- -2.20.1 - -- cgit v1.2.3-54-g00ecf