diff options
| author | Wang Mingyu <wangmy@fujitsu.com> | 2023-03-23 09:59:56 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-04-04 17:46:24 +0100 |
| commit | acfdf3ccab982c6e277cac2b8656d546a7778053 (patch) | |
| tree | c649217edf3a4ce78b51eed8fa33de17d083c828 /scripts/lib/wic/filemap.py | |
| parent | 699b3001ec2bb1e9d6a4f6928ccb02284ee5ac9f (diff) | |
| download | poky-acfdf3ccab982c6e277cac2b8656d546a7778053.tar.gz | |
xcb-proto: Fix install conflict when enable multilib.
Error: Transaction test error:
file /usr/share/pkgconfig/xcb-proto.pc conflicts between attempted installs of lib32-xcb-proto-dev-1.15.2-r0.armv7ahf_neon and xcb-proto-dev-1.15.2-r0.cortexa57
The differences between the two files are as follows:
@@ -2,7 +2,7 @@
exec_prefix=/usr
datarootdir=${prefix}/share
datadir=/usr/share
-libdir=/usr/lib64
+libdir=/usr/lib
xcbincludedir=${pc_sysrootdir}${datadir}/xcb
PYTHON_PREFIX=${prefix}
pythondir=${pc_sysrootdir}${libdir}/python3.11/site-packages
(From OE-Core rev: a9fdbd8d5a2017248f519784e4236b3983e5ecac)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 4876189dd2ae5a04a296b11b537b9f613159c6bf)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/filemap.py')
0 files changed, 0 insertions, 0 deletions