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 | 7 |
1 files changed, 3 insertions, 4 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 461d04bd1d..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 @@ | |||
1 | From 5d5ba8a2b8010db6bee68bd712f829cb737c9ac1 Mon Sep 17 00:00:00 2001 | 1 | From e9b1376c59b15e7b03611429187d9d89167154b5 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,16 +24,15 @@ 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 | |||
28 | --- | 27 | --- |
29 | src/dhcpcd.8.in | 2 +- | 28 | src/dhcpcd.8.in | 2 +- |
30 | 1 file changed, 1 insertion(+), 1 deletion(-) | 29 | 1 file changed, 1 insertion(+), 1 deletion(-) |
31 | 30 | ||
32 | diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in | 31 | diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in |
33 | index 93232840..09930a31 100644 | 32 | index 91fdde2c..b467dc3b 100644 |
34 | --- a/src/dhcpcd.8.in | 33 | --- a/src/dhcpcd.8.in |
35 | +++ b/src/dhcpcd.8.in | 34 | +++ b/src/dhcpcd.8.in |
36 | @@ -824,7 +824,7 @@ Configuration file for dhcpcd. | 35 | @@ -826,7 +826,7 @@ Configuration file for dhcpcd. |
37 | If you always use the same options, put them here. | 36 | If you always use the same options, put them here. |
38 | .It Pa @SCRIPT@ | 37 | .It Pa @SCRIPT@ |
39 | Bourne shell script that is run to configure or de-configure an interface. | 38 | Bourne shell script that is run to configure or de-configure an interface. |