Skip to contentSkip to conversation

xen-image-minimal: reduce the x86 wic build dependencies

PATCH In review Christopher Clark 2 participants 2 messages Jul 18, 2022 – Jul 20, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xen-image-minimal: reduce the x86 wic build dependencies

The Xen image recipe provides a default WKS_FILE for x86 builds to enable booting the image either in qemu or directly on hardware. Add settings for WKS_FILE_DEFAULT_DEPENDS that specify the wic image build dependencies, which are lower than the defaults used without it.

This change reduces the amount of build resources required for CI of this image and images that are derived from it.

Since WKS_FILE is specified separately for x86-64 and qemux86-64 overrides, do the same for WKS_FILE_DEFAULT_DEPENDS, even though the dependencies for the two separate WKS_FILEs are currently the same.

---
 recipes-extended/images/xen-image-minimal.bb | 2 ++
 1 file changed, 2 insertions(+)
recipes-extended/images/xen-image-minimal.bb +2 -0
index a8e72d1..ec0f2f5 100644
@@ -79,7 +79,9 @@ build_syslinux_cfg () {
 
 # Enable runqemu. eg: runqemu xen-image-minimal nographic slirp
 WKS_FILE:x86-64 = "directdisk-xen.wks"
+WKS_FILE_DEPENDS_DEFAULT:x86-64 = "syslinux-native"
 WKS_FILE:qemux86-64 = "qemuboot-xen-x86-64.wks"
+WKS_FILE_DEPENDS_DEFAULT:qemux86-64 = "syslinux-native"
 QB_MEM ?= "-m 400"
 QB_DEFAULT_KERNEL ?= "none"
 QB_DEFAULT_FSTYPE ?= "wic"
Signature · 1 line
2.25.1
#1 lore raw

merged.

Bruce

In message: [meta-virtualization][PATCH] xen-image-minimal: reduce the x86 wic build dependencies

Quoted 34 lines · on 18/07/2022 Christopher Clark wrote:

The Xen image recipe provides a default WKS_FILE for x86 builds to enable booting the image either in qemu or directly on hardware. Add settings for WKS_FILE_DEFAULT_DEPENDS that specify the wic image build dependencies, which are lower than the defaults used without it.

This change reduces the amount of build resources required for CI of this image and images that are derived from it.

Since WKS_FILE is specified separately for x86-64 and qemux86-64 overrides, do the same for WKS_FILE_DEFAULT_DEPENDS, even though the dependencies for the two separate WKS_FILEs are currently the same.

---
 recipes-extended/images/xen-image-minimal.bb | 2 ++
 1 file changed, 2 insertions(+)
recipes-extended/images/xen-image-minimal.bb +2 -0
index a8e72d1..ec0f2f5 100644
@@ -79,7 +79,9 @@ build_syslinux_cfg () {
 
 # Enable runqemu. eg: runqemu xen-image-minimal nographic slirp
 WKS_FILE:x86-64 = "directdisk-xen.wks"
+WKS_FILE_DEPENDS_DEFAULT:x86-64 = "syslinux-native"
 WKS_FILE:qemux86-64 = "qemuboot-xen-x86-64.wks"
+WKS_FILE_DEPENDS_DEFAULT:qemux86-64 = "syslinux-native"
 QB_MEM ?= "-m 400"
 QB_DEFAULT_KERNEL ?= "none"
 QB_DEFAULT_FSTYPE ?= "wic"
Signature · 1 line
2.25.1