arm-bsp: fix missing stable kernels
PATCH 1/5 arm-bsp: fix missing stable kernels
From: Jon Mason <[email protected]>
Corstone, a5ds, and sgi575 were using the meta-kernel, but recent updates removed support for their non-LTS kernel. Change to using the respective kernels present in linux-yocto until it can be upgraded to the latest version.
---
meta-arm-bsp/conf/layer.conf | 2 +-
meta-arm-bsp/conf/machine/a5ds.conf | 5 +++--
.../conf/machine/include/corstone700.inc | 4 ++--
meta-arm-bsp/conf/machine/sgi575.conf | 5 +++--
.../recipes-kernel/linux/linux-stable_%.bbappend | 3 ---
.../linux/linux-stable_5.7%.bbappend | 3 ---
...ove-definition-of-traceid_list-global-v.patch | 0
...-bp_account-Make-global-variable-static.patch | 0
...are-some-global-variables-to-fix-build-.patch | 0
...traceevent-Fix-build-with-binutils-2.35.patch | 0
...e-perf-able-to-build-with-latest-libbfd.patch | 0
...traceevent-Fix-build-with-binutils-2.35.patch | 0
...ove-definition-of-traceid_list-global-v.patch | 0
.../coresight-traceid.patch | 0
...rstone700.inc => linux-yocto-corstone700.inc} | 8 --------
...e_5.3%.bbappend => linux-yocto_5.3%.bbappend} | 2 +-
.../recipes-kernel/linux/linux-yocto_5.3.bb | 15 +++++++++++++++
...e_5.6%.bbappend => linux-yocto_5.6%.bbappend} | 4 ++--
.../recipes-kernel/linux/linux-yocto_5.6.bb | 15 +++++++++++++++
.../linux/linux-yocto_5.7%.bbappend | 3 +++
.../recipes-kernel/linux/linux-yocto_5.7.bb | 16 ++++++++++++++++
21 files changed, 61 insertions(+), 24 deletions(-)
delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend
delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-stable_5.7%.bbappend
rename meta-arm-bsp/recipes-kernel/linux/{linux-stable-5.3 => linux-yocto-5.3}/0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch (100%)
rename meta-arm-bsp/recipes-kernel/linux/{linux-stable-5.3 => linux-yocto-5.3}/0002-perf-tests-bp_account-Make-global-variable-static.patch (100%)
rename meta-arm-bsp/recipes-kernel/linux/{linux-stable-5.3 => linux-yocto-5.3}/0003-perf-bench-Share-some-global-variables-to-fix-build-.patch (100%)
rename meta-arm-bsp/recipes-kernel/linux/{linux-stable-5.3 => linux-yocto-5.3}/0004-libtraceevent-Fix-build-with-binutils-2.35.patch (100%)
rename meta-arm-bsp/recipes-kernel/linux/{linux-stable-5.3 => linux-yocto-5.3}/0005-perf-Make-perf-able-to-build-with-latest-libbfd.patch (100%)
rename meta-arm-bsp/recipes-kernel/linux/{linux-stable-5.6 => linux-yocto-5.6}/0001-libtraceevent-Fix-build-with-binutils-2.35.patch (100%)
rename meta-arm-bsp/recipes-kernel/linux/{linux-stable-5.6 => linux-yocto-5.6}/0002-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch (100%)
rename meta-arm-bsp/recipes-kernel/linux/{linux-stable-5.7 => linux-yocto-5.7}/coresight-traceid.patch (100%)
rename meta-arm-bsp/recipes-kernel/linux/{linux-stable-corstone700.inc => linux-yocto-corstone700.inc} (93%)
rename meta-arm-bsp/recipes-kernel/linux/{linux-stable_5.3%.bbappend => linux-yocto_5.3%.bbappend} (88%)
create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3.bb
rename meta-arm-bsp/recipes-kernel/linux/{linux-stable_5.6%.bbappend => linux-yocto_5.6%.bbappend} (67%)
create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6.bb
create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.7%.bbappend
create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.7.bbmeta-arm-bsp/conf/layer.conf +1 -1
@@ -11,7 +11,7 @@ BBFILE_PRIORITY_meta-arm-bsp = "6" LAYERSERIES_COMPAT_meta-arm-bsp = "gatesgarth" -LAYERDEPENDS_meta-arm-bsp = "core meta-arm meta-kernel" +LAYERDEPENDS_meta-arm-bsp = "core meta-arm" # This won't be used by layerindex-fetch, but works everywhere else LAYERDEPENDS_meta-arm-bsp_append_musca-b1 = " meta-python" LAYERDEPENDS_meta-arm-bsp_append_musca-s1 = " meta-python"
meta-arm-bsp/conf/machine/a5ds.conf +3 -2
@@ -6,9 +6,10 @@ require conf/machine/include/tune-cortexa5.inc -PREFERRED_PROVIDER_virtual/kernel ?= "linux-stable" -PREFERRED_VERSION_linux-stable ?= "5.3%" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" +PREFERRED_VERSION_linux-yocto ?= "5.3%" KBUILD_DEFCONFIG = "multi_v7_defconfig" +KCONFIG_MODE = "--alldefconfig" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
meta-arm-bsp/conf/machine/include/corstone700.inc +2 -2
@@ -8,8 +8,8 @@ TFA_PLATFORM = "corstone700" SERIAL_CONSOLES ?= "115200;ttyAMA0" -PREFERRED_PROVIDER_virtual/kernel_corstone700 = "linux-stable" -PREFERRED_VERSION_linux-stable ?= "5.6%" +PREFERRED_PROVIDER_virtual/kernel_corstone700 = "linux-yocto" +PREFERRED_VERSION_linux-yocto ?= "5.6%" PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a" PREFERRED_VERSION_trusted-firmware-a ?= "2.3%"
meta-arm-bsp/conf/machine/sgi575.conf +3 -2
@@ -16,8 +16,9 @@ EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a" # Use kernel provided by linaro KERNEL_IMAGETYPE ?= "Image" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-stable" -PREFERRED_VERSION_linux-stable ?= "5.7%" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" +PREFERRED_VERSION_linux-yocto ?= "5.7%" +KCONFIG_MODE = "--alldefconfig" SERIAL_CONSOLES = "115200;ttyAMA0" #grub-efi
meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend deleted +0 -3
@@ -1,3 +0,0 @@ -# Add support for Arm Platforms (boards or simulators) - -require linux-arm-platforms.inc
meta-arm-bsp/recipes-kernel/linux/linux-stable_5.7%.bbappend deleted +0 -3
@@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-stable-5.7:" - -SRC_URI_append = " file://coresight-traceid.patch"
meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.3/0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-stable-5.3/0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch +0 -0
meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.3/0002-perf-tests-bp_account-Make-global-variable-static.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-stable-5.3/0002-perf-tests-bp_account-Make-global-variable-static.patch +0 -0
meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.3/0003-perf-bench-Share-some-global-variables-to-fix-build-.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-stable-5.3/0003-perf-bench-Share-some-global-variables-to-fix-build-.patch +0 -0
meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.3/0004-libtraceevent-Fix-build-with-binutils-2.35.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-stable-5.3/0004-libtraceevent-Fix-build-with-binutils-2.35.patch +0 -0
meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.3/0005-perf-Make-perf-able-to-build-with-latest-libbfd.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-stable-5.3/0005-perf-Make-perf-able-to-build-with-latest-libbfd.patch +0 -0
meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.6/0001-libtraceevent-Fix-build-with-binutils-2.35.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-stable-5.6/0001-libtraceevent-Fix-build-with-binutils-2.35.patch +0 -0
meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.6/0002-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-stable-5.6/0002-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch +0 -0
meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.7/coresight-traceid.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-stable-5.7/coresight-traceid.patch +0 -0
meta-arm-bsp/recipes-kernel/linux/linux-yocto-corstone700.inc renamed from meta-arm-bsp/recipes-kernel/linux/linux-stable-corstone700.inc +0 -8
@@ -1,13 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files/corstone700:" -# including linux-yocto.inc to use configuration fragments -require recipes-kernel/linux/linux-yocto.inc - -LINUX_VMAJOR = "5" -LINUX_VMINOR = "6" -LINUX_VPATCH = "14" -LINUX_SRCREV = "e3ac9117b18596b7363d5b7904ab03a7d782b40c" - COMPATIBLE_MACHINE = "${MACHINE}" KMACHINE = "corstone700"
meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3%.bbappend renamed from meta-arm-bsp/recipes-kernel/linux/linux-stable_5.3%.bbappend +1 -1
@@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-stable-5.3:" +FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto-5.3:" SRC_URI_append = " file://0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch \ file://0002-perf-tests-bp_account-Make-global-variable-static.patch \
meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3.bb new file +15 -0
@@ -0,0 +1,15 @@ +KBRANCH = "v5.3/base" + +require recipes-kernel/linux/linux-yocto.inc + +SRCREV_machine = "d4f3318ed8fab6316cb7a269b8f42306632a3876" +SRCREV_meta = "8d0ed83a864cc91eef4d2abbc90f13d4ecd1c213" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" + +LINUX_VERSION = "5.3.18" +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" + +PV = "${LINUX_VERSION}+git${SRCPV}" +KMETA = "kernel-meta"
meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6%.bbappend renamed from meta-arm-bsp/recipes-kernel/linux/linux-stable_5.6%.bbappend +2 -2
@@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-stable-5.6:" +FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto-5.6:" SRC_URI_append = " file://0001-libtraceevent-Fix-build-with-binutils-2.35.patch \ file://0002-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch"
@@ -7,6 +7,6 @@ SRC_URI_append = " file://0001-libtraceevent-Fix-build-with-binutils-2.35.patch # Corstone700 KMACHINE # MACHINE_KERNEL_REQUIRE ?= "" -MACHINE_KERNEL_REQUIRE_corstone700 = "linux-stable-corstone700.inc" +MACHINE_KERNEL_REQUIRE_corstone700 = "linux-yocto-corstone700.inc" require ${MACHINE_KERNEL_REQUIRE}
meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6.bb new file +15 -0
@@ -0,0 +1,15 @@ +KBRANCH = "v5.6/base" + +require recipes-kernel/linux/linux-yocto.inc + +SRCREV_machine = "e3ac9117b18596b7363d5b7904ab03a7d782b40c" +SRCREV_meta = "b152cd93ea7046a835c869a76085aefdb6ce7421" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.6;destsuffix=${KMETA}" + +LINUX_VERSION = "5.6.14" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +PV = "${LINUX_VERSION}+git${SRCPV}" +KMETA = "kernel-meta"
meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.7%.bbappend new file +3 -0
@@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto-5.7:" + +SRC_URI_append = " file://coresight-traceid.patch"
meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.7.bb new file +16 -0
@@ -0,0 +1,16 @@ +KBRANCH = "v5.7/base" + +require recipes-kernel/linux/linux-yocto.inc + +SRCREV_machine = "6b9830fecd4a87d7ebb4d93484fef00f46d0fa0f" +SRCREV_meta = "b9e6fd082dc5bfb51699809d7119d4b20d280c0b" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.7;destsuffix=${KMETA}" + +LINUX_VERSION = "5.7.19" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +PV = "${LINUX_VERSION}+git${SRCPV}" +KMETA = "kernel-meta" +
Signature · 1 line
2.25.1
PATCH 2/5 gitlab-ci: force git updates
From: Ross Burton <[email protected]>
Explicitly force kas to update in case the repositories are reused.
--- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
.gitlab-ci.yml +1 -1
@@ -26,7 +26,7 @@ stages: extends: .setup script: - KASFILES=$(kas/jobs-to-kas $CI_JOB_NAME) - - kas shell --update $KASFILES -c 'cat conf/*.conf' + - kas shell --update --force-checkout $KASFILES -c 'cat conf/*.conf' - kas build $KASFILES
Signature · 1 line
2.25.1
PATCH 3/5 kas: remove redundant env settings
In reply to Ross BurtonFrom: Ross Burton <[email protected]>
These are left over from an experiment and are no longer needed.
--- kas/base.yml | 4 ---- 1 file changed, 4 deletions(-)
kas/base.yml +0 -4
@@ -23,10 +23,6 @@ repos: meta-kernel: url: https://gitlab.com/openembedded/community/meta-kernel.git -env: - BB_LOGCONFIG: "" - PYTHONPATH: "" - local_conf_header: base: | CONF_VERSION = "1"
Signature · 1 line
2.25.1
PATCH 4/5 ci: make bootstrap just another kas overlay
In reply to Ross BurtonSimplify the gitlab-ci by having the bootstrap build as just another Kas overlay file, so there's no duplication of build script.
--- .gitlab-ci.yml | 6 +----- kas/bootstrap.yml | 9 +++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 kas/bootstrap.yml
.gitlab-ci.yml +1 -5
@@ -36,13 +36,9 @@ stages: # Build a number of native tools first to ensure the other builders don't race # over them -bootstrap: +n1sdp/bootstrap: extends: .build stage: bootstrap - variables: - KAS_TARGET: binutils-cross-aarch64 gcc-cross-aarch64 python3-native opkg-native rpm-native - script: - - kas build kas/n1sdp.yml # What percentage of machines in the layer do we build machine-coverage:
kas/bootstrap.yml new file +9 -0
@@ -0,0 +1,9 @@ +header: + version: 9 + +target: + - binutils-cross-aarch64 + - gcc-cross-aarch64 + - python3-native + - opkg-native + - rpm-native
Signature · 1 line
2.25.1
PATCH 5/5 ci: fail any build that emits warnings
In reply to Ross BurtonUsing a custom logging.yml we can instruct BitBake's logger to write all warnings and errors into a separate log file.
Then after the build has finished we can see if the log file is empty and if not show it and abort the build.
--- .gitlab-ci.yml | 2 ++ kas/base.yml | 3 +++ kas/check-warnings | 18 ++++++++++++++++++ kas/logging.yml | 13 +++++++++++++ 4 files changed, 36 insertions(+) create mode 100755 kas/check-warnings create mode 100644 kas/logging.yml
.gitlab-ci.yml +2 -0
@@ -15,6 +15,7 @@ stages: KAS_WORK_DIR: $CI_PROJECT_DIR/work SSTATE_DIR: $CI_BUILDS_DIR/persist/sstate DL_DIR: $CI_BUILDS_DIR/persist/downloads + BB_LOGCONFIG: $CI_PROJECT_DIR/kas/logging.yml before_script: - echo KAS_WORK_DIR = $KAS_WORK_DIR - echo SSTATE_DIR = $SSTATE_DIR
@@ -28,6 +29,7 @@ stages: - KASFILES=$(kas/jobs-to-kas $CI_JOB_NAME) - kas shell --update --force-checkout $KASFILES -c 'cat conf/*.conf' - kas build $KASFILES + - ./kas/check-warnings $KAS_WORK_DIR/build/warnings.log #
kas/base.yml +3 -0
@@ -23,6 +23,9 @@ repos: meta-kernel: url: https://gitlab.com/openembedded/community/meta-kernel.git +env: + BB_LOGCONFIG: "" + local_conf_header: base: | CONF_VERSION = "1"
kas/check-warnings new file +18 -0
@@ -0,0 +1,18 @@ +#! /bin/bash + +# Expects the path to a log file as $1, and if this file has any content +# then display the contents and exit with an error code. + +set -e -u + +LOGFILE=$1 + +if test -s $LOGFILE; then + echo ============================== + echo The build had warnings/errors: + echo ============================== + cat $LOGFILE + exit 1 +fi + +exit 0
kas/logging.yml new file +13 -0
@@ -0,0 +1,13 @@ +# Python logging configuration to write all warnings to a separate file +version: 1 + +handlers: + warnings: + class: logging.FileHandler + level: WARNING + filename: warnings.log + formatter: BitBake.logfileFormatter + +loggers: + BitBake: + handlers: [warnings]
Signature · 1 line
2.25.1