diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2022-11-17 19:14:10 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-20 08:29:08 +0000 |
commit | bab3b8676662de92e34ac7ed3fe52745df1c9a9e (patch) | |
tree | ae6438278b9d135d2841c9af01cd7503c729b821 /meta/recipes-connectivity/resolvconf/resolvconf | |
parent | 2143dfd9ad443e33929b18098a188ea0514e4488 (diff) | |
download | poky-bab3b8676662de92e34ac7ed3fe52745df1c9a9e.tar.gz |
resolvconf: make it work
The current resolvconf does not work. Make it work with the
following changes.
1. Install normalize-resolvconf, which is used by resolvconf.
2. Add dependencies: sed, util-linux-flock.
util-linux-flock is needed by our busybox does not support '-w'
by default. sed is needed because we want to avoid package
QA issue complaining sed is needed by no one provides it.
3. Add a patch to replace 'readlink -m' with 'readlink -l'.
This could avoid the runtime dependency on coreutils. The replacement
is safe as /etc always exits in OE's system.
4. Remove allarch inheritage. This is because the above RDEPENDS
change does not allow this any more. test_sstate_allarch_samesigs
would fail if we don't do this.
(From OE-Core rev: 1b0581fd241cc9de2feda896aefbf055dc0099dc)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 |
1 files changed, 37 insertions, 0 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 | |||