diff options
author | Laurent Bonnans <laurent.bonnans@here.com> | 2019-08-05 15:05:19 +0200 |
---|---|---|
committer | Laurent Bonnans <laurent.bonnans@here.com> | 2019-08-05 15:41:27 +0200 |
commit | 1a3c0f079a5450110eec9c7d97ff05bbf85948fc (patch) | |
tree | 042ec1fa52d74eaa19252f5fc5d33989cfe630ae | |
parent | f348e80edd3d5a652bf54e59b59442e912986707 (diff) | |
download | meta-updater-1a3c0f079a5450110eec9c7d97ff05bbf85948fc.tar.gz |
Revert "Do not create connman's resolv.conf symlink at boot"fix/connman-master
This reverts commit 2c72b0ce1f5cb77f043176ed94e97572ac81d9bf.
The problem is already fixed in connman >= 1.36 (1.37 on master)
Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
-rw-r--r-- | recipes-connectivity/connman/connman_%.bbappend | 5 | ||||
-rw-r--r-- | recipes-connectivity/connman/files/0001-tmpfiles-script-do-not-create-the-resolv.conf-symlin.patch | 22 |
2 files changed, 0 insertions, 27 deletions
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 @@ | |||
1 | RPROVIDES_${PN} += "virtual/network-configuration" | RPROVIDES_${PN} += "virtual/network-configuration" | |
2 | |||
3 | # patch to not create the resolv.conf symlink at run-time, as it's already | ||
4 | # handled in the recipe and messes up with ostree | ||
5 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | ||
6 | 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 @@ | |||
1 | From 9e724a61f015304c9d72d829a66178d20e3fa980 Mon Sep 17 00:00:00 2001 | ||
2 | From: Laurent Bonnans <laurent.bonnans@here.com> | ||
3 | Date: Wed, 31 Jul 2019 18:15:47 +0200 | ||
4 | Subject: [PATCH] tmpfiles script: do not create the resolv.conf symlink | ||
5 | |||
6 | It's handled by yocto in our case | ||
7 | |||
8 | Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com> | ||
9 | --- | ||
10 | scripts/connman_resolvconf.conf.in | 1 - | ||
11 | 1 file changed, 1 deletion(-) | ||
12 | |||
13 | diff --git a/scripts/connman_resolvconf.conf.in b/scripts/connman_resolvconf.conf.in | ||
14 | index 2d61dfe1..8a7d3071 100644 | ||
15 | --- a/scripts/connman_resolvconf.conf.in | ||
16 | +++ b/scripts/connman_resolvconf.conf.in | ||
17 | @@ -1,2 +1 @@ | ||
18 | d @runstatedir@/connman - - - - | ||
19 | -L+ /etc/resolv.conf - - - - @runstatedir@/connman/resolv.conf | ||
20 | -- | ||
21 | 2.20.1 | ||
22 | |||