Skip to contentSkip to conversation

Add kernel 5.15, update Isar

PATCH New Jan Kiszka 1 participant 4 messages Jan 10, 2022

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

cover Add kernel 5.15, update Isar

Remaining patches to add 5.15 recipes and enable this kernel for xenomai-next builds in CI. Also comes with an Isar update, bringing ccache acceleration for local rebuilds.

Jan

Jan Kiszka (3):
linux-xenomai: Add support for 5.15 kernel
ci: Add kernel 5.15
Update Isar revision, enabling ccache

 Kconfig                                      | 10 +++
 ci/kernel_5_15.yml                           | 82 ++++++++++++++++++++
 ci/xenomai_next.yml                          |  1 +
 conf/distro/include/xenomai-version.inc      | 14 +++-
 conf/machine/beagle-bone-black.conf          |  2 +-
 conf/machine/hikey.conf                      |  2 +-
 conf/machine/qemu-machine.inc                |  2 +-
 conf/machine/x86-64-efi.conf                 |  2 +-
 kas.yml                                      |  4 +-
 opt-ci.yml                                   |  4 +-
 opt-linux-5.15.yml                           | 17 ++++
 opt-linux-latest-5.15.yml                    | 18 +++++
 recipes-kernel/linux/files/armhf_defconfig   |  1 +
 recipes-kernel/linux/linux-xenomai_5.15.bb   | 18 +++++
 recipes-kernel/linux/linux-xenomai_latest.bb |  9 ++-
 15 files changed, 172 insertions(+), 14 deletions(-)
 create mode 100644 ci/kernel_5_15.yml
 create mode 100644 opt-linux-5.15.yml
 create mode 100644 opt-linux-latest-5.15.yml
 create mode 100644 recipes-kernel/linux/linux-xenomai_5.15.bb
Signature · 1 line
2.31.1
author
#1 lore raw

PATCH 1/3 linux-xenomai: Add support for 5.15 kernel

From: Jan Kiszka <[email protected]>

Add a recipe and kas option for current release and extends the latest recipe to track the new branch.

Default kernel becomes 5.15 for xenomai-next, therefore add rules for 3.2 to xenomai-version.inc.

The Kconfig menu is updated accordingly. Limit 5.15 support to Xenomai next because not all related issues were resolved in 3.2.

BeagleBone with 5.15 requires to refresh the defconfig, adding now needed CONFIG_TI_CPSW_SWITCHDEV, otherwise network remains down.

---
 Kconfig                                      | 10 ++++++++++
 conf/distro/include/xenomai-version.inc      | 14 ++++++++++----
 opt-linux-5.15.yml                           | 17 +++++++++++++++++
 opt-linux-latest-5.15.yml                    | 18 ++++++++++++++++++
 recipes-kernel/linux/files/armhf_defconfig   |  1 +
 recipes-kernel/linux/linux-xenomai_5.15.bb   | 18 ++++++++++++++++++
 recipes-kernel/linux/linux-xenomai_latest.bb |  9 ++++++---
 7 files changed, 80 insertions(+), 7 deletions(-)
 create mode 100644 opt-linux-5.15.yml
 create mode 100644 opt-linux-latest-5.15.yml
 create mode 100644 recipes-kernel/linux/linux-xenomai_5.15.bb
Kconfig +10 -0
index df47058..bdc67b7 100644
@@ -89,6 +89,14 @@ choice
 	prompt "Kernel version"
 	default KERNEL_5_10
 
+config KERNEL_5_15_LATEST
+	bool "Head of 5.15 Dovetail branch"
+	depends on XENOMAI_LATEST
+
+config KERNEL_5_15
+	bool "Latest 5.15 Dovetail version"
+	depends on XENOMAI_LATEST
+
 config KERNEL_5_10_LATEST
 	bool "Head of 5.10 Dovetail branch"
 	depends on XENOMAI_LATEST || XENOMAI_3_2_LATEST || XENOMAI_3_2
@@ -125,6 +133,8 @@ endchoice
 
 config KAS_INCLUDE_KERNEL
 	string
+	default "opt-linux-latest-5.15.yml" if KERNEL_5_15_LATEST
+	default "opt-linux-5.15.yml" if KERNEL_5_15
 	default "opt-linux-latest-5.10.yml" if KERNEL_5_10_LATEST
 	default "opt-linux-5.10.yml" if KERNEL_5_10
 	default "opt-linux-latest-5.4.yml" if KERNEL_5_4_LATEST
conf/distro/include/xenomai-version.inc +10 -4
index dc34415..7bd80ef 100644
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019-2022
 #
 # Authors:
 #  Quirin Gylstorff <[email protected]>
@@ -9,7 +9,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-XENOMAI_DEFAULT_KERNEL_VERSION = "5.10%"
+XENOMAI_DEFAULT_KERNEL_VERSION = "5.15%"
 
 XENOMAI_3_0_VERSION_LIST = "3.0 3.0% 3.0.% 3.0.12 stable-3.0.x"
 XENOMAI_3_0_KERNEL_VERSION = "4.4%"
@@ -17,12 +17,18 @@ XENOMAI_3_0_KERNEL_VERSION = "4.4%"
 XENOMAI_3_1_VERSION_LIST = "3.1 3.1% 3.1.% 3.1.2 stable-3.1.x"
 XENOMAI_3_1_KERNEL_VERSION = "5.4%"
 
+XENOMAI_3_2_VERSION_LIST = "3.2 3.2% 3.2.% 3.2.1 stable-3.2.x"
+XENOMAI_3_2_KERNEL_VERSION = "5.10%"
+
 # If PREFERRED_VERSION_xenomai contains any item from XENOMAI_3_0_VERSION_LIST use
-# XENOMAI_3_0_KERNEL_VERSION. Same for XENOMAI_3_1_VERSION_LIST.
+# XENOMAI_3_0_KERNEL_VERSION. Same for the other XENOMAI_*_VERSION_LIST.
 PREFERRED_VERSION_linux-xenomai ?= \
     "${@bb.utils.contains_any('PREFERRED_VERSION_xenomai', \
         '${XENOMAI_3_0_VERSION_LIST}', '${XENOMAI_3_0_KERNEL_VERSION}', \
         bb.utils.contains_any('PREFERRED_VERSION_xenomai', \
             '${XENOMAI_3_1_VERSION_LIST}', '${XENOMAI_3_1_KERNEL_VERSION}', \
-            '${XENOMAI_DEFAULT_KERNEL_VERSION}', d), \
+            bb.utils.contains_any('PREFERRED_VERSION_xenomai', \
+                '${XENOMAI_3_2_VERSION_LIST}', '${XENOMAI_3_2_KERNEL_VERSION}', \
+                '${XENOMAI_DEFAULT_KERNEL_VERSION}', d), \
+            d), \
         d)}"
opt-linux-5.15.yml new file +17 -0
new file mode 100644
index 0000000..c7447e9
@@ -0,0 +1,17 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2022
+#
+# Authors:
+#  Jan Kiszka <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+  version: 10
+
+local_conf_header:
+  linux-xenomai-version: |
+    PREFERRED_VERSION_linux-xenomai = "5.15%"
opt-linux-latest-5.15.yml new file +18 -0
new file mode 100644
index 0000000..02e1a61
@@ -0,0 +1,18 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2022
+#
+# Authors:
+#  Jan Kiszka <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+  version: 10
+
+local_conf_header:
+  linux-xenomai-version: |
+    PREFERRED_VERSION_linux-xenomai = "9999-%"
+    LATEST_GIT_BRANCH = "5.15"
recipes-kernel/linux/files/armhf_defconfig +1 -0
index eda674c..b9342a5 100644
@@ -2256,6 +2256,7 @@ CONFIG_TI_DAVINCI_CPDMA=y
 CONFIG_TI_CPSW_PHY_SEL=y
 CONFIG_TI_CPSW_ALE=y
 CONFIG_TI_CPSW=y
+CONFIG_TI_CPSW_SWITCHDEV=y
 # CONFIG_TI_CPTS is not set
 # CONFIG_TLAN is not set
 CONFIG_NET_VENDOR_VIA=y
recipes-kernel/linux/linux-xenomai_5.15.bb new file +18 -0
new file mode 100644
index 0000000..9a3b12e
@@ -0,0 +1,18 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2021
+#
+# Authors:
+#  Jan Kiszka <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+require recipes-kernel/linux/linux-xenomai.inc
+
+SRC_URI += "git://source.denx.de/xenomai/linux-dovetail.git;protocol=https;nobranch=1"
+SRCREV = "v5.15.9-dovetail1"
+PV = "5.15.9+"
+
+S = "${WORKDIR}/git"
recipes-kernel/linux/linux-xenomai_latest.bb +6 -3
index bc5379e..4117113 100644
@@ -31,7 +31,8 @@ GIT_BRANCH = "${@ \
     'ipipe-4.4.y-cip' if is_xeno_3_0(d) \
     else 'ipipe-x86-4.19.y-cip' if is_kernel(d, '4.19') \
     else 'ipipe-x86-5.4.y' if is_kernel(d, '5.4') \
-    else 'v5.10.y-dovetail-rebase' }"
+    else 'v5.10.y-dovetail-rebase' if is_kernel(d, '5.10') \
+    else 'v5.15.y-dovetail-rebase' }"
 
 GIT_REPO_armhf = "${@ \
     'git://github.com/xenomai-ci/ipipe.git' if is_xeno_3_0(d) \
@@ -41,7 +42,8 @@ GIT_BRANCH_armhf = "${@ \
     'ipipe-4.4.y-cip' if is_xeno_3_0(d) \
     else 'ipipe/4.19.y-cip' if is_kernel(d, '4.19') \
     else 'ipipe/5.4.y' if is_kernel(d, '5.4') \
-    else 'v5.10.y-dovetail-rebase' }"
+    else 'v5.10.y-dovetail-rebase' if is_kernel(d, '5.10') \
+    else 'v5.15.y-dovetail-rebase' }"
 
 GIT_REPO_arm64 = "${@ \
     'git://github.com/xenomai-ci/ipipe-arm64.git' if is_kernel(d, '4.19') or is_kernel(d, '5.4') \
@@ -49,7 +51,8 @@ GIT_REPO_arm64 = "${@ \
 GIT_BRANCH_arm64 = "${@ \
     'ipipe/4.19.y-cip' if is_kernel(d, '4.19') \
     else 'ipipe/5.4.y' if is_kernel(d, '5.4') \
-    else 'v5.10.y-dovetail-rebase' }"
+    else 'v5.10.y-dovetail-rebase' if is_kernel(d, '5.10') \
+    else 'v5.15.y-dovetail-rebase' }"
 
 SRC_URI += "${GIT_REPO};protocol=https;branch=${GIT_BRANCH}"
 SRCREV = "${AUTOREV}"
Signature · 1 line
2.31.1
author
#2 lore raw

PATCH 2/3 ci: Add kernel 5.15

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

Limit to xenomai-next because on this version fully supports it so far.

---
 ci/kernel_5_15.yml  | 82 +++++++++++++++++++++++++++++++++++++++++++++
 ci/xenomai_next.yml |  1 +
 2 files changed, 83 insertions(+)
 create mode 100644 ci/kernel_5_15.yml
ci/kernel_5_15.yml new file +82 -0
new file mode 100644
index 0000000..f8c3e4b
@@ -0,0 +1,82 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2022
+#
+# Authors:
+#  Jan Kiszka <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+build-5.15:qemu-amd64:
+  extends: .build:qemu-amd64
+  variables:
+    LINUX_BUILD_OPTION: ":opt-linux-latest-5.15.yml"
+    KERNEL_VERSION: "5.15"
+
+lava-test-5.15:qemu-amd64:
+  needs: [ "build-5.15:qemu-amd64" ]
+  extends: .lava-test:qemu-amd64
+  variables:
+    KERNEL_VERSION: "5.15"
+
+build-5.15:qemu-armhf:
+  extends: .build:qemu-armhf
+  variables:
+    LINUX_BUILD_OPTION: ":opt-linux-latest-5.15.yml"
+    KERNEL_VERSION: "5.15"
+
+lava-test-5.15:qemu-armhf:
+  needs: [ "build-5.15:qemu-armhf" ]
+  extends: .lava-test:qemu-armhf
+  variables:
+    KERNEL_VERSION: "5.15"
+
+build-5.15:qemu-arm64:
+  extends: .build:qemu-arm64
+  variables:
+    LINUX_BUILD_OPTION: ":opt-linux-latest-5.15.yml"
+    KERNEL_VERSION: "5.15"
+
+lava-test-5.15:qemu-arm64:
+  needs: [ "build-5.15:qemu-arm64" ]
+  extends: .lava-test:qemu-arm64
+  variables:
+    KERNEL_VERSION: "5.15"
+
+build-5.15:hikey:
+  extends: .build:hikey
+  variables:
+    LINUX_BUILD_OPTION: ":opt-linux-latest-5.15.yml"
+    KERNEL_VERSION: "5.15"
+
+lava-test-5.15:hikey:
+  needs: [ "build-5.15:hikey" ]
+  extends: .lava-test:hikey
+  variables:
+    KERNEL_VERSION: "5.15"
+
+build-5.15:beagle-bone-black:
+  extends: .build:beagle-bone-black
+  variables:
+    LINUX_BUILD_OPTION: ":opt-linux-latest-5.15.yml"
+    KERNEL_VERSION: "5.15"
+
+lava-test-5.15:beagle-bone-black:
+  needs: [ "build-5.15:beagle-bone-black" ]
+  extends: .lava-test:beagle-bone-black
+  variables:
+    KERNEL_VERSION: "5.15"
+
+build-5.15:x86-64-efi:
+  extends: .build:x86-64-efi
+  variables:
+    LINUX_BUILD_OPTION: ":opt-linux-latest-5.15.yml"
+    KERNEL_VERSION: "5.15"
+
+lava-test-5.15:x86-64-efi:
+  needs: [ "build-5.15:x86-64-efi" ]
+  extends: .lava-test:x86-64-efi
+  variables:
+    KERNEL_VERSION: "5.15"
ci/xenomai_next.yml +1 -0
index adb5990..52ac6dd 100644
@@ -12,6 +12,7 @@
 include:
   - local: '/ci/gitlab-ci-base.yml'
   - local: '/ci/kernel_5_10.yml'
+  - local: '/ci/kernel_5_15.yml'
 
 variables:
   XENOMAI_BUILD_OPTION: ":opt-xenomai-next.yml"
Signature · 1 line
2.31.1
author
#3 lore raw

PATCH 3/3 Update Isar revision, enabling ccache

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

Just requires to switch from IMAGE_TYPE to IMAGE_FSTYPES.

---
 conf/machine/beagle-bone-black.conf | 2 +-
 conf/machine/hikey.conf             | 2 +-
 conf/machine/qemu-machine.inc       | 2 +-
 conf/machine/x86-64-efi.conf        | 2 +-
 kas.yml                             | 4 +++-
 opt-ci.yml                          | 4 ++--
 6 files changed, 9 insertions(+), 7 deletions(-)
conf/machine/beagle-bone-black.conf +1 -1
index af6e8f5..c0f85c5 100644
@@ -13,7 +13,7 @@ DISTRO_ARCH = "armhf"
 
 IMAGE_INSTALL += "u-boot-script"
 
-IMAGE_TYPE ?= "wic-img"
+IMAGE_FSTYPES ?= "wic-img"
 DTB_FILES = "am335x-boneblack.dtb"
 IMAGER_INSTALL += "u-boot-omap"
 IMAGE_PREINSTALL += "fake-hwclock"
conf/machine/hikey.conf +1 -1
index dc7bc57..6ad4611 100644
@@ -11,7 +11,7 @@
 
 DISTRO_ARCH = "arm64"
 
-IMAGE_TYPE ?= "wic-img"
+IMAGE_FSTYPES ?= "wic-img"
 IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
 
 IMAGE_PREINSTALL_append = " firmware-ti-connectivity"
conf/machine/qemu-machine.inc +1 -1
index 146fb4f..7771a11 100644
@@ -9,7 +9,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-IMAGE_TYPE = "ext4-img"
+IMAGE_FSTYPES = "ext4-img"
 
 IMAGE_INSTALL_remove += "expand-on-first-boot"
 ROOTFS_EXTRA = "1024"
conf/machine/x86-64-efi.conf +1 -1
index 02846ff..cb3ed85 100644
@@ -11,5 +11,5 @@
 
 DISTRO_ARCH = "amd64"
 
-IMAGE_TYPE ?= "wic-img"
+IMAGE_FSTYPES ?= "wic-img"
 IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
kas.yml +3 -1
index 93e9b82..62ddbb4 100644
@@ -22,7 +22,7 @@ repos:
 
   isar:
     url: https://github.com/ilbers/isar.git
-    refspec: 90e1fa6a80f7240109507f2f7e7ca59f50bbb2d4
+    refspec: eeefa03185e3f259d08ff94295b0981a19eddf55
     layers:
       meta:
 
@@ -37,3 +37,5 @@ local_conf_header:
     CONF_VERSION = "1"
   cross: |
     ISAR_CROSS_COMPILE = "1"
+  ccache: |
+    USE_CCACHE = "1"
opt-ci.yml +2 -2
index f161ab9..2feec5c 100644
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2021
+# Copyright (c) Siemens AG, 2021-2022
 #
 # Authors:
 #  Florian Bezdeka <[email protected]>
@@ -30,5 +30,5 @@ local_conf_header:
     ROOTFS_POSTPROCESS_COMMAND_remove = "image_postprocess_sshd_key_regen"
     IMAGE_INSTALL_remove += "sshd-regen-keys"
     IMAGE_INSTALL_remove += "expand-on-first-boot"
-    IMAGE_TYPE = "${@ 'ext4-img' if d.getVar('MACHINE', True).startswith('qemu') else 'targz-img' }"
+    IMAGE_FSTYPES = "${@ 'ext4-img' if d.getVar('MACHINE', True).startswith('qemu') else 'targz-img' }"
     COMPRESS = "${@ 'gz' if d.getVar('MACHINE', True).startswith('qemu') else '' }"
Signature · 1 line
2.31.1