diff options
| author | Wang Mingyu <wangmy@fujitsu.com> | 2023-03-10 15:08:15 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-11 00:08:41 +0000 |
| commit | 713f60559d897d5e73ca7b0d06f796a5a0e524e9 (patch) | |
| tree | a5d0f6d08f3a1e176b9eef4944a752917e6bba2e /meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb | |
| parent | 64c96cbe52754e803a905513d582e2d35e837cdf (diff) | |
| download | poky-713f60559d897d5e73ca7b0d06f796a5a0e524e9.tar.gz | |
dhcpcd: Fix install conflict when enable multilib.
Error: Transaction test error:
file /usr/share/man/man8/dhcpcd.8 conflicts between attempted installs of dhcpcd-doc-9.4.1-r0.cortexa57 and lib32-dhcpcd-doc-9.4.1-r0.armv7ahf_neon
The differences between the two files are as follows:
@@ -821,7 +821,7 @@
If you always use the same options, put them here.
.It Pa /usr/libexec/dhcpcd-run-hooks
Bourne shell script that is run to configure or de-configure an interface.
-.It Pa /usr/lib64/dhcpcd/dev
+.It Pa /usr/lib/dhcpcd/dev
Linux
.Pa /dev
management modules.
(From OE-Core rev: 65ca2c4b7349a4f7dcfcc580d926a99c673deb60)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb')
| -rw-r--r-- | meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb index 39e689d2f6..579fa95df7 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb | |||
| @@ -19,6 +19,7 @@ SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ | |||
| 19 | file://0001-privsep-linux-fix-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch \ | 19 | file://0001-privsep-linux-fix-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch \ |
| 20 | file://dhcpcd.service \ | 20 | file://dhcpcd.service \ |
| 21 | file://dhcpcd@.service \ | 21 | file://dhcpcd@.service \ |
| 22 | file://0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch \ | ||
| 22 | " | 23 | " |
| 23 | 24 | ||
| 24 | SRC_URI[sha256sum] = "819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c" | 25 | SRC_URI[sha256sum] = "819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c" |