[PATCH xenomai-images 0/2] Update demo-image to deal with the new testsuite package

[PATCH xenomai-images 0/2] Update demo-image to deal with the new testsuite package

[Florian Bezdeka]

This series depends on the previously posted xenomai debianization
patches. Both series should be applied in lockstep.

A full CI run was triggered internally to test both series. The run was
successful, all tests passed.

Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
Florian Bezdeka (2):
      recipes-xenomai/xenomai.inc: Split up PROVIDES
      xenomai: Install xenomai-testsuite in addition to xenomai-runtime

 recipes-core/images/demo-image.bb   | 27 +++++++++++++++++++++++++--
 recipes-xenomai/xenomai/xenomai.inc |  9 ++++++++-
 2 files changed, 33 insertions(+), 3 deletions(-)
---
base-commit: 61317a5eb9b02c09f3400b7b60c8333219a772cc
change-id: 20230426-flo-testsuite-extraction-37d51e4213c2

Best regards,
-- 
Florian Bezdeka <florian.bezdeka@siemens.com>

[PATCH xenomai-images 1/2] recipes-xenomai/xenomai.inc: Split up PROVIDES

[Florian Bezdeka]

Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
 recipes-xenomai/xenomai/xenomai.inc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/recipes-xenomai/xenomai/xenomai.inc b/recipes-xenomai/xenomai/xenomai.inc
index bad4ff4..ca71d8c 100644
--- a/recipes-xenomai/xenomai/xenomai.inc
+++ b/recipes-xenomai/xenomai/xenomai.inc
@@ -11,7 +11,12 @@
 
 inherit dpkg
 
-PROVIDES += "xenomai-kernel-source xenomai-runtime xenomai-runtime-dbgsym libxenomai1 libxenomai-dev libxenomai1-dbgsym"
+PROVIDES += "xenomai-kernel-source"
+PROVIDES += "xenomai-runtime"
+PROVIDES += "xenomai-runtime-dbgsym"
+PROVIDES += "libxenomai1"
+PROVIDES += "libxenomai-dev"
+PROVIDES += "libxenomai1-dbgsym"
 
 PACKAGE_ARCH:compat-arch = "${COMPAT_DISTRO_ARCH}"
 

-- 
2.39.2

[PATCH xenomai-images 2/2] xenomai: Install xenomai-testsuite in addition to xenomai-runtime

[Florian Bezdeka]

The xenomai testsuite has been moved into a separate package
(xenomai-testsuite) during 3.3.x development but will stay inside the
xenomai-runtime package for older stable releases.

Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
 recipes-core/images/demo-image.bb   | 27 +++++++++++++++++++++++++--
 recipes-xenomai/xenomai/xenomai.inc |  2 ++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/recipes-core/images/demo-image.bb b/recipes-core/images/demo-image.bb
index df849f2..540583b 100644
--- a/recipes-core/images/demo-image.bb
+++ b/recipes-core/images/demo-image.bb
@@ -14,11 +14,34 @@ inherit image
 ISAR_RELEASE_CMD = "git -C ${LAYERDIR_xenomai} describe --tags --dirty --always --match 'v[0-9].[0-9]*'"
 DESCRIPTION = "Xenomai demo and test image"
 
+# The Xenomai testsuite was part of the xenomai-runtime package until 3.2.x.
+# Since 3.3.x a new package (xenomai-testsuite) is providing the testsuite.
+def has_testsuite_package(d):
+    xeno_ver = "PREFERRED_VERSION_xenomai"
+    v3_0 = d.getVar("XENOMAI_3_0_VERSION_LIST")
+    v3_1 = d.getVar("XENOMAI_3_1_VERSION_LIST")
+    v3_2 = d.getVar("XENOMAI_3_2_VERSION_LIST")
+    all = v3_0 + " " + v3_1 + " " + v3_2
+
+    return bb.utils.contains_any(xeno_ver, all, False, True, d)
+
+def get_testsuite_package_names(d):
+    if not has_testsuite_package(d):
+        return ""
+
+    return "xenomai-testsuite xenomai-testsuite-dbgsym"
+
+# Install gdb only for older stable releases. Enables gdb tests and avoids a
+# arch missmatch for compat builds on newer releases.
+IMAGE_PREINSTALL += "${@ 'gdb' if not has_testsuite_package(d) else '' }"
+
 IMAGE_PREINSTALL += " \
     bash-completion less vim nano man \
     ifupdown isc-dhcp-client net-tools iputils-ping ssh \
     iw wireless-tools wpasupplicant dbus \
-    gdb lsb-release"
+    lsb-release"
 
-IMAGE_INSTALL += "xenomai-runtime xenomai-runtime-dbgsym libxenomai1-dbgsym"
+IMAGE_INSTALL += "xenomai-runtime xenomai-runtime-dbgsym"
+IMAGE_INSTALL += "${@get_testsuite_package_names(d)}"
+IMAGE_INSTALL += "libxenomai1-dbgsym"
 IMAGE_INSTALL += "customizations sshd-regen-keys expand-on-first-boot"
diff --git a/recipes-xenomai/xenomai/xenomai.inc b/recipes-xenomai/xenomai/xenomai.inc
index ca71d8c..0a32981 100644
--- a/recipes-xenomai/xenomai/xenomai.inc
+++ b/recipes-xenomai/xenomai/xenomai.inc
@@ -14,6 +14,8 @@ inherit dpkg
 PROVIDES += "xenomai-kernel-source"
 PROVIDES += "xenomai-runtime"
 PROVIDES += "xenomai-runtime-dbgsym"
+PROVIDES += "xenomai-testsuite"
+PROVIDES += "xenomai-testsuite-dbgsym"
 PROVIDES += "libxenomai1"
 PROVIDES += "libxenomai-dev"
 PROVIDES += "libxenomai1-dbgsym"

-- 
2.39.2

Re: [PATCH xenomai-images 0/2] Update demo-image to deal with the new testsuite package

[Jan Kiszka]

On 27.04.23 13:56, Florian Bezdeka wrote:
> This series depends on the previously posted xenomai debianization
> patches. Both series should be applied in lockstep.
> 
> A full CI run was triggered internally to test both series. The run was
> successful, all tests passed.
> 
> Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
> ---
> Florian Bezdeka (2):
>       recipes-xenomai/xenomai.inc: Split up PROVIDES
>       xenomai: Install xenomai-testsuite in addition to xenomai-runtime
> 
>  recipes-core/images/demo-image.bb   | 27 +++++++++++++++++++++++++--
>  recipes-xenomai/xenomai/xenomai.inc |  9 ++++++++-
>  2 files changed, 33 insertions(+), 3 deletions(-)
> ---
> base-commit: 61317a5eb9b02c09f3400b7b60c8333219a772cc
> change-id: 20230426-flo-testsuite-extraction-37d51e4213c2
> 
> Best regards,

Thanks, applied.

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux