[PATCH][gatesgarth 1/5] arm-bsp: fix missing stable kernels

[PATCH][gatesgarth 1/5] arm-bsp: fix missing stable kernels

[Ross Burton]

From: Jon Mason <jon.mason@arm.com>

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.

Change-Id: I63f2e511fe69051c06e6559950b798c1371cc8e9
Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 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.bb

diff --git a/meta-arm-bsp/conf/layer.conf b/meta-arm-bsp/conf/layer.conf
index 1260440..8374012 100644
--- a/meta-arm-bsp/conf/layer.conf
+++ b/meta-arm-bsp/conf/layer.conf
@@ -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"
diff --git a/meta-arm-bsp/conf/machine/a5ds.conf b/meta-arm-bsp/conf/machine/a5ds.conf
index f7d35e7..3c0dc13 100644
--- a/meta-arm-bsp/conf/machine/a5ds.conf
+++ b/meta-arm-bsp/conf/machine/a5ds.conf
@@ -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"
 
diff --git a/meta-arm-bsp/conf/machine/include/corstone700.inc b/meta-arm-bsp/conf/machine/include/corstone700.inc
index 91f290f..4aab85e 100644
--- a/meta-arm-bsp/conf/machine/include/corstone700.inc
+++ b/meta-arm-bsp/conf/machine/include/corstone700.inc
@@ -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%"
diff --git a/meta-arm-bsp/conf/machine/sgi575.conf b/meta-arm-bsp/conf/machine/sgi575.conf
index 1b6498c..e6d447d 100644
--- a/meta-arm-bsp/conf/machine/sgi575.conf
+++ b/meta-arm-bsp/conf/machine/sgi575.conf
@@ -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
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend b/meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend
deleted file mode 100644
index db850ea..0000000
--- a/meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-# Add support for Arm Platforms (boards or simulators)
-
-require linux-arm-platforms.inc
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-stable_5.7%.bbappend b/meta-arm-bsp/recipes-kernel/linux/linux-stable_5.7%.bbappend
deleted file mode 100644
index 797c22d..0000000
--- a/meta-arm-bsp/recipes-kernel/linux/linux-stable_5.7%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-stable-5.7:"
-
-SRC_URI_append = " file://coresight-traceid.patch"
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-stable-5.3/0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.3/0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch
similarity index 100%
rename from meta-arm-bsp/recipes-kernel/linux/linux-stable-5.3/0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.3/0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-stable-5.3/0002-perf-tests-bp_account-Make-global-variable-static.patch b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.3/0002-perf-tests-bp_account-Make-global-variable-static.patch
similarity index 100%
rename from meta-arm-bsp/recipes-kernel/linux/linux-stable-5.3/0002-perf-tests-bp_account-Make-global-variable-static.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.3/0002-perf-tests-bp_account-Make-global-variable-static.patch
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-stable-5.3/0003-perf-bench-Share-some-global-variables-to-fix-build-.patch b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.3/0003-perf-bench-Share-some-global-variables-to-fix-build-.patch
similarity index 100%
rename from meta-arm-bsp/recipes-kernel/linux/linux-stable-5.3/0003-perf-bench-Share-some-global-variables-to-fix-build-.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.3/0003-perf-bench-Share-some-global-variables-to-fix-build-.patch
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-stable-5.3/0004-libtraceevent-Fix-build-with-binutils-2.35.patch b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.3/0004-libtraceevent-Fix-build-with-binutils-2.35.patch
similarity index 100%
rename from meta-arm-bsp/recipes-kernel/linux/linux-stable-5.3/0004-libtraceevent-Fix-build-with-binutils-2.35.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.3/0004-libtraceevent-Fix-build-with-binutils-2.35.patch
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-stable-5.3/0005-perf-Make-perf-able-to-build-with-latest-libbfd.patch b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.3/0005-perf-Make-perf-able-to-build-with-latest-libbfd.patch
similarity index 100%
rename from meta-arm-bsp/recipes-kernel/linux/linux-stable-5.3/0005-perf-Make-perf-able-to-build-with-latest-libbfd.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.3/0005-perf-Make-perf-able-to-build-with-latest-libbfd.patch
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-stable-5.6/0001-libtraceevent-Fix-build-with-binutils-2.35.patch b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.6/0001-libtraceevent-Fix-build-with-binutils-2.35.patch
similarity index 100%
rename from meta-arm-bsp/recipes-kernel/linux/linux-stable-5.6/0001-libtraceevent-Fix-build-with-binutils-2.35.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.6/0001-libtraceevent-Fix-build-with-binutils-2.35.patch
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-stable-5.6/0002-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.6/0002-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch
similarity index 100%
rename from meta-arm-bsp/recipes-kernel/linux/linux-stable-5.6/0002-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.6/0002-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-stable-5.7/coresight-traceid.patch b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.7/coresight-traceid.patch
similarity index 100%
rename from meta-arm-bsp/recipes-kernel/linux/linux-stable-5.7/coresight-traceid.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.7/coresight-traceid.patch
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-stable-corstone700.inc b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-corstone700.inc
similarity index 93%
rename from meta-arm-bsp/recipes-kernel/linux/linux-stable-corstone700.inc
rename to meta-arm-bsp/recipes-kernel/linux/linux-yocto-corstone700.inc
index 975a93f..58b849d 100644
--- a/meta-arm-bsp/recipes-kernel/linux/linux-stable-corstone700.inc
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-corstone700.inc
@@ -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"
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-stable_5.3%.bbappend b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3%.bbappend
similarity index 88%
rename from meta-arm-bsp/recipes-kernel/linux/linux-stable_5.3%.bbappend
rename to meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3%.bbappend
index cb099d1..f931d7d 100644
--- a/meta-arm-bsp/recipes-kernel/linux/linux-stable_5.3%.bbappend
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3%.bbappend
@@ -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 \
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3.bb b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3.bb
new file mode 100644
index 0000000..9d5e9ce
--- /dev/null
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3.bb
@@ -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"
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-stable_5.6%.bbappend b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6%.bbappend
similarity index 67%
rename from meta-arm-bsp/recipes-kernel/linux/linux-stable_5.6%.bbappend
rename to meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6%.bbappend
index 47c51e3..c4c55ad 100644
--- a/meta-arm-bsp/recipes-kernel/linux/linux-stable_5.6%.bbappend
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6%.bbappend
@@ -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}
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6.bb b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6.bb
new file mode 100644
index 0000000..d17cb30
--- /dev/null
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6.bb
@@ -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"
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.7%.bbappend b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.7%.bbappend
new file mode 100644
index 0000000..432fd0c
--- /dev/null
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.7%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto-5.7:"
+
+SRC_URI_append = " file://coresight-traceid.patch"
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.7.bb b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.7.bb
new file mode 100644
index 0000000..12eaa59
--- /dev/null
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.7.bb
@@ -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"
+
-- 
2.25.1

[PATCH][gatesgarth 2/5] gitlab-ci: force git updates

[Ross Burton]

From: Ross Burton <ross@burtonini.com>

Explicitly force kas to update in case the repositories are reused.

Change-Id: Ieedf518c7586bb1a4eff274dc1a33b52a3c49d9f
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index daf8c7a..0460b78 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
 
 
-- 
2.25.1

[PATCH][gatesgarth 3/5] kas: remove redundant env settings

[Ross Burton]

From: Ross Burton <ross@burtonini.com>

These are left over from an experiment and are no longer needed.

Change-Id: I27677b58e4c196371a394f47b185f71917848528
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 kas/base.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/kas/base.yml b/kas/base.yml
index 9d59608..1361361 100644
--- a/kas/base.yml
+++ b/kas/base.yml
@@ -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"
-- 
2.25.1

[PATCH][gatesgarth 4/5] ci: make bootstrap just another kas overlay

[Ross Burton]

Simplify the gitlab-ci by having the bootstrap build as just another Kas
overlay file, so there's no duplication of build script.

Change-Id: I7341750d2ae7f3c146bfe323f61fa98c0f3121c0
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .gitlab-ci.yml    | 6 +-----
 kas/bootstrap.yml | 9 +++++++++
 2 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 kas/bootstrap.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0460b78..7dea1b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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:
diff --git a/kas/bootstrap.yml b/kas/bootstrap.yml
new file mode 100644
index 0000000..0e05e46
--- /dev/null
+++ b/kas/bootstrap.yml
@@ -0,0 +1,9 @@
+header:
+  version: 9
+
+target:
+  - binutils-cross-aarch64
+  - gcc-cross-aarch64
+  - python3-native
+  - opkg-native
+  - rpm-native
-- 
2.25.1

[PATCH][gatesgarth 5/5] ci: fail any build that emits warnings

[Ross Burton]

Using 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.

Change-Id: Ida835b5c822941fb513dfb1758b4ec195e0050fc
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7dea1b7..08373d7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
 
 
 #
diff --git a/kas/base.yml b/kas/base.yml
index 1361361..1d19377 100644
--- a/kas/base.yml
+++ b/kas/base.yml
@@ -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"
diff --git a/kas/check-warnings b/kas/check-warnings
new file mode 100755
index 0000000..cc39642
--- /dev/null
+++ b/kas/check-warnings
@@ -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
diff --git a/kas/logging.yml b/kas/logging.yml
new file mode 100644
index 0000000..3af1029
--- /dev/null
+++ b/kas/logging.yml
@@ -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]
-- 
2.25.1