diff options
Diffstat (limited to 'meta/recipes-connectivity/resolvconf/resolvconf')
-rw-r--r-- | meta/recipes-connectivity/resolvconf/resolvconf/0001-avoid-using-m-option-for-readlink.patch | 37 | ||||
-rw-r--r-- | meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch | 20 |
2 files changed, 37 insertions, 20 deletions
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf/0001-avoid-using-m-option-for-readlink.patch b/meta/recipes-connectivity/resolvconf/resolvconf/0001-avoid-using-m-option-for-readlink.patch new file mode 100644 index 0000000000..ab32f26754 --- /dev/null +++ b/meta/recipes-connectivity/resolvconf/resolvconf/0001-avoid-using-m-option-for-readlink.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 6bf2bb136a0b3961339369bc08e58b661fba0edb Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Thu, 17 Nov 2022 17:26:30 +0800 | ||
4 | Subject: [PATCH] avoid using -m option for readlink | ||
5 | |||
6 | Use a more widely used option '-f' instead of '-m' here to | ||
7 | avoid dependency on coreutils. | ||
8 | |||
9 | Looking at the git history of the resolvconf repo, the '-m' | ||
10 | is deliberately used. And it wants to depend on coreutils. | ||
11 | But in case of OE, the existence of /etc is ensured, and busybox | ||
12 | readlink provides '-f' option, so we can just use '-f'. In this | ||
13 | way, the coreutils dependency is not necessary any more. | ||
14 | |||
15 | Upstream-Status: Inappropriate [OE Specific] | ||
16 | |||
17 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
18 | --- | ||
19 | etc/resolvconf/update.d/libc | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/etc/resolvconf/update.d/libc b/etc/resolvconf/update.d/libc | ||
23 | index 1c4f6bc..f75d22c 100755 | ||
24 | --- a/etc/resolvconf/update.d/libc | ||
25 | +++ b/etc/resolvconf/update.d/libc | ||
26 | @@ -57,7 +57,7 @@ fi | ||
27 | report_warning() { echo "$0: Warning: $*" >&2 ; } | ||
28 | |||
29 | resolv_conf_is_symlinked_to_dynamic_file() { | ||
30 | - [ -L ${ETC}/resolv.conf ] && [ "$(readlink -m ${ETC}/resolv.conf)" = "$DYNAMICRSLVCNFFILE" ] | ||
31 | + [ -L ${ETC}/resolv.conf ] && [ "$(readlink -f ${ETC}/resolv.conf)" = "$DYNAMICRSLVCNFFILE" ] | ||
32 | } | ||
33 | |||
34 | if ! resolv_conf_is_symlinked_to_dynamic_file ; then | ||
35 | -- | ||
36 | 2.17.1 | ||
37 | |||
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch b/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch deleted file mode 100644 index 1aead07869..0000000000 --- a/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | |||
2 | busybox installs readlink into /usr/bin, so ensure /usr/bin | ||
3 | is in the path. | ||
4 | |||
5 | Upstream-Status: Submitted | ||
6 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
7 | |||
8 | Index: resolvconf-1.76/etc/resolvconf/update.d/libc | ||
9 | =================================================================== | ||
10 | --- resolvconf-1.76.orig/etc/resolvconf/update.d/libc | ||
11 | +++ resolvconf-1.76/etc/resolvconf/update.d/libc | ||
12 | @@ -16,7 +16,7 @@ | ||
13 | # | ||
14 | |||
15 | set -e | ||
16 | -PATH=/sbin:/bin | ||
17 | +PATH=/sbin:/bin:/usr/bin | ||
18 | |||
19 | [ -x /lib/resolvconf/list-records ] || exit 1 | ||
20 | |||