Switch kernel downloads, make bookworm default, refine CI targets
cover Switch kernel downloads, make bookworm default, refine CI targets
See patches for details.
Jan
Jan Kiszka (5):
linux-cip: Switch to new download space
linux-cip: Move KERNEL_DEFCONFIG_VERSION into linux-cip-common.inc
linux-cip: Update to 5.10.194-cip39[-rt16] and 6.1.54-cip6 Make bookworm the default Debian version
ci: Reduce number of build tests, focus on bookworm
.gitlab-ci.yml | 76 ++++++-------------
Kconfig | 2 +-
kas-cip.yml | 2 +-
recipes-kernel/linux/linux-cip-common.inc | 5 +-
.../linux-cip-rt_4.19.288-cip101-rt32.bb | 4 +-
.../linux/linux-cip-rt_4.4.302-cip78-rt45.bb | 4 +-
...bb => linux-cip-rt_5.10.194-cip39-rt16.bb} | 4 +-
.../linux/linux-cip-rt_6.1.46-cip4-rt2.bb | 4 +-
.../linux/linux-cip_4.19.292-cip102.bb | 4 +-
.../linux/linux-cip_4.4.302-cip79.bb | 4 +-
...1-cip38.bb => linux-cip_5.10.194-cip39.bb} | 4 +-
....1.52-cip5.bb => linux-cip_6.1.54-cip6.bb} | 4 +-
12 files changed, 37 insertions(+), 80 deletions(-)
rename recipes-kernel/linux/{linux-cip-rt_5.10.186-cip37-rt15.bb => linux-cip-rt_5.10.194-cip39-rt16.bb} (59%)
rename recipes-kernel/linux/{linux-cip_5.10.191-cip38.bb => linux-cip_5.10.194-cip39.bb} (59%)
rename recipes-kernel/linux/{linux-cip_6.1.52-cip5.bb => linux-cip_6.1.54-cip6.bb} (50%)Signature · 1 line
2.35.3
PATCH 1/5 linux-cip: Switch to new download space
From: Jan Kiszka <[email protected]>
This should resolve our and downstream's fetching issues, specifically in CI environments.
--- recipes-kernel/linux/linux-cip-common.inc | 4 +++- recipes-kernel/linux/linux-cip-rt_4.19.288-cip101-rt32.bb | 2 +- recipes-kernel/linux/linux-cip-rt_4.4.302-cip78-rt45.bb | 2 +- recipes-kernel/linux/linux-cip-rt_5.10.186-cip37-rt15.bb | 2 +- recipes-kernel/linux/linux-cip-rt_6.1.46-cip4-rt2.bb | 2 +- recipes-kernel/linux/linux-cip_4.19.292-cip102.bb | 2 +- recipes-kernel/linux/linux-cip_4.4.302-cip79.bb | 2 +- recipes-kernel/linux/linux-cip_5.10.191-cip38.bb | 2 +- recipes-kernel/linux/linux-cip_6.1.52-cip5.bb | 2 +- 9 files changed, 11 insertions(+), 9 deletions(-)
recipes-kernel/linux/linux-cip-common.inc +3 -1
@@ -11,13 +11,15 @@ FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" +KERNEL_MAJOR_MINOR = "${@d.getVar('PV').split('.')[0] + '.' + d.getVar('PV').split('.')[1]}" + KERNEL_DEFCONFIG ?= "${MACHINE}_defconfig" require recipes-kernel/linux/linux-custom.inc require recipes-kernel/linux/cip-kernel-config.inc SRC_URI += " \ - https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot/linux-cip-${PV}.tar.gz \ + https://cdn.kernel.org/pub/linux/kernel/projects/cip/${KERNEL_MAJOR_MINOR}/linux-cip-${PV}.tar.xz \ " S = "${WORKDIR}/linux-cip-${PV}"
recipes-kernel/linux/linux-cip-rt_4.19.288-cip101-rt32.bb +1 -1
@@ -13,4 +13,4 @@ require linux-cip-rt-common.inc KERNEL_DEFCONFIG_VERSION ?= "4.19.y-cip" -SRC_URI[sha256sum] = "e147634e8d2730f6b0ea0e192f50bc3e30205d0076c6f83adbef9e5eccafaf3a" +SRC_URI[sha256sum] = "faf282166d669a1d4a044963199804b9cf7272041bf723d62a5162303e443219"
recipes-kernel/linux/linux-cip-rt_4.4.302-cip78-rt45.bb +1 -1
@@ -13,4 +13,4 @@ require linux-cip-rt-common.inc KERNEL_DEFCONFIG_VERSION ?= "4.4.y-cip" -SRC_URI[sha256sum] = "7b3efe2a56531eabd4ed0b9682d4713c3933341a357f47eb03bf2ec75f89db1a" +SRC_URI[sha256sum] = "ef3e1dd8ea1445d3b1321ff158f41a50f5319f81539d17110eab4a1cc2f79fde"
recipes-kernel/linux/linux-cip-rt_5.10.186-cip37-rt15.bb +1 -1
@@ -13,4 +13,4 @@ require linux-cip-rt-common.inc KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" -SRC_URI[sha256sum] = "754f2dba8d1fa098299007d2b8384e349be0ca7533bda497c98df110d8b95728" +SRC_URI[sha256sum] = "076f4b1019a37fe03aa53ad47e2f530316d2190608200c5c09557b84651797e5"
recipes-kernel/linux/linux-cip-rt_6.1.46-cip4-rt2.bb +1 -1
@@ -9,4 +9,4 @@ require linux-cip-common.inc KERNEL_DEFCONFIG_VERSION ?= "6.1.y-cip" -SRC_URI[sha256sum] = "f59d2c191269709d1873a445189281adb5c2f26ccdcaa459ea495d2ef7ac7b28" +SRC_URI[sha256sum] = "29f926c8755a503baa3e34bb967437e230075c9d9798c22415248983e9f53666"
recipes-kernel/linux/linux-cip_4.19.292-cip102.bb +1 -1
@@ -13,4 +13,4 @@ require linux-cip-common.inc KERNEL_DEFCONFIG_VERSION ?= "4.19.y-cip" -SRC_URI[sha256sum] = "106b3bcf4b3cc8b4ed25995a843839875e5fbbaf3b533df9d666199314628e31" +SRC_URI[sha256sum] = "15e962738fcf4e98189f887c4d80037b04dcaaa227a0aaa6c7447b7367f6dac2"
recipes-kernel/linux/linux-cip_4.4.302-cip79.bb +1 -1
@@ -13,4 +13,4 @@ require linux-cip-common.inc KERNEL_DEFCONFIG_VERSION ?= "4.4.y-cip" -SRC_URI[sha256sum] = "626c3f29ed71fdef637d69938d885a54c6516d41f44a17f1a4e2dd405fd543c0" +SRC_URI[sha256sum] = "cc84633377b3e46e48b25fba7061fdea319a44b541d466221707a014c0136e41"
recipes-kernel/linux/linux-cip_5.10.191-cip38.bb +1 -1
@@ -13,4 +13,4 @@ require linux-cip-common.inc KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" -SRC_URI[sha256sum] = "cee2c13b4e7280e6eb92746d14ec2b5e0e76c3842808de4348765e33b9e6dd39" +SRC_URI[sha256sum] = "285dee8d7076fa4ac236167c0be10122f7eac5052e2ec20379fdf5be6452ec79"
recipes-kernel/linux/linux-cip_6.1.52-cip5.bb +1 -1
@@ -9,4 +9,4 @@ require linux-cip-common.inc KERNEL_DEFCONFIG_VERSION ?= "6.1.y-cip" -SRC_URI[sha256sum] = "6d06628abc5eb30301d3bf0abfbfd90f7ceb01d24170e39d02adc8b730332d76" +SRC_URI[sha256sum] = "b2271049dface2d9220d185f58d567f593fcd94cd7819ab0e6a3c131c02d97c7"
Signature · 1 line
2.35.3
PATCH 2/5 linux-cip: Move KERNEL_DEFCONFIG_VERSION into linux-cip-common.inc
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
--- recipes-kernel/linux/linux-cip-common.inc | 1 + recipes-kernel/linux/linux-cip-rt_4.19.288-cip101-rt32.bb | 2 -- recipes-kernel/linux/linux-cip-rt_4.4.302-cip78-rt45.bb | 2 -- recipes-kernel/linux/linux-cip-rt_5.10.186-cip37-rt15.bb | 2 -- recipes-kernel/linux/linux-cip-rt_6.1.46-cip4-rt2.bb | 2 -- recipes-kernel/linux/linux-cip_4.19.292-cip102.bb | 2 -- recipes-kernel/linux/linux-cip_4.4.302-cip79.bb | 2 -- recipes-kernel/linux/linux-cip_5.10.191-cip38.bb | 2 -- recipes-kernel/linux/linux-cip_6.1.52-cip5.bb | 2 -- 9 files changed, 1 insertion(+), 16 deletions(-)
recipes-kernel/linux/linux-cip-common.inc +1 -0
@@ -13,6 +13,7 @@ FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" KERNEL_MAJOR_MINOR = "${@d.getVar('PV').split('.')[0] + '.' + d.getVar('PV').split('.')[1]}" +KERNEL_DEFCONFIG_VERSION ?= "${KERNEL_MAJOR_MINOR}.y-cip" KERNEL_DEFCONFIG ?= "${MACHINE}_defconfig" require recipes-kernel/linux/linux-custom.inc
recipes-kernel/linux/linux-cip-rt_4.19.288-cip101-rt32.bb +0 -2
@@ -11,6 +11,4 @@ require linux-cip-rt-common.inc -KERNEL_DEFCONFIG_VERSION ?= "4.19.y-cip" - SRC_URI[sha256sum] = "faf282166d669a1d4a044963199804b9cf7272041bf723d62a5162303e443219"
recipes-kernel/linux/linux-cip-rt_4.4.302-cip78-rt45.bb +0 -2
@@ -11,6 +11,4 @@ require linux-cip-rt-common.inc -KERNEL_DEFCONFIG_VERSION ?= "4.4.y-cip" - SRC_URI[sha256sum] = "ef3e1dd8ea1445d3b1321ff158f41a50f5319f81539d17110eab4a1cc2f79fde"
recipes-kernel/linux/linux-cip-rt_5.10.186-cip37-rt15.bb +0 -2
@@ -11,6 +11,4 @@ require linux-cip-rt-common.inc -KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" - SRC_URI[sha256sum] = "076f4b1019a37fe03aa53ad47e2f530316d2190608200c5c09557b84651797e5"
recipes-kernel/linux/linux-cip-rt_6.1.46-cip4-rt2.bb +0 -2
@@ -7,6 +7,4 @@ require linux-cip-common.inc -KERNEL_DEFCONFIG_VERSION ?= "6.1.y-cip" - SRC_URI[sha256sum] = "29f926c8755a503baa3e34bb967437e230075c9d9798c22415248983e9f53666"
recipes-kernel/linux/linux-cip_4.19.292-cip102.bb +0 -2
@@ -11,6 +11,4 @@ require linux-cip-common.inc -KERNEL_DEFCONFIG_VERSION ?= "4.19.y-cip" - SRC_URI[sha256sum] = "15e962738fcf4e98189f887c4d80037b04dcaaa227a0aaa6c7447b7367f6dac2"
recipes-kernel/linux/linux-cip_4.4.302-cip79.bb +0 -2
@@ -11,6 +11,4 @@ require linux-cip-common.inc -KERNEL_DEFCONFIG_VERSION ?= "4.4.y-cip" - SRC_URI[sha256sum] = "cc84633377b3e46e48b25fba7061fdea319a44b541d466221707a014c0136e41"
recipes-kernel/linux/linux-cip_5.10.191-cip38.bb +0 -2
@@ -11,6 +11,4 @@ require linux-cip-common.inc -KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" - SRC_URI[sha256sum] = "285dee8d7076fa4ac236167c0be10122f7eac5052e2ec20379fdf5be6452ec79"
recipes-kernel/linux/linux-cip_6.1.52-cip5.bb +0 -2
@@ -7,6 +7,4 @@ require linux-cip-common.inc -KERNEL_DEFCONFIG_VERSION ?= "6.1.y-cip" - SRC_URI[sha256sum] = "b2271049dface2d9220d185f58d567f593fcd94cd7819ab0e6a3c131c02d97c7"
Signature · 1 line
2.35.3
PATCH 3/5 linux-cip: Update to 5.10.194-cip39[-rt16] and 6.1.54-cip6
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
---
...10.186-cip37-rt15.bb => linux-cip-rt_5.10.194-cip39-rt16.bb} | 2 +-
...{linux-cip_5.10.191-cip38.bb => linux-cip_5.10.194-cip39.bb} | 2 +-
.../{linux-cip_6.1.52-cip5.bb => linux-cip_6.1.54-cip6.bb} | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
rename recipes-kernel/linux/{linux-cip-rt_5.10.186-cip37-rt15.bb => linux-cip-rt_5.10.194-cip39-rt16.bb} (68%)
rename recipes-kernel/linux/{linux-cip_5.10.191-cip38.bb => linux-cip_5.10.194-cip39.bb} (68%)
rename recipes-kernel/linux/{linux-cip_6.1.52-cip5.bb => linux-cip_6.1.54-cip6.bb} (59%)recipes-kernel/linux/linux-cip-rt_5.10.194-cip39-rt16.bb renamed from recipes-kernel/linux/linux-cip-rt_5.10.186-cip37-rt15.bb +1 -1
@@ -11,4 +11,4 @@ require linux-cip-rt-common.inc -SRC_URI[sha256sum] = "076f4b1019a37fe03aa53ad47e2f530316d2190608200c5c09557b84651797e5" +SRC_URI[sha256sum] = "54f319ecb09f98d2df408b97dbed015c90cf8871ef83430b10eae8e40fb93070"
recipes-kernel/linux/linux-cip_5.10.194-cip39.bb renamed from recipes-kernel/linux/linux-cip_5.10.191-cip38.bb +1 -1
@@ -11,4 +11,4 @@ require linux-cip-common.inc -SRC_URI[sha256sum] = "285dee8d7076fa4ac236167c0be10122f7eac5052e2ec20379fdf5be6452ec79" +SRC_URI[sha256sum] = "39fa92032d1c5abfd6cc2a04d3dd4a5ab52df7b92a18bb63a3f4424e3c2d9c8b"
recipes-kernel/linux/linux-cip_6.1.54-cip6.bb renamed from recipes-kernel/linux/linux-cip_6.1.52-cip5.bb +1 -1
@@ -7,4 +7,4 @@ require linux-cip-common.inc -SRC_URI[sha256sum] = "b2271049dface2d9220d185f58d567f593fcd94cd7819ab0e6a3c131c02d97c7" +SRC_URI[sha256sum] = "83b2172ee00e0b1621c83567955c232488213d36486d77a8f90766f053b6f5de"
Signature · 1 line
2.35.3
PATCH 4/5 Make bookworm the default Debian version
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
It's time to move on, but not deprecating support for bullseye or buster this way.
--- Kconfig | 2 +- kas-cip.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Kconfig +1 -1
@@ -122,7 +122,7 @@ comment "Debian distribution options" choice prompt "Debian Release" - default DEBIAN_BULLSEYE + default DEBIAN_BOOKWORM config DEBIAN_BUSTER bool "buster (10)"
kas-cip.yml +1 -1
@@ -12,7 +12,7 @@ header: version: 14 -distro: cip-core-bullseye +distro: cip-core-bookworm target: cip-core-image build_system: isar
Signature · 1 line
2.35.3
PATCH 5/5 ci: Reduce number of build tests, focus on bookworm
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Flip the default to bookworm and only have one target for arm/arm64/amd64 for the old bullseye and buster releases. Helps to focus on the main development area and shortens our pipeline.
--- .gitlab-ci.yml | 76 +++++++++++++++----------------------------------- 1 file changed, 23 insertions(+), 53 deletions(-)
.gitlab-ci.yml +23 -53
@@ -16,7 +16,7 @@ image: ghcr.io/siemens/kas/kas-isar:4.0 variables: GIT_STRATEGY: clone - release: bullseye + release: bookworm extension: none use_rt: enable encrypt: disable
@@ -270,22 +270,36 @@ build:qemu-arm-secure-boot: wic_targz: disable deploy: disable -# buster images -build:simatic-ipc227e-buster: +# bullseye images +build:iwg20m-bullseye: extends: - .build_base variables: - target: simatic-ipc227e - release: buster + target: iwg20m + dtb: r8a7743-iwg20d-q7-dbcm-ca.dtb + release: bullseye -build:bbb-buster: +build:hihope-rzg2m-bullseye: extends: - .build_base variables: - target: bbb - dtb: am335x-boneblack.dtb - release: buster + target: hihope-rzg2m + dtb: r8a774a1-hihope-rzg2m-ex.dtb + release: bullseye +build:qemu-amd64-secure-boot-bullseye: + extends: + - .build_base + variables: + base_yaml: "kas-cip.yml:kas/board/${target}.yml" + release: bullseye + target: qemu-amd64 + extension: ebg-secure-boot-snakeoil + use_rt: disable + wic_targz: disable + deploy: disable + +# buster images build:iwg20m-buster: extends: - .build_base
@@ -328,47 +342,3 @@ build:qemu-riscv64: allow_failure: true include: '.reproducible-check-ci.yml' - -# bookworm images -build:simatic-ipc227e-bookworm: - extends: - - .build_base - variables: - target: simatic-ipc227e - release: bookworm - -build:bbb-bookworm: - extends: - - .build_base - variables: - target: bbb - dtb: am335x-boneblack.dtb - release: bookworm - -build:iwg20m-bookworm: - extends: - - .build_base - variables: - target: iwg20m - dtb: r8a7743-iwg20d-q7-dbcm-ca.dtb - release: bookworm - -build:hihope-rzg2m-bookworm: - extends: - - .build_base - variables: - target: hihope-rzg2m - dtb: r8a774a1-hihope-rzg2m-ex.dtb - release: bookworm - -build:qemu-amd64-secure-boot-bookworm: - extends: - - .build_base - variables: - base_yaml: "kas-cip.yml:kas/board/${target}.yml" - release: bookworm - target: qemu-amd64 - extension: ebg-secure-boot-snakeoil - use_rt: disable - wic_targz: disable - deploy: disable
Signature · 1 line
2.35.3