more override syntax fixes and cleanups
cover more override syntax fixes and cleanups
A few patches to fix things missed in the previous series, and a few fix-ups needed to get meta-arm master branch CI back in the green.
Jon Mason (7):
gem5: Fix xen override syntax bug
CI: fix check-layers
CI: use meta-virtualization master-next branch
juno: temporarily pin 5.4 kernel version
corstone500: clean-up kernel entries
CI: rename meta-python to meta-openembedded
CI: move xen specific changes out of gem5-arm64-xen.yml
.gitlab-ci.yml | 22 +++++++++------
ci/check-layers.py | 1 +
ci/gem5-arm64-xen.yml | 28 -------------------
ci/gem5-arm64.yml | 6 +---
ci/meta-arm-autonomy.yml | 14 ++--------
ci/{meta-python.yml => meta-openembedded.yml} | 2 ++
ci/meta-virtualization.yml | 9 ++++++
ci/meta-zephyr.yml | 2 +-
ci/musca-s1.yml | 2 +-
ci/qemuarm64.yml | 6 ++++
ci/xen.yml | 11 ++++++++
meta-arm-bsp/conf/machine/corstone500.conf | 5 +---
.../linux/linux-arm-platforms.inc | 7 +++++
.../boot-wrapper-aarch64_%.bbappend | 2 +-
14 files changed, 58 insertions(+), 59 deletions(-)
delete mode 100644 ci/gem5-arm64-xen.yml
rename ci/{meta-python.yml => meta-openembedded.yml} (76%)
create mode 100644 ci/meta-virtualization.yml
create mode 100644 ci/qemuarm64.yml
create mode 100644 ci/xen.ymlSignature · 1 line
2.20.1
PATCH 1/7 gem5: Fix xen override syntax bug
--- .../boot-wrapper-aaarch64/boot-wrapper-aarch64_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-gem5/dynamic-layers/meta-virtualization/recipes-bsp/boot-wrapper-aaarch64/boot-wrapper-aarch64_%.bbappend +1 -1
@@ -16,7 +16,7 @@ BOOT_WRAPPER_AARCH64_XEN_CMDLINE:gem5-arm64 = "noreboot dom0_mem=256M console=dt BOOT_WRAPPER_AARCH64_CMDLINE_xen:gem5-arm64 = "console=hvc0 root=/dev/vda rw" # Image generated by boot wrapper when Xen is present -BOOT_WRAPPER_AARCH64_IMAGE_xen ?= "xen-system.axf" +BOOT_WRAPPER_AARCH64_IMAGE:xen ?= "xen-system.axf" EXTRA_OECONF:append:xen = " \ --with-xen=${WORKDIR}/kernel/arch/arm64/boot/Image \
Signature · 1 line
2.20.1
PATCH 2/7 CI: fix check-layers
In reply to Jon Mason--- ci/check-layers.py | 1 + 1 file changed, 1 insertion(+)
ci/check-layers.py +1 -0
@@ -28,6 +28,7 @@ if __name__ == "__main__": cli.extend([args.metaarm / layer for layer in layers]) cli.append("--dependency") cli.extend([args.others / layer for layer in dependencies]) + cli.append("--no-auto-dependency") passed = 0 process = subprocess.Popen(cli, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True)
Signature · 1 line
2.20.1
PATCH 3/7 CI: use meta-virtualization master-next branch
In reply to Jon MasonUse master-next for meta-virt while waiting for the syntax change patches to make it into master
--- ci/gem5-arm64-xen.yml | 2 ++ 1 file changed, 2 insertions(+)
ci/gem5-arm64-xen.yml +2 -0
@@ -17,6 +17,8 @@ repos: meta-networking: meta-virtualization: url: git://git.yoctoproject.org/meta-virtualization + #FIXME - remove after master branch has overrides syntax conversion patch + refspec: master-next machine: gem5-arm64
Signature · 1 line
2.20.1
PATCH 4/7 juno: temporarily pin 5.4 kernel version
In reply to Jon MasonRecent changes in the 5.4 kernel are preventing the juno patches from applying. Temporarily pin the kernel to the version prior to this until the patches can be rebased.
--- meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc | 4 ++++ 1 file changed, 4 insertions(+)
meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +4 -0
@@ -48,6 +48,10 @@ COMPATIBLE_MACHINE:juno = "juno" KMACHINE:juno = "juno" KBUILD_DEFCONFIG:juno = "defconfig" KCONFIG_MODE:juno = "--alldefconfig" +#FIXME - temporarily pin kernel version to allow for juno patches to apply +KBRANCH:juno = "v5.4/standard/base" +KERNEL_VERSION_SANITY_SKIP:juno = "1" +SRCREV_machine:juno = "dd8a64a523fb714a98328441e0de72cde115a6fc" FILESEXTRAPATHS:prepend:juno := "${ARMBSPFILESPATHS}" SRC_URI:append:juno = " \ file://0001-mailbox-add-support-for-doorbell-signal-mode-control.patch \
Signature · 1 line
2.20.1
PATCH 5/7 corstone500: clean-up kernel entries
In reply to Jon MasonCorrect an override syntax issue with the kernel and move the relevant kernel entries from the machine config to the kernel include file to match the other machines in meta-arm-bsp
--- meta-arm-bsp/conf/machine/corstone500.conf | 5 +---- meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc | 3 +++ 2 files changed, 4 insertions(+), 4 deletions(-)
meta-arm-bsp/conf/machine/corstone500.conf +1 -4
@@ -4,7 +4,6 @@ require conf/machine/include/tune-cortexa5.inc -# # Corstone-500 is built against poky-tiny distro. # poky-tiny sets PREFERRED_PROVIDER_virtual/kernel to linux-yocto-tiny. # Since distro config is evaluated after the machine config, we need to
@@ -12,10 +11,8 @@ require conf/machine/include/tune-cortexa5.inc # PREFERRED_PROVIDER_virtual/kernel specified in the machine config will # apply. # -PREFERRED_PROVIDER_virtual/kernel_forcevariable = "linux-yocto" +PREFERRED_PROVIDER_virtual/kernel:forcevariable = "linux-yocto" PREFERRED_VERSION_linux-yocto ?= "5.3%" -KBUILD_DEFCONFIG = "multi_v7_defconfig" -KCONFIG_MODE = "--alldefconfig" PREFERRED_VERSION_trusted-firmware-a ?= "2.5%"
meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +3 -0
@@ -24,6 +24,9 @@ SRCREV:arm-platforms-kmeta = "6147e82375aa9df8f2a162d42ea6406c79c854c5" # Corstone-500 KMACHINE # COMPATIBLE_MACHINE:corstone500 = "corstone500" +KMACHINE:corstone500 = "corstone500" +KBUILD_DEFCONFIG:corstone500 = "multi_v7_defconfig" +KCONFIG_MODE:corstone500 = "--alldefconfig" # # FVP BASE KMACHINE
Signature · 1 line
2.20.1
PATCH 6/7 CI: rename meta-python to meta-openembedded
In reply to Jon MasonRename the meta-python.yml file to be meta-openembedded. This allows for more usage of the layers present there (as meta-python is housed under meta-openembedded).
---
.gitlab-ci.yml | 2 +-
ci/gem5-arm64-xen.yml | 8 +-------
ci/gem5-arm64.yml | 6 +-----
ci/meta-arm-autonomy.yml | 10 ++--------
ci/{meta-python.yml => meta-openembedded.yml} | 2 ++
ci/meta-zephyr.yml | 2 +-
ci/musca-s1.yml | 2 +-
7 files changed, 9 insertions(+), 23 deletions(-)
rename ci/{meta-python.yml => meta-openembedded.yml} (76%).gitlab-ci.yml +1 -1
@@ -85,7 +85,7 @@ check-layers: extends: .setup coverage: '/Coverage: \d+/' script: - - kas shell --update --force-checkout ci/base.yml:ci/meta-arm-autonomy.yml:ci/meta-python.yml --command \ + - kas shell --update --force-checkout ci/base.yml:ci/meta-arm-autonomy.yml:ci/meta-openembedded.yml --command \ "$CI_PROJECT_DIR/ci/check-layers.py $CI_PROJECT_DIR/ci/check-layers.yml $CI_PROJECT_DIR $KAS_WORK_DIR" corstone500:
ci/gem5-arm64-xen.yml +1 -7
@@ -3,18 +3,12 @@ header: version: 9 includes: - base.yml - - meta-python.yml + - meta-openembedded.yml repos: meta-arm: layers: meta-gem5: - meta-openembedded: - url: https://git.openembedded.org/meta-openembedded - layers: - meta-oe: - meta-filesystems: - meta-networking: meta-virtualization: url: git://git.yoctoproject.org/meta-virtualization #FIXME - remove after master branch has overrides syntax conversion patch
ci/gem5-arm64.yml +1 -5
@@ -2,17 +2,13 @@ header: version: 9 includes: - base.yml + - meta-openembedded.yml repos: meta-arm: layers: meta-gem5: - meta-openembedded: - url: https://git.openembedded.org/meta-openembedded - layers: - meta-oe: - machine: gem5-arm64 target:
ci/meta-arm-autonomy.yml +2 -8
@@ -1,15 +1,9 @@ header: version: 9 + includes: + - meta-openembedded.yml repos: - meta-openembedded: - url: https://git.openembedded.org/meta-openembedded - layers: - meta-oe: - meta-networking: - meta-python: - meta-filesystem: - meta-virtualization: url: https://git.yoctoproject.org/git/meta-virtualization
ci/meta-openembedded.yml renamed from ci/meta-python.yml +2 -0
@@ -5,5 +5,7 @@ repos: meta-openembedded: url: https://git.openembedded.org/meta-openembedded layers: + meta-filesystems: + meta-networking: meta-oe: meta-python:
ci/meta-zephyr.yml +1 -1
@@ -1,7 +1,7 @@ header: version: 9 includes: - - meta-python.yml + - meta-openembedded.yml repos: meta-zephyr:
ci/musca-s1.yml +1 -1
@@ -2,7 +2,7 @@ header: version: 9 includes: - base.yml - - meta-python.yml + - meta-openembedded.yml machine: musca-s1
Signature · 1 line
2.20.1
PATCH 7/7 CI: move xen specific changes out of gem5-arm64-xen.yml
In reply to Jon MasonMove the xen specific changes out of gem5-arm64-xen.yml. This allows for other xen machines in the CI. Adding Xen machines for qemuarm and qemuarm64 allows for more testing, which should be expanded when the Xen Test Framework in meta-virtualization is expanded to work on arm machines.
--- .gitlab-ci.yml | 20 +++++++++++++------- ci/gem5-arm64-xen.yml | 24 ------------------------ ci/meta-arm-autonomy.yml | 4 +--- ci/meta-virtualization.yml | 9 +++++++++ ci/qemuarm64.yml | 6 ++++++ ci/xen.yml | 11 +++++++++++ 6 files changed, 40 insertions(+), 34 deletions(-) delete mode 100644 ci/gem5-arm64-xen.yml create mode 100644 ci/meta-virtualization.yml create mode 100644 ci/qemuarm64.yml create mode 100644 ci/xen.yml
.gitlab-ci.yml +13 -7
@@ -112,7 +112,7 @@ fvp-baser-aemv8r64: gem5-arm64: extends: .build -gem5-arm64-xen: +gem5-arm64/xen: extends: .build gem5-atp-arm64:
@@ -145,12 +145,6 @@ n1sdp/armgcc: qemu-cortex-a53: extends: .build -qemuarm/testimage: - extends: .build - -qemuarm/clang/testimage: - extends: .build - qemuarm64-sbsa: extends: .build
@@ -166,6 +160,18 @@ qemuarm64-secureboot/clang/musl/testimage: qemuarm64-secureboot/musl/testimage: extends: .build +qemuarm64/xen: + extends: .build + +qemuarm/clang/testimage: + extends: .build + +qemuarm/testimage: + extends: .build + +qemuarm/xen: + extends: .build + qemuarmv5/testimage: extends: .build
ci/gem5-arm64-xen.yml deleted +0 -24
@@ -1,24 +0,0 @@ - -header: - version: 9 - includes: - - base.yml - - meta-openembedded.yml - -repos: - meta-arm: - layers: - meta-gem5: - meta-virtualization: - url: git://git.yoctoproject.org/meta-virtualization - #FIXME - remove after master branch has overrides syntax conversion patch - refspec: master-next - -machine: gem5-arm64 - -local_conf_header: - meta-virt: - DISTRO_FEATURES:append = " virtualization xen" - -target: - - xen-image-minimal
ci/meta-arm-autonomy.yml +1 -3
@@ -2,11 +2,9 @@ header: version: 9 includes: - meta-openembedded.yml + - meta-virtualization.yml repos: - meta-virtualization: - url: https://git.yoctoproject.org/git/meta-virtualization - meta-arm: layers: meta-arm-autonomy:
ci/meta-virtualization.yml new file +9 -0
@@ -0,0 +1,9 @@ +header: + version: 9 + includes: + - meta-openembedded.yml + +repos: + meta-virtualization: + url: git://git.yoctoproject.org/meta-virtualization + refspec: master-next
ci/qemuarm64.yml new file +6 -0
@@ -0,0 +1,6 @@ +header: + version: 9 + includes: + - base.yml + +machine: qemuarm64
ci/xen.yml new file +11 -0
@@ -0,0 +1,11 @@ +header: + version: 9 + includes: + - meta-virtualization.yml + +local_conf_header: + meta-virt: + DISTRO_FEATURES:append = " virtualization xen" + +target: + - xen-image-minimal
Signature · 1 line
2.20.1