summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2025-03-15 07:08:57 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-03-18 11:25:36 +0000
commit39c0bfd3eabb194a3adf1326d093467c76390d90 (patch)
tree7bcda27ca64f98f17a2bcaa08c1234f17182e410 /meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch
parent159a49f35a2b93f569cb8affe9f97fc3c0aa9e66 (diff)
downloadpoky-39c0bfd3eabb194a3adf1326d093467c76390d90.tar.gz
dhcpcd: upgrade 10.1.0 -> 10.2.2
License-Update: Copyright years change only Drop a backported patch (From OE-Core rev: 718e4efa4f6f595b17e2438a15fc57c2c88ae9f1) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch')
-rw-r--r--meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch b/meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch
index b958110ef1..484b84f94a 100644
--- a/meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch
+++ b/meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch
@@ -1,4 +1,4 @@
1From 1115784dfdf2e7095cf599f9becef705ac57f80e Mon Sep 17 00:00:00 2001 1From e9b1376c59b15e7b03611429187d9d89167154b5 Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui@fujitsu.com> 2From: Lei Maohui <leimaohui@fujitsu.com>
3Date: Fri, 10 Mar 2023 03:48:46 +0000 3Date: Fri, 10 Mar 2023 03:48:46 +0000
4Subject: [PATCH] dhcpcd.8: Fix conflict error when enable multilib. 4Subject: [PATCH] dhcpcd.8: Fix conflict error when enable multilib.
@@ -29,7 +29,7 @@ Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
29 1 file changed, 1 insertion(+), 1 deletion(-) 29 1 file changed, 1 insertion(+), 1 deletion(-)
30 30
31diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in 31diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in
32index 04bf7d90..9cf10d24 100644 32index 91fdde2c..b467dc3b 100644
33--- a/src/dhcpcd.8.in 33--- a/src/dhcpcd.8.in
34+++ b/src/dhcpcd.8.in 34+++ b/src/dhcpcd.8.in
35@@ -826,7 +826,7 @@ Configuration file for dhcpcd. 35@@ -826,7 +826,7 @@ Configuration file for dhcpcd.