xen-image-minimal: fix aarch64 build for non-qemuboot-enabled machines
PATCH 1/1 xen-image-minimal: fix aarch64 build for non-qemuboot-enabled machines
The qemuboot device tree generation task in qemuboot-xen-dtb.bbclass requires the QB_SYSTEM_NAME variable to be set to identify the Qemu binary to use. Skip the task if it is not set.
--- classes/qemuboot-xen-dtb.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
classes/qemuboot-xen-dtb.bbclass +1 -1
@@ -176,7 +176,7 @@ do_write_xen_qemuboot_dtb() { # Not all architectures qemuboot with a device tree binary, so check # to see if one is needed. This allows this bbclass file to be used # in the same image recipe for multiple architectures. - if [ -n "${QB_DTB}" ] ; then + if [ -n "${QB_DTB}" ] && [ -n "${QB_SYSTEM_NAME}" ] ; then generate_xen_qemuboot_dtb fi }
Signature · 1 line
2.25.1
Looks good to me.
I'll wait to hear from Jon that it fixes his problem before merging.
Cheers,
Bruce
In message: [meta-virtualization][PATCH] xen-image-minimal: fix aarch64 build for non-qemuboot-enabled machines
Quoted 26 lines · on 01/08/2021 Christopher Clark wrote:
The qemuboot device tree generation task in qemuboot-xen-dtb.bbclass requires the
QB_SYSTEM_NAMEvariable to be set to identify the Qemu binary to use. Skip the task if it is not set.Reported-by Jon Mason <[email protected]>Signed-off-by Christopher Clark <[email protected]>--- classes/qemuboot-xen-dtb.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)classes/qemuboot-xen-dtb.bbclass +1
-1@@ -176,7 +176,7 @@ do_write_xen_qemuboot_dtb() { # Not all architectures qemuboot with a device tree binary, so check # to see if one is needed. This allows this bbclass file to be used # in the same image recipe for multiple architectures. - if [ -n "${QB_DTB}" ] ; then + if [ -n "${QB_DTB}" ] && [ -n "${QB_SYSTEM_NAME}" ] ; then generate_xen_qemuboot_dtb fi }Signature · 1 line
2.25.1
Quoted 4 lines · Bruce Ashfield
Looks good to me.
I'll wait to hear from Jon that it fixes his problem before merging.
Fix confirmed. Feel free to add
:)
Quoted 33 lines
Cheers,
Bruce
In message: [meta-virtualization][PATCH] xen-image-minimal: fix aarch64 build for non-qemuboot-enabled machines
Quoted 26 lines · on 01/08/2021 Christopher Clark wrote:
The qemuboot device tree generation task in qemuboot-xen-dtb.bbclass requires the
QB_SYSTEM_NAMEvariable to be set to identify the Qemu binary to use. Skip the task if it is not set.Reported-by Jon Mason <[email protected]>Signed-off-by Christopher Clark <[email protected]>--- classes/qemuboot-xen-dtb.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)classes/qemuboot-xen-dtb.bbclass +1
-2@@ -176,7 +176,7 @@ do_write_xen_qemuboot_dtb() { # Not all architectures qemuboot with a device tree binary, so check # to see if one is needed. This allows this bbclass file to be used # in the same image recipe for multiple architectures. - if [ -n "${QB_DTB}" ] ; then + if [ -n "${QB_DTB}" ] && [ -n "${QB_SYSTEM_NAME}" ] ; then generate_xen_qemuboot_dtb fi } --2.25.1
merged.
Bruce
In message: [meta-virtualization][PATCH] xen-image-minimal: fix aarch64 build for non-qemuboot-enabled machines
Quoted 26 lines · on 01/08/2021 Christopher Clark wrote:
The qemuboot device tree generation task in qemuboot-xen-dtb.bbclass requires the
QB_SYSTEM_NAMEvariable to be set to identify the Qemu binary to use. Skip the task if it is not set.Reported-by Jon Mason <[email protected]>Signed-off-by Christopher Clark <[email protected]>--- classes/qemuboot-xen-dtb.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)classes/qemuboot-xen-dtb.bbclass +1
-1@@ -176,7 +176,7 @@ do_write_xen_qemuboot_dtb() { # Not all architectures qemuboot with a device tree binary, so check # to see if one is needed. This allows this bbclass file to be used # in the same image recipe for multiple architectures. - if [ -n "${QB_DTB}" ] ; then + if [ -n "${QB_DTB}" ] && [ -n "${QB_SYSTEM_NAME}" ] ; then generate_xen_qemuboot_dtb fi }Signature · 1 line
2.25.1