helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-04-02 02:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmocka: Fix install conflict when enable multilib.

Browse Source 
Error: Transaction test error:
  file /usr/share/cmocka/example/mock/libproc_uptime.so conflicts between attempted installs of lib32-libcmocka-examples-1.1.7+git0+a01cc69ee9-r0.armv7ahf_neon and libcmocka-examples-1.1.7+git0+a01cc69ee9-r0.cortexa57

Change install directory from share to lib to resolve conflict.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Wang Mingyu 2024-02-01 16:15:08 +08:00 committed by Khem Raj
parent 9e96cb9d12
commit f0512636fd
No known key found for this signature in database
GPG Key ID: BB053355919D3314
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb
View File

@ -22,15 +22,15 @@ EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCMAKE_BUILD_TYPE
LTO = ""
do_install:append () {
install -d ${D}${datadir}/${BPN}/example
install -d ${D}${datadir}/${BPN}/example/mock/chef_wrap
install -d ${D}${datadir}/${BPN}/example/mock/uptime
install -d ${D}${libdir}/${BPN}/example
install -d ${D}${libdir}/${BPN}/example/mock/chef_wrap
install -d ${D}${libdir}/${BPN}/example/mock/uptime
install -m 0755 ${B}/example/*_test ${D}/${datadir}/${BPN}/example
install -m 0755 ${B}/example/mock/chef_wrap/waiter_test_wrap ${D}/${datadir}/${BPN}/example/mock/chef_wrap
install -m 0755 ${B}/example/mock/uptime/uptime ${D}/${datadir}/${BPN}/example/mock/uptime
install -m 0755 ${B}/example/mock/uptime/test_uptime ${D}/${datadir}/${BPN}/example/mock/uptime
install -m 0644 ${B}/example/mock/uptime/libproc_uptime.so ${D}/${datadir}/${BPN}/example/mock/libproc_uptime.so
install -m 0755 ${B}/example/*_test ${D}/${libdir}/${BPN}/example
install -m 0755 ${B}/example/mock/chef_wrap/waiter_test_wrap ${D}/${libdir}/${BPN}/example/mock/chef_wrap
install -m 0755 ${B}/example/mock/uptime/uptime ${D}/${libdir}/${BPN}/example/mock/uptime
install -m 0755 ${B}/example/mock/uptime/test_uptime ${D}/${libdir}/${BPN}/example/mock/uptime
install -m 0644 ${B}/example/mock/uptime/libproc_uptime.so ${D}/${libdir}/${BPN}/example/mock/libproc_uptime.so
}
do_install_ptest () {
@ -40,5 +40,4 @@ do_install_ptest () {
PACKAGE_BEFORE_PN += "${PN}-examples"
FILES:${PN}-examples = "${datadir}/${BPN}/example"
INSANE_SKIP:${PN}-examples = "libdir"
FILES:${PN}-examples = "${libdir}/${BPN}/example"