| Message ID | 20261106173717.1054294-2-khem.raj@oss.qualcomm.com |
|---|---|
| State | Under Review |
| Headers | show |
| Series | [v2,1/2] dbus: Let the ptest package install alongside dbus-broker | expand |
diff --git a/meta/classes-global/staging.bbclass b/meta/classes-global/staging.bbclass index 5833abebc8..20340a16e1 100644 --- a/meta/classes-global/staging.bbclass +++ b/meta/classes-global/staging.bbclass @@ -34,7 +34,6 @@ SYSROOT_DIRS_IGNORE = " \ ${mandir} \ ${docdir} \ ${infodir} \ - ${datadir}/X11/locale \ ${datadir}/applications \ ${datadir}/bash-completion \ ${datadir}/fonts \ diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.8.14.bb b/meta/recipes-graphics/xorg-lib/libx11_1.8.14.bb index 25fcd6d8b9..5e35bda3c5 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.8.14.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.8.14.bb @@ -39,6 +39,4 @@ FILES:${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/ FILES:${PN}-xcb += "${libdir}/libX11-xcb.so.*" FILES:${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" -SYSROOT_DIRS_IGNORE:remove:class-target = "${datadir}/X11/locale" - BBCLASSEXTEND = "native nativesdk"
Commit 63204f5551 moved the X11 locale data from the native to the target sysroot for meson-based ibus 1.5.35. ibus 1.5.34, which is what meta-oe currently ships, still copies en_US.UTF-8/Compose from STAGING_DATADIR_NATIVE, so its do_compile now fails. On distros without x11 there is no target libx11 to provide the data either. Keep the directory in every sysroot so both ibus versions find it. Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> --- v2: Remove staging x11/locale from staging class meta/classes-global/staging.bbclass | 1 - meta/recipes-graphics/xorg-lib/libx11_1.8.14.bb | 2 -- 2 files changed, 3 deletions(-)