summaryrefslogtreecommitdiffstats
path: root/conf/include
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2024-11-11 11:07:21 +0100
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2024-11-20 13:35:26 +0000
commite13ea43e956a13fbea9134c2a2a9f4612c21e3f4 (patch)
tree167d9509c34e145867748256f9ad1c9e02b8d675 /conf/include
parent59505a9bc8662f410e6b8c526a668c39bb8eaf73 (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 'conf/include')
-rw-r--r--conf/include/agl-demo.inc9
1 files changed, 9 insertions, 0 deletions
diff --git a/conf/include/agl-demo.inc b/conf/include/agl-demo.inc
index caba58cc8..4cc72575d 100644
--- a/conf/include/agl-demo.inc
+++ b/conf/include/agl-demo.inc
@@ -24,3 +24,12 @@ AGL_FEATURES:append = " agldemo"
PREFERRED_RPROVIDER_kuksa-val-certificates-ca = "kuksa-certificates-agl"
PREFERRED_RPROVIDER_kuksa-val-certificates-server = "kuksa-certificates-agl"
PREFERRED_RPROVIDER_kuksa-val-certificates-client = "kuksa-certificates-agl"
+
+
+# meta-clang replaces llvm with clang - avoid installation errors
+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"