[xenomai-images][PATCH 0/7] LTS kernel 6.1, kernel 5.2 for 3.2.x, Isar update to bitbake 2.0

[xenomai-images][PATCH 0/7] LTS kernel 6.1, kernel 5.2 for 3.2.x, Isar update to bitbake 2.0

[Jan Kiszka]

This adds the now available dovetail LTS branch for kernel 6.1 to the
xenomai-next builds. Furthermore, it enables 5.15 for 3.2-head which
just gained support for it. And finally, Isar is updated and the layer
is adjusted to bitbake 2.0 syntax changes.

Jan

Jan Kiszka (7):
  linux-xenomai: Move S assignment into common include
  linux-xenomai: Factor out linux-xenomai-dovetail.inc
  Add kernel 6.1 recipe and kas files
  ci: Hook up kernel 6.1
  Kconfig: Enable kernel 5.15 for xenomai 3.2 head
  ci: Add kernel 5.15 to Xenomai 3.2 pipeline
  Update Isar after bitbake 2 switch

 Kconfig                                       | 14 +++-
 ci/kernel_6_1.yml                             | 82 +++++++++++++++++++
 ci/xenomai_3_2_x.yml                          |  3 +-
 ci/xenomai_next.yml                           |  1 +
 conf/machine/hikey.conf                       |  2 +-
 conf/machine/qemu-machine.inc                 |  2 +-
 kas.yml                                       |  2 +-
 opt-ci.yml                                    |  6 +-
 opt-linux-6.1.yml                             | 17 ++++
 opt-linux-latest-6.1.yml                      | 18 ++++
 ...mai_5.15.bb => linux-xenomai-dovetail.inc} |  3 -
 recipes-kernel/linux/linux-xenomai.inc        |  4 +-
 recipes-kernel/linux/linux-xenomai_4.19.bb    | 14 ++--
 recipes-kernel/linux/linux-xenomai_4.4.bb     | 12 ++-
 recipes-kernel/linux/linux-xenomai_5.10.bb    |  7 +-
 recipes-kernel/linux/linux-xenomai_5.15.bb    |  7 +-
 recipes-kernel/linux/linux-xenomai_5.4.bb     | 14 ++--
 recipes-kernel/linux/linux-xenomai_6.1.bb     | 14 ++++
 recipes-kernel/linux/linux-xenomai_latest.bb  | 17 ++--
 recipes-xenomai/xenomai/xenomai.inc           |  2 +-
 20 files changed, 184 insertions(+), 57 deletions(-)
 create mode 100644 ci/kernel_6_1.yml
 create mode 100644 opt-linux-6.1.yml
 create mode 100644 opt-linux-latest-6.1.yml
 copy recipes-kernel/linux/{linux-xenomai_5.15.bb => linux-xenomai-dovetail.inc} (86%)
 create mode 100644 recipes-kernel/linux/linux-xenomai_6.1.bb

-- 
2.35.3

[xenomai-images][PATCH 1/7] linux-xenomai: Move S assignment into common include

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 recipes-kernel/linux/linux-xenomai.inc       | 2 ++
 recipes-kernel/linux/linux-xenomai_4.19.bb   | 2 --
 recipes-kernel/linux/linux-xenomai_4.4.bb    | 2 --
 recipes-kernel/linux/linux-xenomai_5.10.bb   | 2 --
 recipes-kernel/linux/linux-xenomai_5.15.bb   | 2 --
 recipes-kernel/linux/linux-xenomai_5.4.bb    | 2 --
 recipes-kernel/linux/linux-xenomai_latest.bb | 2 --
 7 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/recipes-kernel/linux/linux-xenomai.inc b/recipes-kernel/linux/linux-xenomai.inc
index f0f809d..7d69519 100644
--- a/recipes-kernel/linux/linux-xenomai.inc
+++ b/recipes-kernel/linux/linux-xenomai.inc
@@ -21,6 +21,8 @@ SRC_URI += "${@'file://${KERNEL_DEFCONFIG}' if d.getVar('KERNEL_DEFCONFIG') == d
 SRC_URI += "${@'file://common_nodbg.cfg' if d.getVar('XENOMAI_DEBUG') == '0' else ''}"
 SRC_URI += "file://rules.tmpl"
 
+S = "${WORKDIR}/git"
+
 DEPENDS += "xenomai-kernel-source"
 KBUILD_DEPENDS += "xenomai-kernel-source:native"
 
diff --git a/recipes-kernel/linux/linux-xenomai_4.19.bb b/recipes-kernel/linux/linux-xenomai_4.19.bb
index d02def6..8194ea5 100644
--- a/recipes-kernel/linux/linux-xenomai_4.19.bb
+++ b/recipes-kernel/linux/linux-xenomai_4.19.bb
@@ -21,5 +21,3 @@ SRC_URI_append_armhf = " git://github.com/xenomai-ci/ipipe-arm.git;protocol=http
 SRCREV_armhf ?= "ipipe-core-4.19.229-cip67-arm-18"
 
 PV ?= "${@d.getVar('SRCREV').split('-')[2]}+"
-
-S = "${WORKDIR}/git"
diff --git a/recipes-kernel/linux/linux-xenomai_4.4.bb b/recipes-kernel/linux/linux-xenomai_4.4.bb
index dc64a85..bf00fdc 100644
--- a/recipes-kernel/linux/linux-xenomai_4.4.bb
+++ b/recipes-kernel/linux/linux-xenomai_4.4.bb
@@ -19,5 +19,3 @@ SRC_URI_append_armhf = " ${@ 'file://bbb_4.4.cfg' if d.getVar('MACHINE') == 'bea
 SRCREV_armhf ?= "ipipe-core-4.4.302-cip71-arm-20"
 
 PV ?= "${@d.getVar('SRCREV').split('-')[2]}+"
-
-S = "${WORKDIR}/git"
diff --git a/recipes-kernel/linux/linux-xenomai_5.10.bb b/recipes-kernel/linux/linux-xenomai_5.10.bb
index 4500864..1c98d29 100644
--- a/recipes-kernel/linux/linux-xenomai_5.10.bb
+++ b/recipes-kernel/linux/linux-xenomai_5.10.bb
@@ -15,5 +15,3 @@ SRC_URI += "git://source.denx.de/xenomai/linux-dovetail.git;protocol=https;nobra
 SRCREV ?= "v5.10.161-dovetail1"
 
 PV ?= "${@d.getVar('SRCREV').strip('-')[0].lstrip('v')}+"
-
-S = "${WORKDIR}/git"
diff --git a/recipes-kernel/linux/linux-xenomai_5.15.bb b/recipes-kernel/linux/linux-xenomai_5.15.bb
index 724c73b..168334c 100644
--- a/recipes-kernel/linux/linux-xenomai_5.15.bb
+++ b/recipes-kernel/linux/linux-xenomai_5.15.bb
@@ -15,5 +15,3 @@ SRC_URI += "git://source.denx.de/xenomai/linux-dovetail.git;protocol=https;nobra
 SRCREV ?= "v5.15.85-dovetail1"
 
 PV ?= "${@d.getVar('SRCREV').strip('-')[0].lstrip('v')}+"
-
-S = "${WORKDIR}/git"
diff --git a/recipes-kernel/linux/linux-xenomai_5.4.bb b/recipes-kernel/linux/linux-xenomai_5.4.bb
index 716d92d..104955f 100644
--- a/recipes-kernel/linux/linux-xenomai_5.4.bb
+++ b/recipes-kernel/linux/linux-xenomai_5.4.bb
@@ -21,5 +21,3 @@ SRC_URI_append_armhf = " git://github.com/xenomai-ci/ipipe-arm.git;protocol=http
 SRCREV_armhf ?= "ipipe-core-5.4.180-arm-5"
 
 PV ?= "${@d.getVar('SRCREV').split('-')[2]}+"
-
-S = "${WORKDIR}/git"
diff --git a/recipes-kernel/linux/linux-xenomai_latest.bb b/recipes-kernel/linux/linux-xenomai_latest.bb
index 9a8c6fd..6804391 100644
--- a/recipes-kernel/linux/linux-xenomai_latest.bb
+++ b/recipes-kernel/linux/linux-xenomai_latest.bb
@@ -72,5 +72,3 @@ SRC_URI += "${GIT_REPO};protocol=https;branch=${GIT_BRANCH}"
 SRCREV = "${AUTOREV}"
 
 SRC_URI_append_armhf = " ${@ 'file://bbb_4.4.cfg' if is_xeno_3_0(d) and d.getVar('MACHINE') == 'beagle-bone-black' else '' }"
-
-S = "${WORKDIR}/git"
-- 
2.35.3

[xenomai-images][PATCH 2/7] linux-xenomai: Factor out linux-xenomai-dovetail.inc

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Two lines to share per kernel, and there is another kernel upcoming.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 .../{linux-xenomai_5.15.bb => linux-xenomai-dovetail.inc}    | 1 -
 recipes-kernel/linux/linux-xenomai_5.10.bb                   | 5 +----
 recipes-kernel/linux/linux-xenomai_5.15.bb                   | 5 +----
 3 files changed, 2 insertions(+), 9 deletions(-)
 copy recipes-kernel/linux/{linux-xenomai_5.15.bb => linux-xenomai-dovetail.inc} (91%)

diff --git a/recipes-kernel/linux/linux-xenomai_5.15.bb b/recipes-kernel/linux/linux-xenomai-dovetail.inc
similarity index 91%
copy from recipes-kernel/linux/linux-xenomai_5.15.bb
copy to recipes-kernel/linux/linux-xenomai-dovetail.inc
index 168334c..05d775e 100644
--- a/recipes-kernel/linux/linux-xenomai_5.15.bb
+++ b/recipes-kernel/linux/linux-xenomai-dovetail.inc
@@ -12,6 +12,5 @@
 require recipes-kernel/linux/linux-xenomai.inc
 
 SRC_URI += "git://source.denx.de/xenomai/linux-dovetail.git;protocol=https;nobranch=1"
-SRCREV ?= "v5.15.85-dovetail1"
 
 PV ?= "${@d.getVar('SRCREV').strip('-')[0].lstrip('v')}+"
diff --git a/recipes-kernel/linux/linux-xenomai_5.10.bb b/recipes-kernel/linux/linux-xenomai_5.10.bb
index 1c98d29..986060d 100644
--- a/recipes-kernel/linux/linux-xenomai_5.10.bb
+++ b/recipes-kernel/linux/linux-xenomai_5.10.bb
@@ -9,9 +9,6 @@
 # SPDX-License-Identifier: MIT
 #
 
-require recipes-kernel/linux/linux-xenomai.inc
+require recipes-kernel/linux/linux-xenomai-dovetail.inc
 
-SRC_URI += "git://source.denx.de/xenomai/linux-dovetail.git;protocol=https;nobranch=1"
 SRCREV ?= "v5.10.161-dovetail1"
-
-PV ?= "${@d.getVar('SRCREV').strip('-')[0].lstrip('v')}+"
diff --git a/recipes-kernel/linux/linux-xenomai_5.15.bb b/recipes-kernel/linux/linux-xenomai_5.15.bb
index 168334c..63865eb 100644
--- a/recipes-kernel/linux/linux-xenomai_5.15.bb
+++ b/recipes-kernel/linux/linux-xenomai_5.15.bb
@@ -9,9 +9,6 @@
 # SPDX-License-Identifier: MIT
 #
 
-require recipes-kernel/linux/linux-xenomai.inc
+require recipes-kernel/linux/linux-xenomai-dovetail.inc
 
-SRC_URI += "git://source.denx.de/xenomai/linux-dovetail.git;protocol=https;nobranch=1"
 SRCREV ?= "v5.15.85-dovetail1"
-
-PV ?= "${@d.getVar('SRCREV').strip('-')[0].lstrip('v')}+"
-- 
2.35.3

[xenomai-images][PATCH 3/7] Add kernel 6.1 recipe and kas files

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Allows to build against v6.1.y-dovetail[-rebase] with xenomai-next.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 Kconfig                                      | 10 ++++++++++
 opt-linux-6.1.yml                            | 17 +++++++++++++++++
 opt-linux-latest-6.1.yml                     | 18 ++++++++++++++++++
 recipes-kernel/linux/linux-xenomai_6.1.bb    | 14 ++++++++++++++
 recipes-kernel/linux/linux-xenomai_latest.bb |  5 ++++-
 5 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 opt-linux-6.1.yml
 create mode 100644 opt-linux-latest-6.1.yml
 create mode 100644 recipes-kernel/linux/linux-xenomai_6.1.bb

diff --git a/Kconfig b/Kconfig
index 25e6d8c..b49e22d 100644
--- a/Kconfig
+++ b/Kconfig
@@ -93,6 +93,14 @@ config KERNEL_LATEST
 	bool "Head of latest Dovetail branch"
 	depends on XENOMAI_LATEST
 
+config KERNEL_6_1_LATEST
+	bool "Head of 6.1 Dovetail branch"
+	depends on XENOMAI_LATEST
+
+config KERNEL_6_1
+	bool "Latest 6.1 Dovetail version"
+	depends on XENOMAI_LATEST
+
 config KERNEL_5_15_LATEST
 	bool "Head of 5.15 Dovetail branch"
 	depends on XENOMAI_LATEST
@@ -138,6 +146,8 @@ endchoice
 config KAS_INCLUDE_KERNEL
 	string
 	default "opt-linux-latest.yml" if KERNEL_LATEST
+	default "opt-linux-latest-6.1.yml" if KERNEL_6_1_LATEST
+	default "opt-linux-6.1.yml" if KERNEL_6_1
 	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
diff --git a/opt-linux-6.1.yml b/opt-linux-6.1.yml
new file mode 100644
index 0000000..fb0df24
--- /dev/null
+++ b/opt-linux-6.1.yml
@@ -0,0 +1,17 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2023
+#
+# Authors:
+#  Jan Kiszka <jan.kiszka@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+  version: 10
+
+local_conf_header:
+  linux-xenomai-version: |
+    PREFERRED_VERSION_linux-xenomai = "6.1%"
diff --git a/opt-linux-latest-6.1.yml b/opt-linux-latest-6.1.yml
new file mode 100644
index 0000000..c5eecd8
--- /dev/null
+++ b/opt-linux-latest-6.1.yml
@@ -0,0 +1,18 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2023
+#
+# Authors:
+#  Jan Kiszka <jan.kiszka@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+  version: 10
+
+local_conf_header:
+  linux-xenomai-version: |
+    PREFERRED_VERSION_linux-xenomai = "9999-%"
+    LATEST_GIT_BRANCH = "6.1"
diff --git a/recipes-kernel/linux/linux-xenomai_6.1.bb b/recipes-kernel/linux/linux-xenomai_6.1.bb
new file mode 100644
index 0000000..d9655e0
--- /dev/null
+++ b/recipes-kernel/linux/linux-xenomai_6.1.bb
@@ -0,0 +1,14 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2021-2023
+#
+# Authors:
+#  Jan Kiszka <jan.kiszka@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+require recipes-kernel/linux/linux-xenomai-dovetail.inc
+
+SRCREV ?= "v6.1.11-dovetail1"
diff --git a/recipes-kernel/linux/linux-xenomai_latest.bb b/recipes-kernel/linux/linux-xenomai_latest.bb
index 6804391..682e973 100644
--- a/recipes-kernel/linux/linux-xenomai_latest.bb
+++ b/recipes-kernel/linux/linux-xenomai_latest.bb
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2019-2021
+# Copyright (c) Siemens AG, 2019-2023
 #
 # Authors:
 #  Quirin Gylstorff <quirin.gylstorff@siemens.com>
@@ -44,6 +44,7 @@ GIT_BRANCH = "${@ \
     else 'ipipe-x86-5.4.y' if is_kernel(d, '5.4') \
     else 'v5.10.y-dovetail-rebase' if is_kernel(d, '5.10') \
     else 'v5.15.y-dovetail-rebase' if is_kernel(d, '5.15') \
+    else 'v6.1.y-dovetail-rebase' if is_kernel(d, '6.1') \
     else d.getVar('LATEST_KERNEL_BRANCH') }"
 
 GIT_REPO_armhf = "${@ \
@@ -56,6 +57,7 @@ GIT_BRANCH_armhf = "${@ \
     else 'ipipe/5.4.y' if is_kernel(d, '5.4') \
     else 'v5.10.y-dovetail-rebase' if is_kernel(d, '5.10') \
     else 'v5.15.y-dovetail-rebase' if is_kernel(d, '5.15') \
+    else 'v6.1.y-dovetail-rebase' if is_kernel(d, '6.1') \
     else d.getVar('LATEST_KERNEL_BRANCH') }"
 
 GIT_REPO_arm64 = "${@ \
@@ -66,6 +68,7 @@ GIT_BRANCH_arm64 = "${@ \
     else 'ipipe/5.4.y' if is_kernel(d, '5.4') \
     else 'v5.10.y-dovetail-rebase' if is_kernel(d, '5.10') \
     else 'v5.15.y-dovetail-rebase' if is_kernel(d, '5.15') \
+    else 'v6.1.y-dovetail-rebase' if is_kernel(d, '6.1') \
     else d.getVar('LATEST_KERNEL_BRANCH') }"
 
 SRC_URI += "${GIT_REPO};protocol=https;branch=${GIT_BRANCH}"
-- 
2.35.3

[xenomai-images][PATCH 4/7] ci: Hook up kernel 6.1

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Add a builds and test for all targets with this new LTS kernel. We will
reduce coverage of older kernels later in order to limit CI efforts.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 ci/kernel_6_1.yml   | 82 +++++++++++++++++++++++++++++++++++++++++++++
 ci/xenomai_next.yml |  1 +
 2 files changed, 83 insertions(+)
 create mode 100644 ci/kernel_6_1.yml

diff --git a/ci/kernel_6_1.yml b/ci/kernel_6_1.yml
new file mode 100644
index 0000000..2e555af
--- /dev/null
+++ b/ci/kernel_6_1.yml
@@ -0,0 +1,82 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2022-2023
+#
+# Authors:
+#  Jan Kiszka <jan.kiszka@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+build-6.1:qemu-amd64:
+  extends: .build:qemu-amd64
+  variables:
+    LINUX_BUILD_OPTION: ":opt-linux-latest-6.1.yml"
+    KERNEL_VERSION: "6.1"
+
+lava-test-6.1:qemu-amd64:
+  needs: [ "build-6.1:qemu-amd64" ]
+  extends: .lava-test:qemu-amd64
+  variables:
+    KERNEL_VERSION: "6.1"
+
+build-6.1:qemu-armhf:
+  extends: .build:qemu-armhf
+  variables:
+    LINUX_BUILD_OPTION: ":opt-linux-latest-6.1.yml"
+    KERNEL_VERSION: "6.1"
+
+lava-test-6.1:qemu-armhf:
+  needs: [ "build-6.1:qemu-armhf" ]
+  extends: .lava-test:qemu-armhf
+  variables:
+    KERNEL_VERSION: "6.1"
+
+build-6.1:qemu-arm64:
+  extends: .build:qemu-arm64
+  variables:
+    LINUX_BUILD_OPTION: ":opt-linux-latest-6.1.yml"
+    KERNEL_VERSION: "6.16"
+
+lava-test-6.1:qemu-arm64:
+  needs: [ "build-6.1:qemu-arm64" ]
+  extends: .lava-test:qemu-arm64
+  variables:
+    KERNEL_VERSION: "6.1"
+
+build-6.1:hikey:
+  extends: .build:hikey
+  variables:
+    LINUX_BUILD_OPTION: ":opt-linux-latest-6.1.yml"
+    KERNEL_VERSION: "6.1"
+
+lava-test-6.1:hikey:
+  needs: [ "build-6.1:hikey" ]
+  extends: .lava-test:hikey
+  variables:
+    KERNEL_VERSION: "6.1"
+
+build-6.1:beagle-bone-black:
+  extends: .build:beagle-bone-black
+  variables:
+    LINUX_BUILD_OPTION: ":opt-linux-latest-6.1.yml"
+    KERNEL_VERSION: "6.1"
+
+lava-test-6.1:beagle-bone-black:
+  needs: [ "build-6.1:beagle-bone-black" ]
+  extends: .lava-test:beagle-bone-black
+  variables:
+    KERNEL_VERSION: "6.1"
+
+build-6.1:x86-64-efi:
+  extends: .build:x86-64-efi
+  variables:
+    LINUX_BUILD_OPTION: ":opt-linux-latest-6.1.yml"
+    KERNEL_VERSION: "6.1"
+
+lava-test-6.1:x86-64-efi:
+  needs: [ "build-6.1:x86-64-efi" ]
+  extends: .lava-test:x86-64-efi
+  variables:
+    KERNEL_VERSION: "6.1"
diff --git a/ci/xenomai_next.yml b/ci/xenomai_next.yml
index b9e9a57..3e4d513 100644
--- a/ci/xenomai_next.yml
+++ b/ci/xenomai_next.yml
@@ -13,6 +13,7 @@ include:
   - local: '/ci/gitlab-ci-base.yml'
   - local: '/ci/kernel_5_10.yml'
   - local: '/ci/kernel_5_15.yml'
+  - local: '/ci/kernel_6_1.yml'
   - local: '/ci/xenomai_next_compat.yml'
 
 variables:
-- 
2.35.3

[xenomai-images][PATCH 5/7] Kconfig: Enable kernel 5.15 for xenomai 3.2 head

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

No release with this support yet, so only enable XENOMAI_3_2_LATEST.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Kconfig b/Kconfig
index b49e22d..953634e 100644
--- a/Kconfig
+++ b/Kconfig
@@ -103,11 +103,11 @@ config KERNEL_6_1
 
 config KERNEL_5_15_LATEST
 	bool "Head of 5.15 Dovetail branch"
-	depends on XENOMAI_LATEST
+	depends on XENOMAI_LATEST || XENOMAI_3_2_LATEST
 
 config KERNEL_5_15
 	bool "Latest 5.15 Dovetail version"
-	depends on XENOMAI_LATEST
+	depends on XENOMAI_LATEST || XENOMAI_3_2_LATEST
 
 config KERNEL_5_10_LATEST
 	bool "Head of 5.10 Dovetail branch"
-- 
2.35.3

[xenomai-images][PATCH 6/7] ci: Add kernel 5.15 to Xenomai 3.2 pipeline

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Now supported.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 ci/xenomai_3_2_x.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci/xenomai_3_2_x.yml b/ci/xenomai_3_2_x.yml
index 7ca77a3..3a1d5e3 100644
--- a/ci/xenomai_3_2_x.yml
+++ b/ci/xenomai_3_2_x.yml
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2019 - 2022
+# Copyright (c) Siemens AG, 2019 - 2023
 #
 # Authors:
 #  Quirin Gylstorff <quirin.gylstorff@siemens.com>
@@ -14,6 +14,7 @@ include:
   - local: '/ci/kernel_4_19.yml'
   - local: '/ci/kernel_5_4.yml'
   - local: '/ci/kernel_5_10.yml'
+  - local: '/ci/kernel_5_15.yml'
 
 variables:
   XENOMAI_BUILD_OPTION: ":opt-xenomai-3.2.x.yml"
-- 
2.35.3

[xenomai-images][PATCH 7/7] Update Isar after bitbake 2 switch

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Not much effort for this layer.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 conf/machine/hikey.conf                      |  2 +-
 conf/machine/qemu-machine.inc                |  2 +-
 kas.yml                                      |  2 +-
 opt-ci.yml                                   |  6 +++---
 recipes-kernel/linux/linux-xenomai.inc       |  2 +-
 recipes-kernel/linux/linux-xenomai_4.19.bb   | 12 ++++++------
 recipes-kernel/linux/linux-xenomai_4.4.bb    | 10 +++++-----
 recipes-kernel/linux/linux-xenomai_5.4.bb    | 12 ++++++------
 recipes-kernel/linux/linux-xenomai_latest.bb | 10 +++++-----
 recipes-xenomai/xenomai/xenomai.inc          |  2 +-
 10 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/conf/machine/hikey.conf b/conf/machine/hikey.conf
index 344a3de..33694ed 100644
--- a/conf/machine/hikey.conf
+++ b/conf/machine/hikey.conf
@@ -14,7 +14,7 @@ DISTRO_ARCH = "arm64"
 IMAGE_FSTYPES ?= "wic"
 IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
 
-IMAGE_PREINSTALL_append = " firmware-ti-connectivity"
+IMAGE_PREINSTALL:append = " firmware-ti-connectivity"
 
 # DTB for testing
 DTB_FILES = "hi6220-hikey.dtb"
diff --git a/conf/machine/qemu-machine.inc b/conf/machine/qemu-machine.inc
index 27475eb..c50201a 100644
--- a/conf/machine/qemu-machine.inc
+++ b/conf/machine/qemu-machine.inc
@@ -11,5 +11,5 @@
 
 IMAGE_FSTYPES ?= "ext4"
 
-IMAGE_INSTALL_remove += "expand-on-first-boot"
+IMAGE_INSTALL:remove = "expand-on-first-boot"
 ROOTFS_EXTRA = "1024"
diff --git a/kas.yml b/kas.yml
index 0010deb..6020c62 100644
--- a/kas.yml
+++ b/kas.yml
@@ -22,7 +22,7 @@ repos:
 
   isar:
     url: https://github.com/ilbers/isar.git
-    refspec: b98f858500ebae8f9c08124e530d9e72bbdfaa23
+    refspec: 4de8b0d5d68ad46829fa1360eabcf3fc8662a39e
     layers:
       meta:
 
diff --git a/opt-ci.yml b/opt-ci.yml
index 2f551b4..32de022 100644
--- a/opt-ci.yml
+++ b/opt-ci.yml
@@ -20,7 +20,7 @@ header:
 
 local_conf_header:
   xenomai-ci: |
-    ROOTFS_POSTPROCESS_COMMAND_remove = "image_postprocess_sshd_key_regen"
-    IMAGE_INSTALL_remove += "sshd-regen-keys"
-    IMAGE_INSTALL_remove += "expand-on-first-boot"
+    ROOTFS_POSTPROCESS_COMMAND:remove = "image_postprocess_sshd_key_regen"
+    IMAGE_INSTALL:remove += "sshd-regen-keys"
+    IMAGE_INSTALL:remove += "expand-on-first-boot"
     IMAGE_FSTYPES = "${@ 'ext4.gz' if d.getVar('MACHINE', True).startswith('qemu') else 'tar.gz' }"
diff --git a/recipes-kernel/linux/linux-xenomai.inc b/recipes-kernel/linux/linux-xenomai.inc
index 7d69519..ca63fea 100644
--- a/recipes-kernel/linux/linux-xenomai.inc
+++ b/recipes-kernel/linux/linux-xenomai.inc
@@ -36,7 +36,7 @@ def get_commit(d):
 
 LINUX_COMMIT ?= "${@get_commit(d)}"
 
-dpkg_runbuild_prepend() {
+dpkg_runbuild:prepend() {
     bbplain $(printf "linux-xenomai-%s: Building revision %.20s\n" \
                      ${PV} ${LINUX_COMMIT})
 }
diff --git a/recipes-kernel/linux/linux-xenomai_4.19.bb b/recipes-kernel/linux/linux-xenomai_4.19.bb
index 8194ea5..249ffb4 100644
--- a/recipes-kernel/linux/linux-xenomai_4.19.bb
+++ b/recipes-kernel/linux/linux-xenomai_4.19.bb
@@ -11,13 +11,13 @@
 
 require recipes-kernel/linux/linux-xenomai.inc
 
-SRC_URI_append_amd64 = " git://github.com/xenomai-ci/ipipe-x86.git;protocol=https;nobranch=1"
-SRCREV_amd64 ?= "ipipe-core-4.19.266-cip86-x86-25"
+SRC_URI:append:amd64 = " git://github.com/xenomai-ci/ipipe-x86.git;protocol=https;nobranch=1"
+SRCREV:amd64 ?= "ipipe-core-4.19.266-cip86-x86-25"
 
-SRC_URI_append_arm64 = " git://github.com/xenomai-ci/ipipe-arm64.git;protocol=https;nobranch=1"
-SRCREV_arm64 ?= "ipipe-core-4.19.229-cip67-arm64-13"
+SRC_URI:append:arm64 = " git://github.com/xenomai-ci/ipipe-arm64.git;protocol=https;nobranch=1"
+SRCREV:arm64 ?= "ipipe-core-4.19.229-cip67-arm64-13"
 
-SRC_URI_append_armhf = " git://github.com/xenomai-ci/ipipe-arm.git;protocol=https;nobranch=1"
-SRCREV_armhf ?= "ipipe-core-4.19.229-cip67-arm-18"
+SRC_URI:append:armhf = " git://github.com/xenomai-ci/ipipe-arm.git;protocol=https;nobranch=1"
+SRCREV:armhf ?= "ipipe-core-4.19.229-cip67-arm-18"
 
 PV ?= "${@d.getVar('SRCREV').split('-')[2]}+"
diff --git a/recipes-kernel/linux/linux-xenomai_4.4.bb b/recipes-kernel/linux/linux-xenomai_4.4.bb
index bf00fdc..2b32ae3 100644
--- a/recipes-kernel/linux/linux-xenomai_4.4.bb
+++ b/recipes-kernel/linux/linux-xenomai_4.4.bb
@@ -11,11 +11,11 @@
 
 require recipes-kernel/linux/linux-xenomai.inc
 
-SRC_URI_append_amd64 = " git://github.com/xenomai-ci/ipipe.git;protocol=https;nobranch=1"
-SRCREV_amd64 ?= "ipipe-core-4.4.302-cip71-x86-35"
+SRC_URI:append:amd64 = " git://github.com/xenomai-ci/ipipe.git;protocol=https;nobranch=1"
+SRCREV:amd64 ?= "ipipe-core-4.4.302-cip71-x86-35"
 
-SRC_URI_append_armhf = " git://github.com/xenomai-ci/ipipe.git;protocol=https;nobranch=1"
-SRC_URI_append_armhf = " ${@ 'file://bbb_4.4.cfg' if d.getVar('MACHINE') == 'beagle-bone-black' else '' }"
-SRCREV_armhf ?= "ipipe-core-4.4.302-cip71-arm-20"
+SRC_URI:append:armhf = " git://github.com/xenomai-ci/ipipe.git;protocol=https;nobranch=1"
+SRC_URI:append:armhf = " ${@ 'file://bbb_4.4.cfg' if d.getVar('MACHINE') == 'beagle-bone-black' else '' }"
+SRCREV:armhf ?= "ipipe-core-4.4.302-cip71-arm-20"
 
 PV ?= "${@d.getVar('SRCREV').split('-')[2]}+"
diff --git a/recipes-kernel/linux/linux-xenomai_5.4.bb b/recipes-kernel/linux/linux-xenomai_5.4.bb
index 104955f..7796cd3 100644
--- a/recipes-kernel/linux/linux-xenomai_5.4.bb
+++ b/recipes-kernel/linux/linux-xenomai_5.4.bb
@@ -11,13 +11,13 @@
 
 require recipes-kernel/linux/linux-xenomai.inc
 
-SRC_URI_append_amd64 = " git://github.com/xenomai-ci/ipipe-x86.git;protocol=https;nobranch=1"
-SRCREV_amd64 ?= "ipipe-core-5.4.228-x86-12"
+SRC_URI:append:amd64 = " git://github.com/xenomai-ci/ipipe-x86.git;protocol=https;nobranch=1"
+SRCREV:amd64 ?= "ipipe-core-5.4.228-x86-12"
 
-SRC_URI_append_arm64 = " git://github.com/xenomai-ci/ipipe-arm64.git;protocol=https;nobranch=1"
-SRCREV_arm64 ?= "ipipe-core-5.4.180-arm64-5"
+SRC_URI:append:arm64 = " git://github.com/xenomai-ci/ipipe-arm64.git;protocol=https;nobranch=1"
+SRCREV:arm64 ?= "ipipe-core-5.4.180-arm64-5"
 
-SRC_URI_append_armhf = " git://github.com/xenomai-ci/ipipe-arm.git;protocol=https;nobranch=1"
-SRCREV_armhf ?= "ipipe-core-5.4.180-arm-5"
+SRC_URI:append:armhf = " git://github.com/xenomai-ci/ipipe-arm.git;protocol=https;nobranch=1"
+SRCREV:armhf ?= "ipipe-core-5.4.180-arm-5"
 
 PV ?= "${@d.getVar('SRCREV').split('-')[2]}+"
diff --git a/recipes-kernel/linux/linux-xenomai_latest.bb b/recipes-kernel/linux/linux-xenomai_latest.bb
index 682e973..7d002f1 100644
--- a/recipes-kernel/linux/linux-xenomai_latest.bb
+++ b/recipes-kernel/linux/linux-xenomai_latest.bb
@@ -47,11 +47,11 @@ GIT_BRANCH = "${@ \
     else 'v6.1.y-dovetail-rebase' if is_kernel(d, '6.1') \
     else d.getVar('LATEST_KERNEL_BRANCH') }"
 
-GIT_REPO_armhf = "${@ \
+GIT_REPO:armhf = "${@ \
     'git://github.com/xenomai-ci/ipipe.git' if is_xeno_3_0(d) \
     else 'git://github.com/xenomai-ci/ipipe-arm.git' if is_kernel(d, '4.19') or is_kernel(d, '5.4') \
     else 'git://source.denx.de/xenomai/linux-dovetail.git' }"
-GIT_BRANCH_armhf = "${@ \
+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') \
@@ -60,10 +60,10 @@ GIT_BRANCH_armhf = "${@ \
     else 'v6.1.y-dovetail-rebase' if is_kernel(d, '6.1') \
     else d.getVar('LATEST_KERNEL_BRANCH') }"
 
-GIT_REPO_arm64 = "${@ \
+GIT_REPO:arm64 = "${@ \
     'git://github.com/xenomai-ci/ipipe-arm64.git' if is_kernel(d, '4.19') or is_kernel(d, '5.4') \
     else 'git://source.denx.de/xenomai/linux-dovetail.git' }"
-GIT_BRANCH_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' if is_kernel(d, '5.10') \
@@ -74,4 +74,4 @@ GIT_BRANCH_arm64 = "${@ \
 SRC_URI += "${GIT_REPO};protocol=https;branch=${GIT_BRANCH}"
 SRCREV = "${AUTOREV}"
 
-SRC_URI_append_armhf = " ${@ 'file://bbb_4.4.cfg' if is_xeno_3_0(d) and d.getVar('MACHINE') == 'beagle-bone-black' else '' }"
+SRC_URI:append:armhf = " ${@ 'file://bbb_4.4.cfg' if is_xeno_3_0(d) and d.getVar('MACHINE') == 'beagle-bone-black' else '' }"
diff --git a/recipes-xenomai/xenomai/xenomai.inc b/recipes-xenomai/xenomai/xenomai.inc
index 226eba8..bad4ff4 100644
--- a/recipes-xenomai/xenomai/xenomai.inc
+++ b/recipes-xenomai/xenomai/xenomai.inc
@@ -13,7 +13,7 @@ inherit dpkg
 
 PROVIDES += "xenomai-kernel-source xenomai-runtime xenomai-runtime-dbgsym libxenomai1 libxenomai-dev libxenomai1-dbgsym"
 
-PACKAGE_ARCH_compat-arch = "${COMPAT_DISTRO_ARCH}"
+PACKAGE_ARCH:compat-arch = "${COMPAT_DISTRO_ARCH}"
 
 # use bitbake get_srcrev to get the current commit id
 def get_commit(d):
-- 
2.35.3

Re: [xenomai-images][PATCH 4/7] ci: Hook up kernel 6.1

[Florian Bezdeka]

Hi Jan,

On Mon, 2023-02-13 at 08:01 +0100, Jan Kiszka wrote:
> +lava-test-6.1:qemu-armhf:
> +  needs: [ "build-6.1:qemu-armhf" ]
> +  extends: .lava-test:qemu-armhf
> +  variables:
> +    KERNEL_VERSION: "6.1"
> +
> +build-6.1:qemu-arm64:
> +  extends: .build:qemu-arm64
> +  variables:
> +    LINUX_BUILD_OPTION: ":opt-linux-latest-6.1.yml"
> +    KERNEL_VERSION: "6.16"
                           ^
I'm quite sure we have a typo here as this version does not exist
yet...

Re: [xenomai-images][PATCH 4/7] ci: Hook up kernel 6.1

[Jan Kiszka]

On 13.02.23 09:15, Florian Bezdeka wrote:
> Hi Jan,
> 
> On Mon, 2023-02-13 at 08:01 +0100, Jan Kiszka wrote:
>> +lava-test-6.1:qemu-armhf:
>> +  needs: [ "build-6.1:qemu-armhf" ]
>> +  extends: .lava-test:qemu-armhf
>> +  variables:
>> +    KERNEL_VERSION: "6.1"
>> +
>> +build-6.1:qemu-arm64:
>> +  extends: .build:qemu-arm64
>> +  variables:
>> +    LINUX_BUILD_OPTION: ":opt-linux-latest-6.1.yml"
>> +    KERNEL_VERSION: "6.16"
>                            ^
> I'm quite sure we have a typo here as this version does not exist
> yet...
> 

Argh, good catch.

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux