diff options
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.patch | 10 |
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 @@ | |||
1 | From 4915a7e52fcea8fe283a842890a1e726b1e26b10 Mon Sep 17 00:00:00 2001 | 1 | From 5d5ba8a2b8010db6bee68bd712f829cb737c9ac1 Mon Sep 17 00:00:00 2001 |
2 | From: Lei Maohui <leimaohui@fujitsu.com> | 2 | From: Lei Maohui <leimaohui@fujitsu.com> |
3 | Date: Fri, 10 Mar 2023 03:48:46 +0000 | 3 | Date: Fri, 10 Mar 2023 03:48:46 +0000 |
4 | Subject: [PATCH] dhcpcd.8: Fix conflict error when enable multilib. | 4 | Subject: [PATCH] dhcpcd.8: Fix conflict error when enable multilib. |
@@ -24,15 +24,16 @@ versions. | |||
24 | 24 | ||
25 | Upstream-Status: Inappropriate [oe specific] | 25 | Upstream-Status: Inappropriate [oe specific] |
26 | Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> | 26 | Signed-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 | ||
31 | diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in | 32 | diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in |
32 | index bc6b3b5..791f2ba 100644 | 33 | index 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 | -- | ||
45 | 2.34.1 | ||
46 | |||