diff mbox series

[03/45] dhcpcd: upgrade 10.2.2 -> 10.2.4

Message ID 20250604084524.864-3-wangmy@fujitsu.com
State Accepted, archived
Commit 7e74593f4b341deef995adba5790eacffcfd41f1
Headers show
Series [01/45] apr: upgrade 1.7.5 -> 1.7.6 | expand

Commit Message

Wang Mingyu June 4, 2025, 8:44 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

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

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../dhcpcd/{dhcpcd_10.2.2.bb => dhcpcd_10.2.4.bb}         | 2 +-
 ...esolv.conf-improve-the-sitation-of-working-with-.patch | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename meta/recipes-connectivity/dhcpcd/{dhcpcd_10.2.2.bb => dhcpcd_10.2.4.bb} (97%)
diff mbox series

Patch

diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.2.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.4.bb
similarity index 97%
rename from meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.2.bb
rename to meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.4.bb
index f9dfd2e245..dee921d21c 100644
--- a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.2.bb
+++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.4.bb
@@ -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 \
            "
 
-SRCREV = "f6983c18dbf7989f43a2838beeaf62a54c53ff1d"
+SRCREV = "93df2b254caf9639f9ffb66e0fe2b584eeba6220"
 S = "${WORKDIR}/git"
 
 # Doesn't use automake so we can't do out-of-tree builds
diff --git a/meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch b/meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch
index 4f687b0292..512e33aebf 100644
--- a/meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch
+++ b/meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch
@@ -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>
 Date: Wed, 9 Nov 2022 16:33:18 +0800
 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(-)
 
 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
 +++ b/hooks/20-resolv.conf
 @@ -11,8 +11,12 @@ nocarrier_roaming_dir="$state_dir/roaming"
@@ -59,7 +59,7 @@  index 7c29e276..becc019f 100644
  	fi
  	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
  		conf="${conf}nameserver $x$NL"
  	done
@@ -68,7 +68,7 @@  index 7c29e276..becc019f 100644
  		[ -n "$ifmetric" ] && export IF_METRIC="$ifmetric"
  		printf %s "$conf" | "$resolvconf" -a "$ifname"
  		return $?
-@@ -186,7 +195,7 @@ add_resolv_conf()
+@@ -195,7 +204,7 @@ add_resolv_conf()
  
  remove_resolv_conf()
  {