12 files changed, 20 insertions, 19 deletions

diff --git a/meta-xilinx-core/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend b/meta-xilinx-core/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend
index bb792de2..53475f64 100644
--- a/meta-xilinx-core/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend
+++ b/meta-xilinx-core/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend
@@ -1,2 +1,2 @@
 # Has a dependency on libmali
-PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}"
+PACKAGE_ARCH:mali400 = "${MACHINE_ARCH}"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu_%.bbappend b/meta-xilinx-core/recipes-devtools/qemu/qemu_%.bbappend
index bb792de2..53475f64 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu_%.bbappend
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu_%.bbappend
@@ -1,2 +1,2 @@
 # Has a dependency on libmali
-PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}"
+PACKAGE_ARCH:mali400 = "${MACHINE_ARCH}"
diff --git a/meta-xilinx-core/recipes-gnome/gtk+/gtk+3_%.bbappend b/meta-xilinx-core/recipes-gnome/gtk+/gtk+3_%.bbappend
index bb792de2..53475f64 100644
--- a/meta-xilinx-core/recipes-gnome/gtk+/gtk+3_%.bbappend
+++ b/meta-xilinx-core/recipes-gnome/gtk+/gtk+3_%.bbappend
@@ -1,2 +1,2 @@
 # Has a dependency on libmali
-PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}"
+PACKAGE_ARCH:mali400 = "${MACHINE_ARCH}"
diff --git a/meta-xilinx-core/recipes-graphics/cairo/cairo_%.bbappend b/meta-xilinx-core/recipes-graphics/cairo/cairo_%.bbappend
index 68805315..4efd957d 100644
--- a/meta-xilinx-core/recipes-graphics/cairo/cairo_%.bbappend
+++ b/meta-xilinx-core/recipes-graphics/cairo/cairo_%.bbappend
@@ -4,4 +4,4 @@ PACKAGECONFIG:mali400 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb
 # OpenGL comes from libmali
 DEPENDS:append:mali400 = " libmali-xlnx"
 
-PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}"
+PACKAGE_ARCH:mali400 = "${MACHINE_ARCH}"
diff --git a/meta-xilinx-core/recipes-graphics/libepoxy/libepoxy_%.bbappend b/meta-xilinx-core/recipes-graphics/libepoxy/libepoxy_%.bbappend
index bb792de2..53475f64 100644
--- a/meta-xilinx-core/recipes-graphics/libepoxy/libepoxy_%.bbappend
+++ b/meta-xilinx-core/recipes-graphics/libepoxy/libepoxy_%.bbappend
@@ -1,2 +1,2 @@
 # Has a dependency on libmali
-PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}"
+PACKAGE_ARCH:mali400 = "${MACHINE_ARCH}"
diff --git a/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx.bb b/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx.bb
index 3159829d..ebdda630 100644
--- a/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx.bb
+++ b/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx.bb
@@ -27,8 +27,7 @@ SRC_URI = " \
     file://gbm.pc \
     "
 
-PACKAGE_ARCH = "${SOC_VARIANT_ARCH}"
-
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-xilinx-core/recipes-graphics/libglu/libglu_%.bbappend b/meta-xilinx-core/recipes-graphics/libglu/libglu_%.bbappend
index 54fb4298..82725e4f 100644
--- a/meta-xilinx-core/recipes-graphics/libglu/libglu_%.bbappend
+++ b/meta-xilinx-core/recipes-graphics/libglu/libglu_%.bbappend
@@ -1,3 +1,3 @@
 # OpenGL comes from libmali, adjust parameters
 DEPENDS:append:mali400 =  " virtual/libgles2"
-PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}"
+PACKAGE_ARCH:mali400 = "${MACHINE_ARCH}"
diff --git a/meta-xilinx-core/recipes-graphics/libsdl2/libsdl2_%.bbappend b/meta-xilinx-core/recipes-graphics/libsdl2/libsdl2_%.bbappend
index c3b20716..ee4ca7bb 100644
--- a/meta-xilinx-core/recipes-graphics/libsdl2/libsdl2_%.bbappend
+++ b/meta-xilinx-core/recipes-graphics/libsdl2/libsdl2_%.bbappend
@@ -1,3 +1,3 @@
 # Has a dependency on libmali
-PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}"
+PACKAGE_ARCH:mali400 = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-core/recipes-graphics/mesa/mesa-demos_%.bbappend b/meta-xilinx-core/recipes-graphics/mesa/mesa-demos_%.bbappend
index ca910830..d430b63e 100644
--- a/meta-xilinx-core/recipes-graphics/mesa/mesa-demos_%.bbappend
+++ b/meta-xilinx-core/recipes-graphics/mesa/mesa-demos_%.bbappend
@@ -1,4 +1,4 @@
 # OpenGL comes from libmali on ev/eg, when egl is enabled
 DEPENDS:append:mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', ' libmali-xlnx', '', d)}"
 
-PACKAGE_ARCH:mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${TUNE_PKGARCH}', d)}"
+PACKAGE_ARCH:mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${MACHINE_ARCH}', '${TUNE_PKGARCH}', d)}"
diff --git a/meta-xilinx-core/recipes-graphics/virglrenderer/virglrenderer_%.bbappend b/meta-xilinx-core/recipes-graphics/virglrenderer/virglrenderer_%.bbappend
index bb792de2..53475f64 100644
--- a/meta-xilinx-core/recipes-graphics/virglrenderer/virglrenderer_%.bbappend
+++ b/meta-xilinx-core/recipes-graphics/virglrenderer/virglrenderer_%.bbappend
@@ -1,2 +1,2 @@
 # Has a dependency on libmali
-PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}"
+PACKAGE_ARCH:mali400 = "${MACHINE_ARCH}"
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend b/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend
index 199133f9..85176995 100644
--- a/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend
+++ b/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend
@@ -2,16 +2,18 @@ FILESEXTRAPATHS:prepend:zynqmp := "${THISDIR}/files:"
 
 SRC_URI:append:zynqmp = " file://0001-libweston-Remove-substitute-format-for-ARGB8888.patch"
 
+# Due to the SRC_URI zynqmp specific change, this needs to be SOC_FAMILY_ARCH specific
+SOC_FAMILY_ARCH ??= "${TUNE_PKGARCH}"
+PACKAGE_ARCH:zynqmp = "${SOC_FAMILY_ARCH}"
+
+
 # OpenGL comes from libmali on ev/eg, when egl is enabled
 DEPENDS:append:mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', ' libmali-xlnx', '', d)}"
 
-# Due to the SRC_URI zynqmp specific change, this needs to be SOC_FAMILY_ARCH specific
-SOC_FAMILY_ARCH ??= "${TUNE_PKGARCH}"
-ZYNQMP_PKGARCH = "${SOC_FAMILY_ARCH}"
-# But if egl is enabled, we also need to be SOC_VARIANT_ARCH specific due to libmali
-ZYNQMP_PKGARCH:mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${SOC_FAMILY_ARCH}', d)}"
+# Store the default value
+DEFAULT_PKGARCH:mali400 := "${PACKAGE_ARCH}"
+# Set to machine_arch or default_pkgarch
+PACKAGE_ARCH:mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${MACHINE_ARCH}', '${DEFAULT_PKGARCH}', d)}"
 
 # Skip dmabuf-feedback, as it requires gbm >= 21.1.1, mali-xlnx only provides 17.3
 SIMPLECLIENTS:mali400 ?= "damage,im,egl,shm,touch,dmabuf-v4l,dmabuf-egl"
-
-PACKAGE_ARCH:zynqmp = "${ZYNQMP_PKGARCH}"
diff --git a/meta-xilinx-core/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend b/meta-xilinx-core/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend
index ca910830..d430b63e 100644
--- a/meta-xilinx-core/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend
+++ b/meta-xilinx-core/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend
@@ -1,4 +1,4 @@
 # OpenGL comes from libmali on ev/eg, when egl is enabled
 DEPENDS:append:mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', ' libmali-xlnx', '', d)}"
 
-PACKAGE_ARCH:mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${TUNE_PKGARCH}', d)}"
+PACKAGE_ARCH:mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${MACHINE_ARCH}', '${TUNE_PKGARCH}', d)}"