diff mbox series

[meta-oe] dialog: Fix install conflict when enable multilib

Message ID 20250710054742.1507-1-liuyd.fnst@fujitsu.com
State Under Review
Headers show
Series [meta-oe] dialog: Fix install conflict when enable multilib | expand

Commit Message

Liu Yiding July 10, 2025, 5:47 a.m. UTC 
fix issue that:
file /usr/bin/dialog conflicts between attempted installs of dialog-1.3+20250116-r0.cortexa57 and lib32-dialog-1.3+20250116-r0.armv7at2hf_neon

To be noticed that dialog itself is already symlink now
xxx/image/usr/bin$ ls -l -t
total 888
lrwxrwxrwx 1 userland userland     45 Jul 10 02:15 dialog -> /usr/bin/arm-pokymllib32-linux-gnueabi-dialog
-rwxr-xr-x 1 userland userland 907748 Jul 10 02:15 arm-pokymllib32-linux-gnueabi-dialog

xxx/image/usr/bin$ ls -l -t
total 988
lrwxrwxrwx 1 userland userland      34 Jul 10 02:15 dialog -> /usr/bin/aarch64-poky-linux-dialog
-rwxr-xr-x 1 userland userland 1037624 Jul 10 02:15 aarch64-poky-linux-dialog

after this commit:
xxx/tmp/work/qemuarm64-poky-linux/core-image-minimal/1.0/rootfs/usr/bin$ ls -l -t dialog*
lrwxrwxrwx 1 userland userland 21 Mar  9  2018 dialog -> /usr/bin/dialog-lib64
lrwxrwxrwx 1 userland userland 45 Mar  9  2018 dialog-lib -> /usr/bin/arm-pokymllib32-linux-gnueabi-dialog
lrwxrwxrwx 1 userland userland 34 Mar  9  2018 dialog-lib64 -> /usr/bin/aarch64-poky-linux-dialog

Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
---
 meta-oe/recipes-extended/dialog/dialog_1.3-20250116.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta-oe/recipes-extended/dialog/dialog_1.3-20250116.bb b/meta-oe/recipes-extended/dialog/dialog_1.3-20250116.bb
index 7c596371e5..0d09ccea16 100644
--- a/meta-oe/recipes-extended/dialog/dialog_1.3-20250116.bb
+++ b/meta-oe/recipes-extended/dialog/dialog_1.3-20250116.bb
@@ -14,7 +14,7 @@  SRC_URI[sha256sum] = "68406329827b783d0a8959cc20a94c6e1791ac861a27f854e06e902054
 # hardcoded here for use in dialog-static recipe
 S = "${UNPACKDIR}/dialog-${PV}"
 
-inherit autotools-brokensep pkgconfig
+inherit autotools-brokensep pkgconfig multilib_script
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
 
@@ -23,6 +23,8 @@  PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${ST
 EXTRA_OECONF = "--with-ncurses \
                 --disable-rpath-hack"
 
+MULTILIB_SCRIPTS = "${PN}:${bindir}/dialog"
+
 do_configure() {
     gnu-configize --force
     sed -i 's,${cf_ncuconfig_root}6-config,${cf_ncuconfig_root}-config,g' -i configure