summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@amd.com>2025-02-03 15:23:49 -0700
committerMark Hatle <mark.hatle@amd.com>2025-03-30 14:16:15 -0600
commit9a771efc71c505e7d325ea1a47468c80946f5fa3 (patch)
tree6d1646e86dd563f58b123719e91c5366b2ac1b4b
parentd32ca21930dc7add91065288e3d16348716a38e5 (diff)
downloadmeta-xilinx-9a771efc71c505e7d325ea1a47468c80946f5fa3.tar.gz
meta-xilinx-core: qemu: Fix preferred provider processing
When we've disabled a recipe due to preferred provider status, we do NOT want to cache the result. If the result is cached, and the user adjusts the value it may not be recognized requiring the user to delete the cache directory as a workaround. Signed-off-by: Mark Hatle <mark.hatle@amd.com>
-rw-r--r--meta-xilinx-core/recipes-devtools/qemu/qemu-alt.inc4
-rw-r--r--meta-xilinx-core/recipes-devtools/qemu/qemu-native-alt.inc2
-rw-r--r--meta-xilinx-core/recipes-devtools/qemu/qemu-system-native-alt.inc2
3 files changed, 4 insertions, 4 deletions
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-alt.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-alt.inc
index c18a5326..b8a44470 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-alt.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-alt.inc
@@ -7,11 +7,11 @@ python () {
7 if bb.data.inherits_class('nativesdk', d): 7 if bb.data.inherits_class('nativesdk', d):
8 if (not d.getVar("PREFERRED_PROVIDER_nativesdk-qemu") and "nativesdk-qemu" != d.getVar("PN")) or \ 8 if (not d.getVar("PREFERRED_PROVIDER_nativesdk-qemu") and "nativesdk-qemu" != d.getVar("PN")) or \
9 (d.getVar("PREFERRED_PROVIDER_nativesdk-qemu") and d.getVar("PREFERRED_PROVIDER_nativesdk-qemu") != d.getVar("PN")): 9 (d.getVar("PREFERRED_PROVIDER_nativesdk-qemu") and d.getVar("PREFERRED_PROVIDER_nativesdk-qemu") != d.getVar("PN")):
10 d.delVar("BB_DONT_CACHE") 10 d.setVar('BB_DONT_CACHE', '1')
11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_nativesdk-qemu to %s to enable it" % (d.getVar("PN"))) 11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_nativesdk-qemu to %s to enable it" % (d.getVar("PN")))
12 elif (not d.getVar("PREFERRED_PROVIDER_qemu") and "qemu" != d.getVar("PN")) or \ 12 elif (not d.getVar("PREFERRED_PROVIDER_qemu") and "qemu" != d.getVar("PN")) or \
13 (d.getVar("PREFERRED_PROVIDER_qemu") and d.getVar("PREFERRED_PROVIDER_qemu") != d.getVar("PN")): 13 (d.getVar("PREFERRED_PROVIDER_qemu") and d.getVar("PREFERRED_PROVIDER_qemu") != d.getVar("PN")):
14 d.delVar("BB_DONT_CACHE") 14 d.setVar('BB_DONT_CACHE', '1')
15 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_qemu to %s to enable it" % (d.getVar("PN"))) 15 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_qemu to %s to enable it" % (d.getVar("PN")))
16 16
17 if (d.getVar('BPN') != 'qemu'): 17 if (d.getVar('BPN') != 'qemu'):
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-native-alt.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-native-alt.inc
index 60c79542..7acd6add 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-native-alt.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-native-alt.inc
@@ -6,7 +6,7 @@ PROVIDES += "qemu-native"
6python () { 6python () {
7 if (not d.getVar("PREFERRED_PROVIDER_qemu-native") and "qemu-native" != d.getVar("PN")) or \ 7 if (not d.getVar("PREFERRED_PROVIDER_qemu-native") and "qemu-native" != d.getVar("PN")) or \
8 (d.getVar("PREFERRED_PROVIDER_qemu-native") and d.getVar("PREFERRED_PROVIDER_qemu-native") != d.getVar("PN")): 8 (d.getVar("PREFERRED_PROVIDER_qemu-native") and d.getVar("PREFERRED_PROVIDER_qemu-native") != d.getVar("PN")):
9 d.delVar("BB_DONT_CACHE") 9 d.setVar('BB_DONT_CACHE', '1')
10 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_qemu-native to %s to enable it" % (d.getVar("PN"))) 10 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_qemu-native to %s to enable it" % (d.getVar("PN")))
11} 11}
12 12
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-system-native-alt.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-system-native-alt.inc
index 42592c58..de1f60ac 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-system-native-alt.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-system-native-alt.inc
@@ -6,7 +6,7 @@ PROVIDES += "qemu-system-native"
6python () { 6python () {
7 if (not d.getVar("PREFERRED_PROVIDER_qemu-system-native") and "qemu-system-native" != d.getVar("PN")) or \ 7 if (not d.getVar("PREFERRED_PROVIDER_qemu-system-native") and "qemu-system-native" != d.getVar("PN")) or \
8 (d.getVar("PREFERRED_PROVIDER_qemu-system-native") and d.getVar("PREFERRED_PROVIDER_qemu-system-native") != d.getVar("PN")): 8 (d.getVar("PREFERRED_PROVIDER_qemu-system-native") and d.getVar("PREFERRED_PROVIDER_qemu-system-native") != d.getVar("PN")):
9 d.delVar("BB_DONT_CACHE") 9 d.setVar('BB_DONT_CACHE', '1')
10 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_qemu-system-native to %s to enable it" % (d.getVar("PN"))) 10 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_qemu-system-native to %s to enable it" % (d.getVar("PN")))
11} 11}
12 12