From 78386b07ac9c53a35ee14156076376381b98ec4c Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Sun, 20 Aug 2023 09:37:34 -0600 Subject: qemu-xilinx-system-native: Rework pmu-rom dependency The previous implementation did not follow the recommended usage of bb.utils.contains. Additionally we need to exclude the LICENSE_FLAGS_ACCEPTED variable, otherwise unrelated items will affect our recipe hash. This can cause problems with an eSDK where a user may enable or disable unrelated commercial or other licensed software. Signed-off-by: Mark Hatle --- .../recipes-devtools/qemu/qemu-xilinx-system-native_%.bbappend | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_%.bbappend b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_%.bbappend index 91b223b9..7c152d60 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_%.bbappend +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_%.bbappend @@ -1,2 +1,5 @@ -# Automatically enable pmu-rom-native for ZynqMP support, or warn the user -DEPENDS .= "${@' pmu-rom-native' if 'xilinx' in (d.getVar('LICENSE_FLAGS_ACCEPTED') or '').split() else ''}" +# Automatically enable pmu-rom-native for ZynqMP support +PMU_ROM_DEP[vardepsexclude] = "LICENSE_FLAGS_ACCEPTED" +PMU_ROM_DEP = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "xilinx", " pmu-rom-native", "", d)}" + +DEPENDS .= "${PMU_ROM_DEP}" -- cgit v1.2.3-54-g00ecf