summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2023-12-27 21:07:30 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-12-30 11:03:07 +0000
commitc541bd3f3cc1d90a83d61398ad015716dfded2e5 (patch)
tree85080f8d219a0e777e5506d8e6495021dee83a7a /meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch
parentca78b23f57519c6e82008bd3534a33569046910d (diff)
downloadpoky-c541bd3f3cc1d90a83d61398ad015716dfded2e5.tar.gz
dhcpcd: upgrade 10.0.5 -> 10.0.6
0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch 0001-remove-INCLUDEDIR-to-prevent-build-issues.patch refreshed for 10.0.6 Changelog: ========== -privsep: Stop proxying stderr to console and fix some detachment issues -non-privsep: Fix launcher hangup -DHCP6: Allow the invalid interface name - to mean don't assign an address from a delegated prefix -DHCP6: Load the configuration for the interface being activated from prefix delegation (From OE-Core rev: 9f813cdbb789423219cb83affd40cd0f3c377485) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> 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.patch10
1 files changed, 4 insertions, 6 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 12998aada4..461d04bd1d 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 4915a7e52fcea8fe283a842890a1e726b1e26b10 Mon Sep 17 00:00:00 2001 1From 5d5ba8a2b8010db6bee68bd712f829cb737c9ac1 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.
@@ -24,15 +24,16 @@ versions.
24 24
25Upstream-Status: Inappropriate [oe specific] 25Upstream-Status: Inappropriate [oe specific]
26Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> 26Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
27
27--- 28---
28 src/dhcpcd.8.in | 2 +- 29 src/dhcpcd.8.in | 2 +-
29 1 file changed, 1 insertion(+), 1 deletion(-) 30 1 file changed, 1 insertion(+), 1 deletion(-)
30 31
31diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in 32diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in
32index bc6b3b5..791f2ba 100644 33index 93232840..09930a31 100644
33--- a/src/dhcpcd.8.in 34--- a/src/dhcpcd.8.in
34+++ b/src/dhcpcd.8.in 35+++ b/src/dhcpcd.8.in
35@@ -821,7 +821,7 @@ Configuration file for dhcpcd. 36@@ -824,7 +824,7 @@ Configuration file for dhcpcd.
36 If you always use the same options, put them here. 37 If you always use the same options, put them here.
37 .It Pa @SCRIPT@ 38 .It Pa @SCRIPT@
38 Bourne shell script that is run to configure or de-configure an interface. 39 Bourne shell script that is run to configure or de-configure an interface.
@@ -41,6 +42,3 @@ index bc6b3b5..791f2ba 100644
41 Linux 42 Linux
42 .Pa /dev 43 .Pa /dev
43 management modules. 44 management modules.
44--
452.34.1
46