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 | 4 |
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 @@ | |||
| 1 | From 1115784dfdf2e7095cf599f9becef705ac57f80e 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. |
| @@ -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 | ||
| 31 | 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 |
| 32 | index 04bf7d90..9cf10d24 100644 | 32 | index 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. |