diff options
author | Liu Yiding <liuyd.fnst@fujitsu.com> | 2025-07-10 13:47:42 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2025-07-10 00:05:57 -0700 |
commit | 2181c17f8e1bc1efb8d9523113f1c6cf62bdbacc (patch) | |
tree | b0364a15e088660356ba25129ba6a7cdcadb0531 | |
parent | 03c66e2ba3d6c1170b787ba5daec9bf8dddb69dc (diff) | |
download | meta-openembedded-2181c17f8e1bc1efb8d9523113f1c6cf62bdbacc.tar.gz |
dialog: Fix install conflict when enable multilib
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>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-extended/dialog/dialog_1.3-20250116.bb | 4 |
1 files changed, 3 insertions, 1 deletions
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 | |||
14 | # hardcoded here for use in dialog-static recipe | 14 | # hardcoded here for use in dialog-static recipe |
15 | S = "${UNPACKDIR}/dialog-${PV}" | 15 | S = "${UNPACKDIR}/dialog-${PV}" |
16 | 16 | ||
17 | inherit autotools-brokensep pkgconfig | 17 | inherit autotools-brokensep pkgconfig multilib_script |
18 | 18 | ||
19 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" | 19 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
20 | 20 | ||
@@ -23,6 +23,8 @@ PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${ST | |||
23 | EXTRA_OECONF = "--with-ncurses \ | 23 | EXTRA_OECONF = "--with-ncurses \ |
24 | --disable-rpath-hack" | 24 | --disable-rpath-hack" |
25 | 25 | ||
26 | MULTILIB_SCRIPTS = "${PN}:${bindir}/dialog" | ||
27 | |||
26 | do_configure() { | 28 | do_configure() { |
27 | gnu-configize --force | 29 | gnu-configize --force |
28 | sed -i 's,${cf_ncuconfig_root}6-config,${cf_ncuconfig_root}-config,g' -i configure | 30 | sed -i 's,${cf_ncuconfig_root}6-config,${cf_ncuconfig_root}-config,g' -i configure |