MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

global: overrides conversion pass 2

Browse Source 
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2021-07-29 11:49:16 -04:00
parent d876cfc5bf
commit 1b6e39e426
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
classes/qemuboot-xen-defaults.bbclass
View File

@ -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 # Qemuboot for 64-bit Arm uses the QB_DEFAULT_KERNEL method to load Xen
# and the device loader option for the dom0 kernel: # 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} \ -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 # 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. # Increase the default qemu memory allocation to allow for the hypervisor.
# Use a weak assignment to allow for change of default and override elsewhere. # 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}" QB_MEM = "-m ${QB_MEM_VALUE}"
# 64-bit Arm: qemuboot with a device tree binary # 64-bit Arm: qemuboot with a device tree binary
QB_DTB_aarch64 = "${IMAGE_NAME}.qemuboot.dtb" QB_DTB:aarch64 = "${IMAGE_NAME}.qemuboot.dtb"
QB_DTB_LINK_aarch64 = "${IMAGE_LINK_NAME}.qemuboot.dtb" QB_DTB_LINK:aarch64 = "${IMAGE_LINK_NAME}.qemuboot.dtb"

2
conf/distro/include/meta-virt-xen.inc
View File

@ -12,4 +12,4 @@ include ${@bb.utils.contains('MACHINE', 'raspberrypi4-64', \
'${XEN_RPI4_64_CONFIG_PATH}', '', d)} '${XEN_RPI4_64_CONFIG_PATH}', '', d)}
# Set serial for working qemuboot console # Set serial for working qemuboot console
SERIAL_CONSOLES_qemuarm64 ?= "115200;ttyAMA0" SERIAL_CONSOLES:qemuarm64 ?= "115200;ttyAMA0"

4
recipes-extended/images/xen-image-minimal.bb
View File

@ -73,11 +73,11 @@ build_syslinux_cfg () {
} }
# Enable runqemu. eg: runqemu xen-image-minimal nographic slirp # 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_MEM ?= "-m 400"
QB_DEFAULT_KERNEL ?= "none" QB_DEFAULT_KERNEL ?= "none"
QB_DEFAULT_FSTYPE ?= "wic" QB_DEFAULT_FSTYPE ?= "wic"
QB_DEFAULT_FSTYPE_qemux86-64 = "wic" QB_DEFAULT_FSTYPE:qemux86-64 = "wic"
QB_FSINFO ?= "wic:kernel-in-fs" QB_FSINFO ?= "wic:kernel-in-fs"
QB_SERIAL_OPT = "-serial mon:stdio" QB_SERIAL_OPT = "-serial mon:stdio"
# qemux86-64 machine does not include 'wic' in IMAGE_FSTYPES, which is needed # qemux86-64 machine does not include 'wic' in IMAGE_FSTYPES, which is needed

2
recipes-kernel/dtc/python3-dtc_1.6.1.bb
View File

@ -20,7 +20,7 @@ inherit distutils3
DISTUTILS_SETUP_PATH = "${S}/pylibfdt" DISTUTILS_SETUP_PATH = "${S}/pylibfdt"
do_configure_prepend() { do_configure:prepend() {
oe_runmake -C "${S}" version_gen.h oe_runmake -C "${S}" version_gen.h
mv "${S}/version_gen.h" "${DISTUTILS_SETUP_PATH}/" mv "${S}/version_gen.h" "${DISTUTILS_SETUP_PATH}/"
} }

2
recipes-kernel/lopper/lopper.bb
View File

@ -9,7 +9,7 @@ S = "${WORKDIR}/git"
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=8e5f5f691f01c9fdfa7a7f2d535be619" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=8e5f5f691f01c9fdfa7a7f2d535be619"
RDEPENDS_${PN} = " \ RDEPENDS:${PN} = " \
python3-core \ python3-core \
python3-dtc \ python3-dtc \
python3-humanfriendly \ python3-humanfriendly \