[xenomai-images][PATCH v3 0/8] Update to Debian 11

[xenomai-images][PATCH v3 0/8] Update to Debian 11

[Florian Bezdeka]

Hi all,

with this series the Xenomai demo image will be based on Debian 11.

All Debian 11 related topics that had to be adressed are now merged to
all Xenomai branches, stable branches included. CI runs were successfully
tested against all branches.

Patch 7 made it to the list but has not been applied to next yet. That's
why I resend it, integrated into this series at the right place.

The Xenomai LAVA instance has been down while working on this topic. The
job submission to LAVA failed, but the test jobs where still marked as
successful. That is now fixed as well.

Best regards,
Florian

Changes since v2:
 - Updated ISAR to latest version, allows removal of downstream patches
 - Adjust CI scripts related to ISAR upstream changes
 - Patches reordered (removed ISAR patches)
 - Moved all CI related kas configs to opt-ci.yml

Changes since v1:
 - Renamed opt-lava-test.yml to opt-ci-board.yml
 - Moved removal of expand-on-first-boot from opt-ci.yml to opt-ci-board.yml

Florian Bezdeka (7):
  ci/kas: Consolidate kas option files, introduce opt-ci.yml
  ci/kas: Integrate opt-debug.yml into opt-ci.yml
  ci/kas: Disable partition expanding during first boot
  isar: Update ISAR to current next
  ci/kas: Skip ssh key regeneration for all ci targets
  ci: Fail test job when an error occurred during lava job submission
  xenomai-demo: Switch to Debian bullseye

Jan Kiszka (1):
  linux-xenomai: arm: Enable CONFIG_ARM_MODULE_PLTS

 ci/gitlab-ci-base.yml                      | 10 ++-----
 conf/distro/xenomai-demo.conf              |  4 +--
 conf/machine/beagle-bone-black.conf        |  2 +-
 conf/machine/hikey.conf                    |  2 +-
 kas.yml                                    |  2 +-
 opt-ci.yml                                 | 34 ++++++++++++++++++++++
 opt-ext4-gz.yml                            | 24 ---------------
 opt-lava-test.yml                          | 20 -------------
 recipes-kernel/linux/files/armhf_defconfig |  1 -
 scripts/deploy_to_aws.sh                   | 11 ++++++-
 scripts/run-lava-tests.sh                  |  1 +
 start-qemu.sh                              |  5 +++-
 tests/jobs/xenomai-hikey.yml               |  2 +-
 tests/jobs/xenomai-qemu-arm64.yml          |  2 +-
 14 files changed, 58 insertions(+), 62 deletions(-)
 create mode 100644 opt-ci.yml
 delete mode 100644 opt-ext4-gz.yml
 delete mode 100644 opt-lava-test.yml

-- 
2.30.2

[xenomai-images][PATCH v3 1/8] ci/kas: Consolidate kas option files, introduce opt-ci.yml

[Florian Bezdeka]

Integrate opt-lava-test.yml and opt-ext4-gz.yml into opt-ci.yml.

opt-ci.yml now holds all CI specific options:
  - IMAGE_TYPE adjustments to fulfill LAVA needs
  - COMPRESS for virtual qemu targets

CI configuration has been cleaned up. We only need opt-ci.yml,
all board related BUILD_OPTIONS have been removed.

Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
 ci/gitlab-ci-base.yml | 10 ++--------
 opt-ci.yml            | 29 +++++++++++++++++++++++++++++
 opt-ext4-gz.yml       | 24 ------------------------
 opt-lava-test.yml     | 20 --------------------
 4 files changed, 31 insertions(+), 52 deletions(-)
 create mode 100644 opt-ci.yml
 delete mode 100644 opt-ext4-gz.yml
 delete mode 100644 opt-lava-test.yml

diff --git a/ci/gitlab-ci-base.yml b/ci/gitlab-ci-base.yml
index 8a1dbfb..231b9ca 100644
--- a/ci/gitlab-ci-base.yml
+++ b/ci/gitlab-ci-base.yml
@@ -39,8 +39,8 @@ default:
   stage: build
   script:
     - sudo sh -c "echo 'nameserver 8.8.8.8' > /etc/resolv.conf"
-    - echo "Building kas.yml:board-${TARGET}.yml${XENOMAI_BUILD_OPTION}${LINUX_BUILD_OPTION}${BUILD_OPTIONS}:opt-debug.yml"
-    - kas build kas.yml:board-${TARGET}.yml${XENOMAI_BUILD_OPTION}${LINUX_BUILD_OPTION}${BUILD_OPTIONS}:opt-debug.yml
+    - echo "Building kas.yml:board-${TARGET}.yml${XENOMAI_BUILD_OPTION}${LINUX_BUILD_OPTION}${BUILD_OPTIONS}:opt-debug.yml:opt-ci.yml"
+    - kas build kas.yml:board-${TARGET}.yml${XENOMAI_BUILD_OPTION}${LINUX_BUILD_OPTION}${BUILD_OPTIONS}:opt-debug.yml:opt-ci.yml
     - if [ -n "${USE_S3_BUCKET}" ]; then scripts/deploy_to_aws.sh ${TARGET}; fi
 
 .test:
@@ -64,7 +64,6 @@ default:
   extends: .build
   variables:
     TARGET: qemu-amd64
-    BUILD_OPTIONS: ":opt-ext4-gz.yml"
 
 .lava-test:qemu-amd64:
   extends: .test
@@ -75,7 +74,6 @@ default:
   extends: .build
   variables:
     TARGET: qemu-armhf
-    BUILD_OPTIONS: ":opt-ext4-gz.yml"
 
 .lava-test:qemu-armhf:
   extends: .test
@@ -86,7 +84,6 @@ default:
   extends: .build
   variables:
     TARGET: qemu-arm64
-    BUILD_OPTIONS: ":opt-ext4-gz.yml"
 
 .lava-test:qemu-arm64:
   extends: .test
@@ -97,7 +94,6 @@ default:
   extends: .build
   variables:
     TARGET: hikey
-    BUILD_OPTIONS: ":opt-lava-test.yml"
 
 .lava-test:hikey:
   extends: .test
@@ -109,7 +105,6 @@ default:
   extends: .build
   variables:
     TARGET: beagle-bone-black
-    BUILD_OPTIONS: ":opt-lava-test.yml"
 
 .lava-test:beagle-bone-black:
   extends: .test
@@ -121,7 +116,6 @@ default:
   extends: .build
   variables:
     TARGET: x86-64-efi
-    BUILD_OPTIONS: ":opt-lava-test.yml"
 
 .lava-test:x86-64-efi:
   extends: .test
diff --git a/opt-ci.yml b/opt-ci.yml
new file mode 100644
index 0000000..7f8d715
--- /dev/null
+++ b/opt-ci.yml
@@ -0,0 +1,29 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2021
+#
+# Authors:
+#  Florian Bezdeka <florian.bezdeka@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+  version: 10
+
+repos:
+  isar:
+    patches:
+      01-compress-ext4:
+        path: isar-patches/0001-classes-ext4.img-Compress.patch
+        repo: xenomai
+
+# LAVA uses nfs to deploy the image to real boards. For this we need a tarball
+# instead of full disk/wic image
+# For qemu we need a compressed ext4-img
+
+local_conf_header:
+  xenomai-ci: |
+    IMAGE_TYPE = "${@ 'ext4-img' if d.getVar('MACHINE', True).startswith('qemu') else 'targz-img' }"
+    COMPRESS = "${@ 'gz' if d.getVar('MACHINE', True).startswith('qemu') else '' }"
\ No newline at end of file
diff --git a/opt-ext4-gz.yml b/opt-ext4-gz.yml
deleted file mode 100644
index 409bf62..0000000
--- a/opt-ext4-gz.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Xenomai Real-Time System
-#
-# Copyright (c) Siemens AG, 2018
-#
-# Authors:
-#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
-#
-# SPDX-License-Identifier: MIT
-#
-
-header:
-  version: 10
-
-repos:
-  isar:
-    patches:
-      01-compress-ext4:
-        path: isar-patches/0001-classes-ext4.img-Compress.patch
-        repo: xenomai
-
-local_conf_header:
-  compress: |
-    COMPRESS = "gz"
diff --git a/opt-lava-test.yml b/opt-lava-test.yml
deleted file mode 100644
index 9c33da6..0000000
--- a/opt-lava-test.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Xenomai Real-Time System
-#
-# Copyright (c) Siemens AG, 2019
-#
-# Authors:
-#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
-#
-# SPDX-License-Identifier: MIT
-#
-
-header:
-  version: 10
-
-# lava uses nfs to deploy the image. For this we need a tarball instead of
-# full image
-
-local_conf_header:
-  image-type: |
-    IMAGE_TYPE = "targz-img"
-- 
2.30.2

[xenomai-images][PATCH v3 2/8] ci/kas: Integrate opt-debug.yml into opt-ci.yml

[Florian Bezdeka]

Whenever the kas option file opt-ci.yml is used we want the same build
options as the CI uses, which includes setting the debug options.

Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
 ci/gitlab-ci-base.yml | 4 ++--
 opt-ci.yml            | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ci/gitlab-ci-base.yml b/ci/gitlab-ci-base.yml
index 231b9ca..82d5dac 100644
--- a/ci/gitlab-ci-base.yml
+++ b/ci/gitlab-ci-base.yml
@@ -39,8 +39,8 @@ default:
   stage: build
   script:
     - sudo sh -c "echo 'nameserver 8.8.8.8' > /etc/resolv.conf"
-    - echo "Building kas.yml:board-${TARGET}.yml${XENOMAI_BUILD_OPTION}${LINUX_BUILD_OPTION}${BUILD_OPTIONS}:opt-debug.yml:opt-ci.yml"
-    - kas build kas.yml:board-${TARGET}.yml${XENOMAI_BUILD_OPTION}${LINUX_BUILD_OPTION}${BUILD_OPTIONS}:opt-debug.yml:opt-ci.yml
+    - echo "Building kas.yml:board-${TARGET}.yml${XENOMAI_BUILD_OPTION}${LINUX_BUILD_OPTION}${BUILD_OPTIONS}:opt-ci.yml"
+    - kas build kas.yml:board-${TARGET}.yml${XENOMAI_BUILD_OPTION}${LINUX_BUILD_OPTION}${BUILD_OPTIONS}:opt-ci.yml
     - if [ -n "${USE_S3_BUCKET}" ]; then scripts/deploy_to_aws.sh ${TARGET}; fi
 
 .test:
diff --git a/opt-ci.yml b/opt-ci.yml
index 7f8d715..9df02d0 100644
--- a/opt-ci.yml
+++ b/opt-ci.yml
@@ -11,6 +11,8 @@
 
 header:
   version: 10
+  includes:
+    - opt-debug.yml
 
 repos:
   isar:
-- 
2.30.2

[xenomai-images][PATCH v3 3/8] ci/kas: Disable partition expanding during first boot

[Florian Bezdeka]

Trying to expand the partition during first boot doesn't make sense
as we use NFS for deployment. Removing it helps to reduce the first boot
time a bit.

Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
 opt-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/opt-ci.yml b/opt-ci.yml
index 9df02d0..4d1ab60 100644
--- a/opt-ci.yml
+++ b/opt-ci.yml
@@ -27,5 +27,6 @@ repos:
 
 local_conf_header:
   xenomai-ci: |
+    IMAGE_INSTALL_remove += "expand-on-first-boot"
     IMAGE_TYPE = "${@ 'ext4-img' if d.getVar('MACHINE', True).startswith('qemu') else 'targz-img' }"
     COMPRESS = "${@ 'gz' if d.getVar('MACHINE', True).startswith('qemu') else '' }"
\ No newline at end of file
-- 
2.30.2

[xenomai-images][PATCH v3 4/8] isar: Update ISAR to current next

[Florian Bezdeka]

Updating to the latest ISAR next revision to avoid carrying ISAR
patches. Some adjustments to CI scripts and machine configs were
necessary to follow ISAR upstream.

  - The ssh key generation had some problems on Debian 11.
    The key generation was started in parallel to the entropy feeding,
    so it took quite long. This is already fixed in latest ISAR.

  - For amd64 the generated kernel is now named vmlinux instead of
    vmlinuz. Some CI related scripts and LAVA job description files
    had to be updated.

  - DTB_FILE has been renamed to DTB_FILES

Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
 conf/machine/beagle-bone-black.conf |  2 +-
 conf/machine/hikey.conf             |  2 +-
 kas.yml                             |  2 +-
 scripts/deploy_to_aws.sh            | 11 ++++++++++-
 start-qemu.sh                       |  5 ++++-
 tests/jobs/xenomai-hikey.yml        |  2 +-
 tests/jobs/xenomai-qemu-arm64.yml   |  2 +-
 7 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/conf/machine/beagle-bone-black.conf b/conf/machine/beagle-bone-black.conf
index 90b9f13..af6e8f5 100644
--- a/conf/machine/beagle-bone-black.conf
+++ b/conf/machine/beagle-bone-black.conf
@@ -14,6 +14,6 @@ DISTRO_ARCH = "armhf"
 IMAGE_INSTALL += "u-boot-script"
 
 IMAGE_TYPE ?= "wic-img"
-DTB_FILE = "am335x-boneblack.dtb"
+DTB_FILES = "am335x-boneblack.dtb"
 IMAGER_INSTALL += "u-boot-omap"
 IMAGE_PREINSTALL += "fake-hwclock"
diff --git a/conf/machine/hikey.conf b/conf/machine/hikey.conf
index 9c90b9d..dc7bc57 100644
--- a/conf/machine/hikey.conf
+++ b/conf/machine/hikey.conf
@@ -17,4 +17,4 @@ IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
 IMAGE_PREINSTALL_append = " firmware-ti-connectivity"
 
 # DTB for testing
-DTB_FILE = "hi6220-hikey.dtb"
+DTB_FILES = "hi6220-hikey.dtb"
diff --git a/kas.yml b/kas.yml
index c8bafcd..93e9b82 100644
--- a/kas.yml
+++ b/kas.yml
@@ -22,7 +22,7 @@ repos:
 
   isar:
     url: https://github.com/ilbers/isar.git
-    refspec: 1cfe166c5e53ae96bc07b895a92bf6cd7ace7bc9
+    refspec: 90e1fa6a80f7240109507f2f7e7ca59f50bbb2d4
     layers:
       meta:
 
diff --git a/scripts/deploy_to_aws.sh b/scripts/deploy_to_aws.sh
index e7c22f0..7d9aa89 100755
--- a/scripts/deploy_to_aws.sh
+++ b/scripts/deploy_to_aws.sh
@@ -29,8 +29,17 @@ aws_args="--acl=public-read"
 
 isar_base_name="${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${target}"
 deploy_dir="${destination}/${CI_PIPELINE_ID}/${DEPLOY_DIR_EXTENSION}"
+
+kernel="${images_dir}/${target}/${isar_base_name}-vmlinuz"
+kernel_suffix="vmlinuz"
+if [ ! -f "${kernel}" ]; then
+    # care about arm64 targets
+    kernel="${images_dir}/${target}/${isar_base_name}-vmlinux"
+    kernel_suffix="vmlinux"
+fi
+
 #KERNEL
-aws s3 cp "${aws_args}" "${images_dir}/${target}/${isar_base_name}-vmlinuz" "${deploy_dir}/${isar_base_name}-vmlinuz"
+aws s3 cp "${aws_args}" "${kernel}" "${deploy_dir}/${isar_base_name}-${kernel_suffix}"
 # INITRD
 aws s3 cp "${aws_args}" "${images_dir}/${target}/${isar_base_name}-initrd.img" "${deploy_dir}/${isar_base_name}-initrd.img"
 # ROOTFS
diff --git a/start-qemu.sh b/start-qemu.sh
index a1c29bf..68516cc 100755
--- a/start-qemu.sh
+++ b/start-qemu.sh
@@ -31,6 +31,7 @@ case "$1" in
 			-enable-kvm -machine q35 \
 			-device ide-hd,drive=disk \
 			-device virtio-net-pci,netdev=net"
+		KERNEL_SUFFIX="vmlinuz"
 		KERNEL_CMDLINE=" \
 			root=/dev/sda vga=0x305"
 		;;
@@ -45,6 +46,7 @@ case "$1" in
 			-device virtconsole,chardev=con -chardev vc,id=con \
 			-device virtio-blk-device,drive=disk \
 			-device virtio-net-device,netdev=net"
+		KERNEL_SUFFIX="vmlinux"
 		KERNEL_CMDLINE=" \
 			root=/dev/vda"
 		;;
@@ -59,6 +61,7 @@ case "$1" in
 			-device virtconsole,chardev=con -chardev vc,id=con \
 			-device virtio-blk-device,drive=disk \
 			-device virtio-net-device,netdev=net"
+		KERNEL_SUFFIX="vmlinuz"
 		KERNEL_CMDLINE=" \
 			root=/dev/vda"
 		;;
@@ -82,5 +85,5 @@ shift 1
 ${QEMU_PATH}${QEMU} \
 	-drive file=${IMAGE_PREFIX}.ext4.img,discard=unmap,if=none,id=disk,format=raw \
 	-m 1G -serial mon:stdio -netdev user,id=net \
-	-kernel ${IMAGE_PREFIX}-vmlinuz -append "${KERNEL_CMDLINE}" \
+	-kernel ${IMAGE_PREFIX}-${KERNEL_SUFFIX} -append "${KERNEL_CMDLINE}" \
 	-initrd ${IMAGE_PREFIX}-initrd.img ${QEMU_EXTRA_ARGS} "$@"
diff --git a/tests/jobs/xenomai-hikey.yml b/tests/jobs/xenomai-hikey.yml
index 14fd9f3..4b2c033 100644
--- a/tests/jobs/xenomai-hikey.yml
+++ b/tests/jobs/xenomai-hikey.yml
@@ -31,7 +31,7 @@ actions:
       minutes: 30
     to: tftp
     kernel:
-      url: ${DEPLOY_URL}/${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${TARGET}-vmlinuz
+      url: ${DEPLOY_URL}/${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${TARGET}-vmlinux
       type: image
     dtb:
       url: ${DEPLOY_URL}/hi6220-hikey.dtb
diff --git a/tests/jobs/xenomai-qemu-arm64.yml b/tests/jobs/xenomai-qemu-arm64.yml
index fa0b5bb..4907ca4 100644
--- a/tests/jobs/xenomai-qemu-arm64.yml
+++ b/tests/jobs/xenomai-qemu-arm64.yml
@@ -51,7 +51,7 @@ actions:
     images:
       kernel:
         image_arg: -kernel {kernel} -append "root=/dev/vda"
-        url: ${DEPLOY_URL}/${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${TARGET}-vmlinuz
+        url: ${DEPLOY_URL}/${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${TARGET}-vmlinux
       initrd:
         image_arg: -initrd {initrd}
         url: ${DEPLOY_URL}/${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${TARGET}-initrd.img
-- 
2.30.2

[xenomai-images][PATCH v3 5/8] ci/kas: Skip ssh key regeneration for all ci targets

[Florian Bezdeka]

To minimize CI build time, the ssh-regen part will be skipped on all
ci / test targets.

Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
 opt-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/opt-ci.yml b/opt-ci.yml
index 4d1ab60..f90277a 100644
--- a/opt-ci.yml
+++ b/opt-ci.yml
@@ -27,6 +27,8 @@ repos:
 
 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"
     IMAGE_TYPE = "${@ 'ext4-img' if d.getVar('MACHINE', True).startswith('qemu') else 'targz-img' }"
     COMPRESS = "${@ 'gz' if d.getVar('MACHINE', True).startswith('qemu') else '' }"
\ No newline at end of file
-- 
2.30.2

[xenomai-images][PATCH v3 6/8] ci: Fail test job when an error occurred during lava job submission

[Florian Bezdeka]

It can happen that the LAVA job submission fails. If so, the CI job
should be marked as failed. Previously we had something like the
following in the log, but the job was still marked as "OK".

Log:
connect to lava server: https://lava.xenomai.org
Deploy artifacts from 'https://xenomai-images-artifacts.s3.amazonaws.com/artifacts'
submit lava job
<ProtocolError for https://[snip]/RPC2: 500 HTTPSConnectionPool(host='lava.xenomai.org', port=443): Read timed out. (read timeout=20.0)>
<ProtocolError for https://[snip]/RPC2: 500 HTTPSConnectionPool(host='lava.xenomai.org', port=443): Read timed out. (read timeout=20.0)>
scripts/run-lava-tests.sh: 56: [: Illegal number:

Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
 scripts/run-lava-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/run-lava-tests.sh b/scripts/run-lava-tests.sh
index dde542c..de63b28 100755
--- a/scripts/run-lava-tests.sh
+++ b/scripts/run-lava-tests.sh
@@ -9,6 +9,7 @@
 #
 # SPDX-License-Identifier: MIT
 #
+set -e
 TARGET=$1
 if [ -z "${TARGET}" ]; then
     echo "no target was given"
-- 
2.30.2

[xenomai-images][PATCH v3 7/8] linux-xenomai: arm: Enable CONFIG_ARM_MODULE_PLTS

[Florian Bezdeka]

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

No reason to turn this off, in fact, we have to turn it on with
bullseye's gcc-10 and debug options enabled to avoid relocation
range problems when loading modules.

Reported-by: Florian Bezdeka <florian.bezdeka@siemens.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
 recipes-kernel/linux/files/armhf_defconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/recipes-kernel/linux/files/armhf_defconfig b/recipes-kernel/linux/files/armhf_defconfig
index ef4981d..eda674c 100644
--- a/recipes-kernel/linux/files/armhf_defconfig
+++ b/recipes-kernel/linux/files/armhf_defconfig
@@ -1112,7 +1112,6 @@ CONFIG_HIGHPTE=y
 CONFIG_CPU_SW_DOMAIN_PAN=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-# CONFIG_ARM_MODULE_PLTS is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_HAVE_MEMBLOCK=y
-- 
2.30.2

[xenomai-images][PATCH v3 8/8] xenomai-demo: Switch to Debian bullseye

[Florian Bezdeka]

Switching from Debian buster to Debian bullseye as base for or xenomai-demo
distribution.

Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
 conf/distro/xenomai-demo.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/distro/xenomai-demo.conf b/conf/distro/xenomai-demo.conf
index 1c9209d..4794584 100644
--- a/conf/distro/xenomai-demo.conf
+++ b/conf/distro/xenomai-demo.conf
@@ -9,12 +9,12 @@
 # SPDX-License-Identifier: MIT
 #
 
-require conf/distro/debian-buster.conf
+require conf/distro/debian-bullseye.conf
 
 PREFERRED_VERSION_xenomai ?= "3.1%"
 include conf/distro/include/xenomai-version.inc
 
-HOST_DISTRO ?= "debian-buster"
+HOST_DISTRO ?= "debian-bullseye"
 
 KERNEL_NAME = "xenomai"
 
-- 
2.30.2

Re: [xenomai-images][PATCH v3 0/8] Update to Debian 11

[Jan Kiszka]

On 15.11.21 11:13, Florian Bezdeka wrote:
> Hi all,
> 
> with this series the Xenomai demo image will be based on Debian 11.
> 
> All Debian 11 related topics that had to be adressed are now merged to
> all Xenomai branches, stable branches included. CI runs were successfully
> tested against all branches.
> 
> Patch 7 made it to the list but has not been applied to next yet. That's
> why I resend it, integrated into this series at the right place.
> 
> The Xenomai LAVA instance has been down while working on this topic. The
> job submission to LAVA failed, but the test jobs where still marked as
> successful. That is now fixed as well.
> 
> Best regards,
> Florian
> 
> Changes since v2:
>  - Updated ISAR to latest version, allows removal of downstream patches
>  - Adjust CI scripts related to ISAR upstream changes
>  - Patches reordered (removed ISAR patches)
>  - Moved all CI related kas configs to opt-ci.yml
> 
> Changes since v1:
>  - Renamed opt-lava-test.yml to opt-ci-board.yml
>  - Moved removal of expand-on-first-boot from opt-ci.yml to opt-ci-board.yml
> 
> Florian Bezdeka (7):
>   ci/kas: Consolidate kas option files, introduce opt-ci.yml
>   ci/kas: Integrate opt-debug.yml into opt-ci.yml
>   ci/kas: Disable partition expanding during first boot
>   isar: Update ISAR to current next
>   ci/kas: Skip ssh key regeneration for all ci targets
>   ci: Fail test job when an error occurred during lava job submission
>   xenomai-demo: Switch to Debian bullseye
> 
> Jan Kiszka (1):
>   linux-xenomai: arm: Enable CONFIG_ARM_MODULE_PLTS
> 
>  ci/gitlab-ci-base.yml                      | 10 ++-----
>  conf/distro/xenomai-demo.conf              |  4 +--
>  conf/machine/beagle-bone-black.conf        |  2 +-
>  conf/machine/hikey.conf                    |  2 +-
>  kas.yml                                    |  2 +-
>  opt-ci.yml                                 | 34 ++++++++++++++++++++++
>  opt-ext4-gz.yml                            | 24 ---------------
>  opt-lava-test.yml                          | 20 -------------
>  recipes-kernel/linux/files/armhf_defconfig |  1 -
>  scripts/deploy_to_aws.sh                   | 11 ++++++-
>  scripts/run-lava-tests.sh                  |  1 +
>  start-qemu.sh                              |  5 +++-
>  tests/jobs/xenomai-hikey.yml               |  2 +-
>  tests/jobs/xenomai-qemu-arm64.yml          |  2 +-
>  14 files changed, 58 insertions(+), 62 deletions(-)
>  create mode 100644 opt-ci.yml
>  delete mode 100644 opt-ext4-gz.yml
>  delete mode 100644 opt-lava-test.yml
> 

Thanks, applied.

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux