[xenomai-images][PATCH 0/5] Update versions, add 5.10 kernel

[xenomai-images][PATCH 0/5] Update versions, add 5.10 kernel

[Jan Kiszka]

This first of all updates a number of recipes to reflect latest Xenomai
and I-pipe release.

And then, now that Dovetail support is part of the Xenomai next branch,
add CI and testing targets for this kernel. This obsoletes the
wip/dovetail branch.

Jan

Jan Kiszka (5):
  linux-xenomai: Update to latest 4.4 and 4.19 ipipe releases
  xenomai: Update to 3.1.1
  linux-xenomai: Add 5.4 recipe and make it default
  linux-xenomai: Add support for 5.10 to latest recipe
  ci: Add kernel 5.10 to xenomai_next build

 ci/kernel_5_10_xenomai_next.yml               | 88 +++++++++++++++++++
 ci/xenomai_next.yml                           |  3 +-
 conf/distro/include/xenomai-version.inc       |  2 +-
 opt-linux-latest-5.10.yml                     | 18 ++++
 recipes-kernel/linux/linux-xenomai_4.19.bb    | 12 +--
 recipes-kernel/linux/linux-xenomai_4.4.bb     |  8 +-
 ...x-xenomai_4.19.bb => linux-xenomai_5.4.bb} | 16 ++--
 recipes-kernel/linux/linux-xenomai_latest.bb  | 20 ++---
 .../{xenomai_3.1.bb => xenomai_3.1.1.bb}      |  4 +-
 9 files changed, 139 insertions(+), 32 deletions(-)
 create mode 100644 ci/kernel_5_10_xenomai_next.yml
 create mode 100644 opt-linux-latest-5.10.yml
 copy recipes-kernel/linux/{linux-xenomai_4.19.bb => linux-xenomai_5.4.bb} (58%)
 rename recipes-xenomai/xenomai/{xenomai_3.1.bb => xenomai_3.1.1.bb} (78%)

-- 
2.26.2

[xenomai-images][PATCH 1/5] linux-xenomai: Update to latest 4.4 and 4.19 ipipe releases

[Jan Kiszka]

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

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

diff --git a/recipes-kernel/linux/linux-xenomai_4.19.bb b/recipes-kernel/linux/linux-xenomai_4.19.bb
index 12e2199..ef67067 100644
--- a/recipes-kernel/linux/linux-xenomai_4.19.bb
+++ b/recipes-kernel/linux/linux-xenomai_4.19.bb
@@ -12,15 +12,15 @@
 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.140-cip33-x86-14"
-PV_amd64 ?= "4.19.140+"
+SRCREV_amd64 ?= "ipipe-core-4.19.192-cip50-x86-18"
+PV_amd64 ?= "4.19.192+"
 
 SRC_URI_append_arm64 = " git://github.com/xenomai-ci/ipipe-arm64.git;protocol=https;nobranch=1"
-SRCREV_arm64 ?= "ipipe-core-4.19.144-cip34-arm64-08"
-PV_arm64 ?= "4.19.144+"
+SRCREV_arm64 ?= "ipipe-core-4.19.190-cip49-arm64-10"
+PV_arm64 ?= "4.19.190+"
 
 SRC_URI_append_armhf = " git://github.com/xenomai-ci/ipipe-arm.git;protocol=https;nobranch=1"
-SRCREV_armhf ?= "ipipe-core-4.19.140-cip33-arm-11"
-PV_armhf ?= "4.19.140+"
+SRCREV_armhf ?= "ipipe-core-4.19.190-cip49-arm-15"
+PV_armhf ?= "4.19.190+"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-kernel/linux/linux-xenomai_4.4.bb b/recipes-kernel/linux/linux-xenomai_4.4.bb
index 0c2b1f3..2a1137c 100644
--- a/recipes-kernel/linux/linux-xenomai_4.4.bb
+++ b/recipes-kernel/linux/linux-xenomai_4.4.bb
@@ -12,11 +12,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.238-cip50-x86-26"
-PV_amd64 = "4.4.238+"
+SRCREV_amd64 ?= "ipipe-core-4.4.268-cip57-x86-28"
+PV_amd64 = "4.4.268+"
 
 SRC_URI_append_armhf = " git://github.com/xenomai-ci/ipipe.git;protocol=https;nobranch=1"
-SRCREV_armhf ?= "ipipe-core-4.4.238-cip50-arm-11"
-PV_armhf = "4.4.238+"
+SRCREV_armhf ?= "ipipe-core-4.4.268-cip57-arm-13"
+PV_armhf = "4.4.268+"
 
 S = "${WORKDIR}/git"
-- 
2.26.2

[xenomai-images][PATCH 2/5] xenomai: Update to 3.1.1

[Jan Kiszka]

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

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 recipes-xenomai/xenomai/{xenomai_3.1.bb => xenomai_3.1.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename recipes-xenomai/xenomai/{xenomai_3.1.bb => xenomai_3.1.1.bb} (78%)

diff --git a/recipes-xenomai/xenomai/xenomai_3.1.bb b/recipes-xenomai/xenomai/xenomai_3.1.1.bb
similarity index 78%
rename from recipes-xenomai/xenomai/xenomai_3.1.bb
rename to recipes-xenomai/xenomai/xenomai_3.1.1.bb
index f117eee..5a3c41d 100644
--- a/recipes-xenomai/xenomai/xenomai_3.1.bb
+++ b/recipes-xenomai/xenomai/xenomai_3.1.1.bb
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2020
+# Copyright (c) Siemens AG, 2020-2021
 #
 # Authors:
 #  Jan Kiszka <jan.kiszka@siemens.com>
@@ -12,6 +12,6 @@
 require xenomai.inc
 
 SRC_URI = " \
-    git://github.com/xenomai-ci/xenomai.git;protocol=https;branch=master;tag=v${PV}"
+    git://github.com/xenomai-ci/xenomai.git;protocol=https;branch=stable/v3.1.x;tag=v${PV}"
 
 S = "${WORKDIR}/git"
-- 
2.26.2

[xenomai-images][PATCH 3/5] linux-xenomai: Add 5.4 recipe and make it default

[Jan Kiszka]

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

This is currently our most recent stable kernel.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 conf/distro/include/xenomai-version.inc   |  2 +-
 recipes-kernel/linux/linux-xenomai_5.4.bb | 26 +++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 recipes-kernel/linux/linux-xenomai_5.4.bb

diff --git a/conf/distro/include/xenomai-version.inc b/conf/distro/include/xenomai-version.inc
index 9bf3087..24e0dd6 100644
--- a/conf/distro/include/xenomai-version.inc
+++ b/conf/distro/include/xenomai-version.inc
@@ -9,7 +9,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-XENOMAI_DEFAULT_KERNEL_VERSION = "4.19%"
+XENOMAI_DEFAULT_KERNEL_VERSION = "5.4%"
 XENOMAI_3_0_VERSION_LIST = "3.0 3.0% 3.0.% 3.0.10"
 XENOMAI_3_0_KERNEL_VERSION = "4.4%"
 # if PREFERRED_VERSION_xenomai contains any item from XENOMAI_3_0_VERSION_LIST use
diff --git a/recipes-kernel/linux/linux-xenomai_5.4.bb b/recipes-kernel/linux/linux-xenomai_5.4.bb
new file mode 100644
index 0000000..9f070cf
--- /dev/null
+++ b/recipes-kernel/linux/linux-xenomai_5.4.bb
@@ -0,0 +1,26 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2021
+#
+# Authors:
+#  Jan Kiszka <jan.kiszka@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+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.124-x86-5"
+PV_amd64 ?= "5.4.124+"
+
+SRC_URI_append_arm64 = " git://github.com/xenomai-ci/ipipe-arm64.git;protocol=https;nobranch=1"
+SRCREV_arm64 ?= "ipipe-core-5.4.119-arm64-2"
+PV_arm64 ?= "5.4.119+"
+
+SRC_URI_append_armhf = " git://github.com/xenomai-ci/ipipe-arm.git;protocol=https;nobranch=1"
+SRCREV_armhf ?= "ipipe-core-5.4.119-arm-2"
+PV_armhf ?= "5.4.119+"
+
+S = "${WORKDIR}/git"
-- 
2.26.2

[xenomai-images][PATCH 4/5] linux-xenomai: Add support for 5.10 to latest recipe

[Jan Kiszka]

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

Add a corresponding kas option file as well.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 opt-linux-latest-5.10.yml                    | 18 ++++++++++++++++++
 recipes-kernel/linux/linux-xenomai_latest.bb | 20 ++++++++++----------
 2 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 opt-linux-latest-5.10.yml

diff --git a/opt-linux-latest-5.10.yml b/opt-linux-latest-5.10.yml
new file mode 100644
index 0000000..89530b8
--- /dev/null
+++ b/opt-linux-latest-5.10.yml
@@ -0,0 +1,18 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2021
+#
+# Authors:
+#  Jan Kiszka <jan.kiszka@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+  version: 10
+
+local_conf_header:
+  linux-xenomai-latest: |
+    PREFERRED_VERSION_linux-xenomai = "9999-%"
+    LATEST_GIT_BRANCH = "5.10"
diff --git a/recipes-kernel/linux/linux-xenomai_latest.bb b/recipes-kernel/linux/linux-xenomai_latest.bb
index 91b4743..09df461 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-2020
+# Copyright (c) Siemens AG, 2019-2021
 #
 # Authors:
 #  Quirin Gylstorff <quirin.gylstorff@siemens.com>
@@ -18,20 +18,20 @@ def is_xeno_3_0(d):
     xeno_ver = d.getVar('PREFERRED_VERSION_xenomai') or ''
     return xeno_ver.startswith('3.0') or xeno_ver == 'stable-3.0.x'
 
-def is_5_4_branch(d):
+def is_kernel(d, ver):
     linux_ver = d.getVar('LATEST_GIT_BRANCH') or ''
-    return linux_ver.startswith('5.4')
+    return linux_ver.startswith(ver)
 
-GIT_REPO_amd64 = "${@'ipipe.git' if is_xeno_3_0(d) else 'ipipe-x86.git'}"
-GIT_BRANCH_amd64 = "${@'ipipe-4.4.y-cip' if is_xeno_3_0(d) else 'ipipe-x86-5.4.y' if is_5_4_branch(d) else 'ipipe-x86-4.19.y-cip'}"
+GIT_REPO_amd64 = "${@'git://github.com/xenomai-ci/ipipe.git' if is_xeno_3_0(d) else 'git://source.denx.de/xenomai/linux-dovetail.git' if is_kernel(d, '5.10') else 'git://github.com/xenomai-ci/ipipe-x86.git'}"
+GIT_BRANCH_amd64 = "${@'ipipe-4.4.y-cip' if is_xeno_3_0(d) else 'v5.10.y-dovetail-rebase' if is_kernel(d, '5.10') else 'ipipe-x86-5.4.y' if is_kernel(d, '5.4') else 'ipipe-x86-4.19.y-cip'}"
 
-GIT_REPO_armhf = "${@'ipipe.git' if is_xeno_3_0(d) else 'ipipe-arm.git'}"
-GIT_BRANCH_armhf = "${@'ipipe-4.4.y-cip' if is_xeno_3_0(d) else 'ipipe/5.4.y' if is_5_4_branch(d) else 'ipipe/4.19.y-cip'}"
+GIT_REPO_armhf = "${@'git://github.com/xenomai-ci/ipipe.git' if is_xeno_3_0(d) else 'git://source.denx.de/xenomai/linux-dovetail.git' if is_kernel(d, '5.10') else 'git://github.com/xenomai-ci/ipipe-arm.git'}"
+GIT_BRANCH_armhf = "${@'ipipe-4.4.y-cip' if is_xeno_3_0(d) else 'v5.10.y-dovetail-rebase' if is_kernel(d, '5.10') else 'ipipe/5.4.y' if is_kernel(d, '5.4') else 'ipipe/4.19.y-cip'}"
 
-GIT_REPO_arm64 = "ipipe-arm64.git"
-GIT_BRANCH_arm64 = "${@'ipipe/5.4.y' if is_5_4_branch(d) else 'ipipe/4.19.y-cip'}"
+GIT_REPO_arm64 = "${@'git://source.denx.de/xenomai/linux-dovetail.git' if is_kernel(d, '5.10') else 'git://github.com/xenomai-ci/ipipe-arm64.git'}"
+GIT_BRANCH_arm64 = "${@'v5.10.y-dovetail-rebase' if is_kernel(d, '5.10') else 'ipipe/5.4.y' if is_kernel(d, '5.4') else 'ipipe/4.19.y-cip'}"
 
-SRC_URI += "git://github.com/xenomai-ci/${GIT_REPO};protocol=https;branch=${GIT_BRANCH}"
+SRC_URI += "${GIT_REPO};protocol=https;branch=${GIT_BRANCH}"
 SRCREV = "${AUTOREV}"
 
 S = "${WORKDIR}/git"
-- 
2.26.2

[xenomai-images][PATCH 5/5] ci: Add kernel 5.10 to xenomai_next build

[Jan Kiszka]

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

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

diff --git a/ci/kernel_5_10_xenomai_next.yml b/ci/kernel_5_10_xenomai_next.yml
new file mode 100644
index 0000000..80bcf87
--- /dev/null
+++ b/ci/kernel_5_10_xenomai_next.yml
@@ -0,0 +1,88 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2019 - 2021
+#
+# Authors:
+#  Jan Kiszka <jan.kiszka@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+build-5.10:qemu-amd64:
+  extends: .build:qemu-amd64
+  variables:
+    LINUX_BUILD_OPTION: ":opt-linux-latest-5.10.yml"
+    DEPLOY_DIR_EXTENSION: "5.10"
+
+lava-test-5.10:qemu-amd64:
+  needs: [ "build-5.10:qemu-amd64" ]
+  extends: .lava-test:qemu-amd64
+  variables:
+    DEPLOY_DIR_EXTENSION: "5.10"
+    BUILD_IDENTIFIER: "5.10"
+
+build-5.10:qemu-armhf:
+  extends: .build:qemu-armhf
+  variables:
+    LINUX_BUILD_OPTION: ":opt-linux-latest-5.10.yml"
+    DEPLOY_DIR_EXTENSION: "5.10"
+
+lava-test-5.10:qemu-armhf:
+  needs: [ "build-5.10:qemu-armhf" ]
+  extends: .lava-test:qemu-armhf
+  variables:
+    DEPLOY_DIR_EXTENSION: "5.10"
+    BUILD_IDENTIFIER: "5.10"
+
+build-5.10:qemu-arm64:
+  extends: .build:qemu-arm64
+  variables:
+    LINUX_BUILD_OPTION: ":opt-linux-latest-5.10.yml"
+    DEPLOY_DIR_EXTENSION: "5.10"
+
+lava-test-5.10:qemu-arm64:
+  needs: [ "build-5.10:qemu-arm64" ]
+  extends: .lava-test:qemu-arm64
+  variables:
+    DEPLOY_DIR_EXTENSION: "5.10"
+    BUILD_IDENTIFIER: "5.10"
+
+build-5.10:hikey:
+  extends: .build:hikey
+  variables:
+    LINUX_BUILD_OPTION: ":opt-linux-latest-5.10.yml"
+    DEPLOY_DIR_EXTENSION: "5.10"
+
+lava-test-5.10:hikey:
+  needs: [ "build-5.10:hikey" ]
+  extends: .lava-test:hikey
+  variables:
+    DEPLOY_DIR_EXTENSION: "5.10"
+    BUILD_IDENTIFIER: "5.10"
+
+build-5.10:beagle-bone-black:
+  extends: .build:beagle-bone-black
+  variables:
+    LINUX_BUILD_OPTION: ":opt-linux-latest-5.10.yml"
+    DEPLOY_DIR_EXTENSION: "5.10"
+
+lava-test-5.10:beagle-bone-black:
+  needs: [ "build-5.10:beagle-bone-black" ]
+  extends: .lava-test:beagle-bone-black
+  variables:
+    DEPLOY_DIR_EXTENSION: "5.10"
+    BUILD_IDENTIFIER: "5.10"
+
+build-5.10:x86-64-efi:
+  extends: .build:x86-64-efi
+  variables:
+    LINUX_BUILD_OPTION: ":opt-linux-latest-5.10.yml"
+    DEPLOY_DIR_EXTENSION: "5.10"
+
+lava-test-5.10:x86-64-efi:
+  needs: [ "build-5.10:x86-64-efi" ]
+  extends: .lava-test:x86-64-efi
+  variables:
+    DEPLOY_DIR_EXTENSION: "5.10"
+    BUILD_IDENTIFIER: "5.10"
diff --git a/ci/xenomai_next.yml b/ci/xenomai_next.yml
index 6d964a6..b13dfa8 100644
--- a/ci/xenomai_next.yml
+++ b/ci/xenomai_next.yml
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2019 - 2020
+# Copyright (c) Siemens AG, 2019 - 2021
 #
 # Authors:
 #  Quirin Gylstorff <quirin.gylstorff@siemens.com>
@@ -12,3 +12,4 @@ include:
   - local: '/ci/gitlab-ci-base.yml'
   - local: '/ci/kernel_4_19_xenomai_next.yml'
   - local: '/ci/kernel_5_4_xenomai_next.yml'
+  - local: '/ci/kernel_5_10_xenomai_next.yml'
-- 
2.26.2