CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

dialog: Fix install conflict when enable multilib

Browse Source 
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>
This commit is contained in:
Liu Yiding 2025-07-10 13:47:42 +08:00 committed by Khem Raj
parent 03c66e2ba3
commit 2181c17f8e
No known key found for this signature in database
GPG Key ID: BB053355919D3314
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-oe/recipes-extended/dialog/dialog_1.3-20250116.bb
View File

@ -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