diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-11-11 11:07:21 +0100 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-11-20 13:35:26 +0000 |
| commit | e13ea43e956a13fbea9134c2a2a9f4612c21e3f4 (patch) | |
| tree | 167d9509c34e145867748256f9ad1c9e02b8d675 /recipes-qt/packagegroups | |
| parent | 59505a9bc8662f410e6b8c526a668c39bb8eaf73 (diff) | |
qtbase(qt6): Enforce no x11-native gets pulled in and fix issues in qt6 layer, fix llvm vs. clang
Workaround: Fix wrong detection of X11 headers in native sysroot.
For now remove xkbcommon
Limit qt6 packagegroup inclusion to avoid unnecessary content in image.
Also remove old patch to qtmultimedia.
meta-clang inclusion now needs
https://github.com/kraj/meta-clang/tree/scarthgap?tab=readme-ov-file#providing-llvm
thus add
PREFERRED_PROVIDER_llvm = "clang"
PREFERRED_PROVIDER_llvm-native = "clang-native"
PREFERRED_PROVIDER_nativesdk-llvm = "nativesdk-clang"
PROVIDES:pn-clang = "llvm"
PROVIDES:pn-clang-native = "llvm-native"
PROVIDES:pn-nativesdk-clang = "nativesdk-llvm"
Need to work out the final location for these.
Bug-AGL: SPEC-5282
Change-Id: Ib3ed9e81ecd1e27681e443dacddac5fec42a303f
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30503
Diffstat (limited to 'recipes-qt/packagegroups')
4 files changed, 8 insertions, 0 deletions
diff --git a/recipes-qt/packagegroups/packagegroup-qt6-addons.bbappend b/recipes-qt/packagegroups/packagegroup-qt6-addons.bbappend new file mode 100644 index 000000000..c81787fe2 --- /dev/null +++ b/recipes-qt/packagegroups/packagegroup-qt6-addons.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'packagegroup-qt6-addons_agldemo.inc', '', d)} diff --git a/recipes-qt/packagegroups/packagegroup-qt6-addons_agldemo.inc b/recipes-qt/packagegroups/packagegroup-qt6-addons_agldemo.inc new file mode 100644 index 000000000..989f8d07f --- /dev/null +++ b/recipes-qt/packagegroups/packagegroup-qt6-addons_agldemo.inc @@ -0,0 +1,3 @@ +# qtpdf has extensive dependencies (chromium) +# also there is a build issue as it requires deep in the 3rd-party tree cups-config +RDEPENDS:${PN}:remove = "qtpdf" diff --git a/recipes-qt/packagegroups/packagegroup-qt6-modules.bbappend b/recipes-qt/packagegroups/packagegroup-qt6-modules.bbappend new file mode 100644 index 000000000..13640b898 --- /dev/null +++ b/recipes-qt/packagegroups/packagegroup-qt6-modules.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'packagegroup-qt6-modules_agldemo.inc', '', d)} diff --git a/recipes-qt/packagegroups/packagegroup-qt6-modules_agldemo.inc b/recipes-qt/packagegroups/packagegroup-qt6-modules_agldemo.inc new file mode 100644 index 000000000..c94d0d08b --- /dev/null +++ b/recipes-qt/packagegroups/packagegroup-qt6-modules_agldemo.inc @@ -0,0 +1,3 @@ +# the addons group is pretty heavy. +# better pull in dependencies as required in our case +RDEPENDS:${PN}:remove = "packagegroup-qt6-addons" |