From f87ac7bcd63e31d92b05a6bfe8e33c2c8ede1697 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 17 May 2021 15:31:41 -0700 Subject: chromium-x11: Fix libmali package on zynqmp eg/ev Issue: CR-1099895 libmali provides replacement items for standard mesa libraries. Mali also sets the soname to libMali.so, even when the requester is looking for a library like libgbm. This introduces an internal, unstated, dependency on the provider of the mesa components. Since this dependency change comes in from mali400, we need to change the PACKAGE_ARCH in these few cases to match. Signed-off-by: Mark Hatle --- meta-xilinx-bsp/conf/layer.conf | 2 ++ .../recipes-browser/chromium/chromium-x11_%.bbappend | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 meta-xilinx-bsp/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend diff --git a/meta-xilinx-bsp/conf/layer.conf b/meta-xilinx-bsp/conf/layer.conf index 12e14cd3..4c3e96c3 100644 --- a/meta-xilinx-bsp/conf/layer.conf +++ b/meta-xilinx-bsp/conf/layer.conf @@ -12,6 +12,8 @@ BBFILE_PRIORITY_xilinx = "5" BBFILES_DYNAMIC += " \ openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes-*/*/*.bb \ openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes-*/*/*.bbappend \ +chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/recipes-*/*/*.bb \ +chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/recipes-*/*/*.bbappend \ " LAYERDEPENDS_xilinx = "core" diff --git a/meta-xilinx-bsp/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend b/meta-xilinx-bsp/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend new file mode 100644 index 00000000..c3f773d6 --- /dev/null +++ b/meta-xilinx-bsp/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend @@ -0,0 +1,2 @@ +# Has a dependency on libmali +PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}" -- cgit v1.2.3-54-g00ecf