summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@amd.com>2023-04-04 19:14:09 +0000
committerMark Hatle <mark.hatle@amd.com>2023-04-10 09:03:22 -0700
commit22a09beca042df108e582941651709bf915e6a02 (patch)
tree81cf94c2ea3be6c8dbb5ffcc384ec72a45fe07a8
parente03221273d5d65e24cf3cb771746b0d26539005e (diff)
downloadmeta-xilinx-22a09beca042df108e582941651709bf915e6a02.tar.gz
meta_%.bbappend: Avoid contaminating mesa-native PACKAGECONFIG
Adding meta-xilinx-core was contaminating the PACKAGECONFIG hash when building mesa-native. Workaround this by only adjusting the value when class-target is defined. Signed-off-by: Mark Hatle <mark.hatle@amd.com>
-rw-r--r--meta-xilinx-core/recipes-graphics/mesa/mesa_%.bbappend2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-xilinx-core/recipes-graphics/mesa/mesa_%.bbappend b/meta-xilinx-core/recipes-graphics/mesa/mesa_%.bbappend
index 1b2230f7..8c0e7898 100644
--- a/meta-xilinx-core/recipes-graphics/mesa/mesa_%.bbappend
+++ b/meta-xilinx-core/recipes-graphics/mesa/mesa_%.bbappend
@@ -6,7 +6,7 @@ CONFLICT_DISTRO_FEATURES:class-target = "${@bb.utils.contains('MACHINE_FEATURES'
6 6
7# Enable lima if not using libmali 7# Enable lima if not using libmali
8PACKAGECONFIG_MALI = "${@bb.utils.contains('DISTRO_FEATURES', 'libmali', '', 'lima', d)}" 8PACKAGECONFIG_MALI = "${@bb.utils.contains('DISTRO_FEATURES', 'libmali', '', 'lima', d)}"
9PACKAGECONFIG:append = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', '${PACKAGECONFIG_MALI}', '', d)}" 9PACKAGECONFIG:append:class-target = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', '${PACKAGECONFIG_MALI}', '', d)}"
10 10
11PACKAGE_ARCH_DEFAULT := "${PACKAGE_ARCH}" 11PACKAGE_ARCH_DEFAULT := "${PACKAGE_ARCH}"
12PACKAGE_ARCH = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', '${MACHINE_ARCH}', '${PACKAGE_ARCH_DEFAULT}', d)}" 12PACKAGE_ARCH = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', '${MACHINE_ARCH}', '${PACKAGE_ARCH_DEFAULT}', d)}"