[xenomai-images] [PATCH 0/3] Enable compat tests

[xenomai-images] [PATCH 0/3] Enable compat tests

[Florian Bezdeka]

Hi all,

this series adds the build and test jobs for compat testing on x86. 

I was trying to enable compat builds for the arm64 architecutre as well 
but failed. The early Xenomai init code fails to detect the cobalt core.
Would be nice if someone could tell me if that should work and we have
bug / problem here or if that was never supported.

To get the tests green the previously submitted series targeting the 
Xenomai project itself has to be applied.

With both series applied 
https://gitlab.com/Xenomai/xenomai-hacker-space/-/issues/21 should be
resolved now.

Best regards,
Florian 


Florian Bezdeka (3):
  linux-xenomai: Update kernel from 5.15.9 to 5.15.57
  kas: Add option file for enabling compat builds
  ci: Add compat enabled build and testing for x86

 .gitlab-ci.yml                             |  6 ++++
 ci/xenomai_next_compat.yml                 | 41 ++++++++++++++++++++++
 opt-compat.yml                             | 17 +++++++++
 recipes-kernel/linux/linux-xenomai_5.15.bb |  4 +--
 recipes-xenomai/xenomai/xenomai.inc        |  2 ++
 5 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 ci/xenomai_next_compat.yml
 create mode 100644 opt-compat.yml

-- 
2.37.2

[xenomai-images] [PATCH 1/3] linux-xenomai: Update kernel from 5.15.9 to 5.15.57

[Florian Bezdeka]

This fixes a test failure (x86io smokey test) on kernel 5.15.

The necessary dovetail fixes are available since 5.15.32-dovetail2, so
updating to the last available version 5.15.57-dovetail1 fixes the test.

Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
 recipes-kernel/linux/linux-xenomai_5.15.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-xenomai_5.15.bb b/recipes-kernel/linux/linux-xenomai_5.15.bb
index 9a3b12e..fcfc4b4 100644
--- a/recipes-kernel/linux/linux-xenomai_5.15.bb
+++ b/recipes-kernel/linux/linux-xenomai_5.15.bb
@@ -12,7 +12,7 @@
 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+"
+SRCREV = "v5.15.57-dovetail1"
+PV = "5.15.57+"
 
 S = "${WORKDIR}/git"
-- 
2.37.2

[xenomai-images] [PATCH 2/3] kas: Add option file for enabling compat builds

[Florian Bezdeka]

Some architectures support running 32-bit legacy applications on 64-bit
kernels. Xenomai supports the amd64 architectures so far.

When this kas option file is selected the userspace components will be
build for the compat architecture instead of the distro architecture.

Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
 opt-compat.yml                      | 17 +++++++++++++++++
 recipes-xenomai/xenomai/xenomai.inc |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 opt-compat.yml

diff --git a/opt-compat.yml b/opt-compat.yml
new file mode 100644
index 0000000..ac120fa
--- /dev/null
+++ b/opt-compat.yml
@@ -0,0 +1,17 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2022
+#
+# Authors:
+#  Florian Bezdeka <florian.bezdeka@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+  version: 10
+
+local_conf_header:
+  compat: |
+    ISAR_ENABLE_COMPAT_ARCH = "1"
diff --git a/recipes-xenomai/xenomai/xenomai.inc b/recipes-xenomai/xenomai/xenomai.inc
index fe84883..b874a4a 100644
--- a/recipes-xenomai/xenomai/xenomai.inc
+++ b/recipes-xenomai/xenomai/xenomai.inc
@@ -13,6 +13,8 @@ inherit dpkg
 
 PROVIDES += "xenomai-kernel-source xenomai-runtime xenomai-runtime-dbgsym libxenomai1 libxenomai-dev libxenomai1-dbgsym"
 
+PACKAGE_ARCH_compat-arch = "${COMPAT_DISTRO_ARCH}"
+
 # use bitbake get_srcrev to get the current commit id
 def get_commit(d):
     try:
-- 
2.37.2

[xenomai-images] [PATCH 3/3] ci: Add compat enabled build and testing for x86

[Florian Bezdeka]

Adding compat enabled build and tests for the x86 architecture to the
CI infrastructure.

Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
 .gitlab-ci.yml             |  6 ++++++
 ci/xenomai_next_compat.yml | 41 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 ci/xenomai_next_compat.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58398fc..b972063 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,3 +43,9 @@ next:
   trigger:
     include:
       - local: '/ci/xenomai_next.yml'
+
+next-compat:
+  extends: .parent
+  trigger:
+    include:
+      - local: '/ci/xenomai_next_compat.yml'
\ No newline at end of file
diff --git a/ci/xenomai_next_compat.yml b/ci/xenomai_next_compat.yml
new file mode 100644
index 0000000..6ff155f
--- /dev/null
+++ b/ci/xenomai_next_compat.yml
@@ -0,0 +1,41 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2022
+#
+# Authors:
+#  Florian Bezdeka <florian.bezdeka@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+include:
+  - local: '/ci/gitlab-ci-base.yml'
+
+variables:
+  XENOMAI_BUILD_OPTION: ":opt-xenomai-next.yml:opt-compat.yml"
+  XENOMAI_VERSION: "next-compat"
+
+build-5.15-compat:qemu-amd64:
+  extends: .build:qemu-amd64
+  variables:
+    LINUX_BUILD_OPTION: ":opt-linux-latest-5.15.yml"
+    KERNEL_VERSION: "5.15"
+
+lava-test-5.15-compat:qemu-amd64:
+  needs: [ "build-5.15-compat:qemu-amd64" ]
+  extends: .lava-test:qemu-amd64
+  variables:
+    KERNEL_VERSION: "5.15"
+
+build-5.15-compat: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-compat:x86-64-efi:
+  needs: [ "build-5.15-compat:x86-64-efi" ]
+  extends: .lava-test:x86-64-efi
+  variables:
+    KERNEL_VERSION: "5.15"
-- 
2.37.2

Re: [xenomai-images] [PATCH 0/3] Enable compat tests

[Jan Kiszka]

On 18.08.22 09:31, Florian Bezdeka wrote:
> Hi all,
> 
> this series adds the build and test jobs for compat testing on x86. 
> 
> I was trying to enable compat builds for the arm64 architecutre as well 
> but failed. The early Xenomai init code fails to detect the cobalt core.
> Would be nice if someone could tell me if that should work and we have
> bug / problem here or if that was never supported.
> 
> To get the tests green the previously submitted series targeting the 
> Xenomai project itself has to be applied.
> 
> With both series applied 
> https://gitlab.com/Xenomai/xenomai-hacker-space/-/issues/21 should be
> resolved now.
> 
> Best regards,
> Florian 
> 
> 
> Florian Bezdeka (3):
>   linux-xenomai: Update kernel from 5.15.9 to 5.15.57
>   kas: Add option file for enabling compat builds
>   ci: Add compat enabled build and testing for x86
> 
>  .gitlab-ci.yml                             |  6 ++++
>  ci/xenomai_next_compat.yml                 | 41 ++++++++++++++++++++++
>  opt-compat.yml                             | 17 +++++++++
>  recipes-kernel/linux/linux-xenomai_5.15.bb |  4 +--
>  recipes-xenomai/xenomai/xenomai.inc        |  2 ++
>  5 files changed, 68 insertions(+), 2 deletions(-)
>  create mode 100644 ci/xenomai_next_compat.yml
>  create mode 100644 opt-compat.yml
> 

Thanks, applied.

But could you also update Kconfig in a follow-up patch?

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux

Re: [xenomai-images] [PATCH 3/3] ci: Add compat enabled build and testing for x86

[Jan Kiszka]

On 18.08.22 09:31, Florian Bezdeka wrote:
> Adding compat enabled build and tests for the x86 architecture to the
> CI infrastructure.
> 
> Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
> ---
>  .gitlab-ci.yml             |  6 ++++++
>  ci/xenomai_next_compat.yml | 41 ++++++++++++++++++++++++++++++++++++++
>  2 files changed, 47 insertions(+)
>  create mode 100644 ci/xenomai_next_compat.yml
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 58398fc..b972063 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -43,3 +43,9 @@ next:
>    trigger:
>      include:
>        - local: '/ci/xenomai_next.yml'
> +
> +next-compat:
> +  extends: .parent
> +  trigger:
> +    include:
> +      - local: '/ci/xenomai_next_compat.yml'

Reverting this again (not only because of pending fixes for Xenomai
next): Can we fold the new tests into the existing 'next' stage please?

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux