1
0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00

dhcpcd: upgrade 10.2.2 -> 10.2.4

0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch
refreshed for 10.2.4

(From OE-Core rev: 7e74593f4b341deef995adba5790eacffcfd41f1)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Wang Mingyu
2025-06-04 16:44:41 +08:00
committed by Richard Purdie
parent 949e2cc738
commit 91f8d07d38
2 changed files with 5 additions and 5 deletions
@@ -17,7 +17,7 @@ SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=ma
file://0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch \ file://0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch \
" "
SRCREV = "f6983c18dbf7989f43a2838beeaf62a54c53ff1d" SRCREV = "93df2b254caf9639f9ffb66e0fe2b584eeba6220"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
# Doesn't use automake so we can't do out-of-tree builds # Doesn't use automake so we can't do out-of-tree builds
@@ -1,4 +1,4 @@
From 33710a648a805d96abf49d5adf6ca55b89f9c858 Mon Sep 17 00:00:00 2001 From d1581ce103db0a5db0b1761907fff9ddd6b55a8a Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com> From: Chen Qi <Qi.Chen@windriver.com>
Date: Wed, 9 Nov 2022 16:33:18 +0800 Date: Wed, 9 Nov 2022 16:33:18 +0800
Subject: [PATCH] 20-resolv.conf: improve the sitation of working with systemd Subject: [PATCH] 20-resolv.conf: improve the sitation of working with systemd
@@ -27,7 +27,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
1 file changed, 13 insertions(+), 4 deletions(-) 1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/hooks/20-resolv.conf b/hooks/20-resolv.conf diff --git a/hooks/20-resolv.conf b/hooks/20-resolv.conf
index 7c29e276..becc019f 100644 index bd0b0df5..9c7721de 100644
--- a/hooks/20-resolv.conf --- a/hooks/20-resolv.conf
+++ b/hooks/20-resolv.conf +++ b/hooks/20-resolv.conf
@@ -11,8 +11,12 @@ nocarrier_roaming_dir="$state_dir/roaming" @@ -11,8 +11,12 @@ nocarrier_roaming_dir="$state_dir/roaming"
@@ -59,7 +59,7 @@ index 7c29e276..becc019f 100644
fi fi
rm -f "$cf" rm -f "$cf"
} }
@@ -170,7 +179,7 @@ add_resolv_conf() @@ -179,7 +188,7 @@ add_resolv_conf()
for x in ${new_domain_name_servers}; do for x in ${new_domain_name_servers}; do
conf="${conf}nameserver $x$NL" conf="${conf}nameserver $x$NL"
done done
@@ -68,7 +68,7 @@ index 7c29e276..becc019f 100644
[ -n "$ifmetric" ] && export IF_METRIC="$ifmetric" [ -n "$ifmetric" ] && export IF_METRIC="$ifmetric"
printf %s "$conf" | "$resolvconf" -a "$ifname" printf %s "$conf" | "$resolvconf" -a "$ifname"
return $? return $?
@@ -186,7 +195,7 @@ add_resolv_conf() @@ -195,7 +204,7 @@ add_resolv_conf()
remove_resolv_conf() remove_resolv_conf()
{ {