summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-09-16 14:09:30 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2020-09-16 14:16:48 -0400
commit2f2242522277c57fdb02a35b1d41771d41170b05 (patch)
tree08872b64a6e0676657a30b30f13d3e0641ed2bd9
parent2711b81afd489d5b458617dfdfda520d8fe61f65 (diff)
downloadmeta-virtualization-2f2242522277c57fdb02a35b1d41771d41170b05.tar.gz
xen: make QB_ assignments weak
runqemu is looking for the QB_DEFAULT_KERNEL to be set to "none" to trigger special processing. The current set of QB_DEFAULT_KERNEL="" won't trigger that behaviour .. so we change the default. We also make the assignments weak, to allow easier overrides in specific implementations. We also need a patch to qemuboot.bbclass to make the defaults ??=, and when that is done, our ?= here will work properly. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-extended/images/xen-image-minimal.bb8
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-extended/images/xen-image-minimal.bb b/recipes-extended/images/xen-image-minimal.bb
index c965f221..1b45397b 100644
--- a/recipes-extended/images/xen-image-minimal.bb
+++ b/recipes-extended/images/xen-image-minimal.bb
@@ -74,10 +74,10 @@ build_syslinux_cfg () {
74 74
75# Enable runqemu. eg: runqemu xen-image-minimal nographic slirp 75# Enable runqemu. eg: runqemu xen-image-minimal nographic slirp
76WKS_FILE_x86-64 = "directdisk-xen.wks" 76WKS_FILE_x86-64 = "directdisk-xen.wks"
77QB_MEM = "-m 400" 77QB_MEM ?= "-m 400"
78QB_DEFAULT_KERNEL = "" 78QB_DEFAULT_KERNEL ?= "none"
79QB_DEFAULT_FSTYPE = "wic" 79QB_DEFAULT_FSTYPE ?= "wic"
80QB_FSINFO = "wic:kernel-in-fs" 80QB_FSINFO ?= "wic:kernel-in-fs"
81# qemux86-64 machine does not include 'wic' in IMAGE_FSTYPES, which is needed 81# qemux86-64 machine does not include 'wic' in IMAGE_FSTYPES, which is needed
82# to boot this image, so add it here: 82# to boot this image, so add it here:
83IMAGE_FSTYPES_qemux86-64 += "wic" 83IMAGE_FSTYPES_qemux86-64 += "wic"