diff options
| author |   Wang Mingyu <wangmy@fujitsu.com> | 2024-02-01 16:15:08 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2024-02-01 08:17:38 -0800 |
| commit | f0512636fdaae0791f9f9708d18773aa56bec3e8 (patch) | |
| tree | 87838e107b4dd7712546c775581100659cbcce82 /meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb | |
| parent | 9e96cb9d12b683d5d6812bce5aa0789fc333dd17 (diff) | |
| download | meta-openembedded-f0512636fdaae0791f9f9708d18773aa56bec3e8.tar.gz | |
cmocka: Fix install conflict when enable multilib.
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>
Diffstat (limited to 'meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb')
| -rw-r--r-- | meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb b/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb index 44077a0d35..7461fcc4d7 100644 --- a/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb +++ b/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb @@ -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 -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 -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}/${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" |