From 2f2242522277c57fdb02a35b1d41771d41170b05 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 16 Sep 2020 14:09:30 -0400 Subject: [PATCH] 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 --- recipes-extended/images/xen-image-minimal.bb | 8 ++++---- 1 file 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 () { # Enable runqemu. eg: runqemu xen-image-minimal nographic slirp WKS_FILE_x86-64 = "directdisk-xen.wks" -QB_MEM = "-m 400" -QB_DEFAULT_KERNEL = "" -QB_DEFAULT_FSTYPE = "wic" -QB_FSINFO = "wic:kernel-in-fs" +QB_MEM ?= "-m 400" +QB_DEFAULT_KERNEL ?= "none" +QB_DEFAULT_FSTYPE ?= "wic" +QB_FSINFO ?= "wic:kernel-in-fs" # qemux86-64 machine does not include 'wic' in IMAGE_FSTYPES, which is needed # to boot this image, so add it here: IMAGE_FSTYPES_qemux86-64 += "wic"