From 1b6e39e426ead27ad440e62c8ce692684c8b9ad3 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 29 Jul 2021 11:49:16 -0400 Subject: global: overrides conversion pass 2 Signed-off-by: Bruce Ashfield --- classes/qemuboot-xen-defaults.bbclass | 10 +++++----- conf/distro/include/meta-virt-xen.inc | 2 +- recipes-extended/images/xen-image-minimal.bb | 4 ++-- recipes-kernel/dtc/python3-dtc_1.6.1.bb | 2 +- recipes-kernel/lopper/lopper.bb | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/classes/qemuboot-xen-defaults.bbclass b/classes/qemuboot-xen-defaults.bbclass index 67751d3a..c7e74c3e 100644 --- a/classes/qemuboot-xen-defaults.bbclass +++ b/classes/qemuboot-xen-defaults.bbclass @@ -12,13 +12,13 @@ QB_XEN_DOMAIN_MODULES ??= "${DOM0_KERNEL}:${DOM0_KERNEL_LOAD_ADDR}:multiboot,ker # Qemuboot for 64-bit Arm uses the QB_DEFAULT_KERNEL method to load Xen # and the device loader option for the dom0 kernel: -QB_OPT_APPEND_append_aarch64 = " \ +QB_OPT_APPEND:append:aarch64 = " \ -device loader,file=${DOM0_KERNEL},addr=${DOM0_KERNEL_LOAD_ADDR} \ " -QB_DEFAULT_KERNEL_aarch64 = "xen-${MACHINE}" +QB_DEFAULT_KERNEL:aarch64 = "xen-${MACHINE}" # 64-bit Arm: gic version 3 -QB_MACHINE_aarch64 = "-machine virt,gic-version=3 -machine virtualization=true" +QB_MACHINE:aarch64 = "-machine virt,gic-version=3 -machine virtualization=true" # Increase the default qemu memory allocation to allow for the hypervisor. # Use a weak assignment to allow for change of default and override elsewhere. @@ -26,5 +26,5 @@ QB_MEM_VALUE ??= "512" QB_MEM = "-m ${QB_MEM_VALUE}" # 64-bit Arm: qemuboot with a device tree binary -QB_DTB_aarch64 = "${IMAGE_NAME}.qemuboot.dtb" -QB_DTB_LINK_aarch64 = "${IMAGE_LINK_NAME}.qemuboot.dtb" +QB_DTB:aarch64 = "${IMAGE_NAME}.qemuboot.dtb" +QB_DTB_LINK:aarch64 = "${IMAGE_LINK_NAME}.qemuboot.dtb" diff --git a/conf/distro/include/meta-virt-xen.inc b/conf/distro/include/meta-virt-xen.inc index dca9b040..5fbb57f8 100644 --- a/conf/distro/include/meta-virt-xen.inc +++ b/conf/distro/include/meta-virt-xen.inc @@ -12,4 +12,4 @@ include ${@bb.utils.contains('MACHINE', 'raspberrypi4-64', \ '${XEN_RPI4_64_CONFIG_PATH}', '', d)} # Set serial for working qemuboot console -SERIAL_CONSOLES_qemuarm64 ?= "115200;ttyAMA0" +SERIAL_CONSOLES:qemuarm64 ?= "115200;ttyAMA0" diff --git a/recipes-extended/images/xen-image-minimal.bb b/recipes-extended/images/xen-image-minimal.bb index 2a44e3c4..b4ddda2f 100644 --- a/recipes-extended/images/xen-image-minimal.bb +++ b/recipes-extended/images/xen-image-minimal.bb @@ -73,11 +73,11 @@ build_syslinux_cfg () { } # Enable runqemu. eg: runqemu xen-image-minimal nographic slirp -WKS_FILE_x86-64 = "directdisk-xen.wks" +WKS_FILE:x86-64 = "directdisk-xen.wks" QB_MEM ?= "-m 400" QB_DEFAULT_KERNEL ?= "none" QB_DEFAULT_FSTYPE ?= "wic" -QB_DEFAULT_FSTYPE_qemux86-64 = "wic" +QB_DEFAULT_FSTYPE:qemux86-64 = "wic" QB_FSINFO ?= "wic:kernel-in-fs" QB_SERIAL_OPT = "-serial mon:stdio" # qemux86-64 machine does not include 'wic' in IMAGE_FSTYPES, which is needed diff --git a/recipes-kernel/dtc/python3-dtc_1.6.1.bb b/recipes-kernel/dtc/python3-dtc_1.6.1.bb index 90889314..39295652 100644 --- a/recipes-kernel/dtc/python3-dtc_1.6.1.bb +++ b/recipes-kernel/dtc/python3-dtc_1.6.1.bb @@ -20,7 +20,7 @@ inherit distutils3 DISTUTILS_SETUP_PATH = "${S}/pylibfdt" -do_configure_prepend() { +do_configure:prepend() { oe_runmake -C "${S}" version_gen.h mv "${S}/version_gen.h" "${DISTUTILS_SETUP_PATH}/" } diff --git a/recipes-kernel/lopper/lopper.bb b/recipes-kernel/lopper/lopper.bb index 274d5b9a..ae280ee7 100644 --- a/recipes-kernel/lopper/lopper.bb +++ b/recipes-kernel/lopper/lopper.bb @@ -9,7 +9,7 @@ S = "${WORKDIR}/git" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=8e5f5f691f01c9fdfa7a7f2d535be619" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ python3-core \ python3-dtc \ python3-humanfriendly \ -- cgit v1.2.3-54-g00ecf