diff options
| author | Wang Mingyu <wangmy@fujitsu.com> | 2023-03-10 15:08:15 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-23 22:45:34 +0000 |
| commit | e77d98a99278d0afcbe2bfb4925811d2cb5c7597 (patch) | |
| tree | 608cf3bc5358fd0fc40b245306abe9542b2e3577 /scripts/lib/devtool/upgrade.py | |
| parent | 7a502f838ae7cbf41e9a3b825aa0032275e8234d (diff) | |
| download | poky-e77d98a99278d0afcbe2bfb4925811d2cb5c7597.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: 800ea13091216a59e21718fa0fada45b45bdca2c)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool/upgrade.py')
0 files changed, 0 insertions, 0 deletions