]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commit
dhcpcd: Fix install conflict when enable multilib.
authorWang Mingyu <wangmy@fujitsu.com>
Fri, 10 Mar 2023 07:08:15 +0000 (15:08 +0800)
committerSteve Sakoman <steve@sakoman.com>
Thu, 16 Mar 2023 14:35:11 +0000 (04:35 -1000)
commitae3aa0ded86ae13060989d19e64795b00946cd2e
tree6d1c14d973c9e7f49a362a03b5a2d26370499db4
parent679835b6f692d7e344c115da72ddf4553657ac54
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.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 65ca2c4b7349a4f7dcfcc580d926a99c673deb60)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch [new file with mode: 0644]