[PATCH v2] meta: Add Debian Trixie

[PATCH v2] meta: Add Debian Trixie

[Anton Mikanovich]

Add the next testing target in Isar and CI.
Also update documentation with the new distro name.

Building debian-trixie requires host >= bookworm.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 README.md                                       |  2 +-
 doc/user_manual.md                              |  5 +++++
 meta-isar/conf/mc.conf                          |  3 +++
 .../conf/multiconfig/qemuamd64-trixie.conf      |  7 +++++++
 meta-isar/conf/multiconfig/qemuarm-trixie.conf  |  7 +++++++
 .../conf/multiconfig/qemuarm64-trixie.conf      |  7 +++++++
 meta/conf/distro/debian-trixie.conf             | 17 +++++++++++++++++
 meta/conf/distro/debian-trixie.list             |  8 ++++++++
 testsuite/citest.py                             | 13 +++++++++++++
 9 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 meta-isar/conf/multiconfig/qemuamd64-trixie.conf
 create mode 100644 meta-isar/conf/multiconfig/qemuarm-trixie.conf
 create mode 100644 meta-isar/conf/multiconfig/qemuarm64-trixie.conf
 create mode 100644 meta/conf/distro/debian-trixie.conf
 create mode 100644 meta/conf/distro/debian-trixie.list

diff --git a/README.md b/README.md
index f549aa9f..5c9b2642 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ To test the QEMU image, run the following command:
         $ start_vm -a <arch of your build> -d <distro of your build>
 
 Ex: Architecture of your build could be arm,arm64,i386,amd64,etc.
-    Distribution of your build could be buster,bullseye,bookworm,etc.
+    Distribution of your build could be buster,bullseye,bookworm,trixie,etc.
 
 The default root password is 'root'.
 
diff --git a/doc/user_manual.md b/doc/user_manual.md
index 2eb97647..4181db37 100644
--- a/doc/user_manual.md
+++ b/doc/user_manual.md
@@ -62,6 +62,8 @@ The steps below describe how to build the images provided by default.
 
 The supported host system is >= buster.
 
+Building `debian-trixie` requires host system >= bookworm.
+
 Install the following packages:
 ```
 apt install \
@@ -439,6 +441,7 @@ following distros:
  - debian-buster
  - debian-bullseye
  - debian-bookworm
+ - debian-trixie (host >= bookworm)
  - ubuntu-focal
  - ubuntu-jammy (requires host dpkg >= 1.21)
  - raspios-bullseye
@@ -971,6 +974,8 @@ Debian cross-compilation works out of the box. Currently the following build con
  - bookworm armhf
  - bookworm arm64
  - bookworm mipsel
+ - trixie armhf
+ - trixie arm64
 
 Experimental support for riscv64 is available as well.
 
diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf
index d16f54b5..6403f689 100644
--- a/meta-isar/conf/mc.conf
+++ b/meta-isar/conf/mc.conf
@@ -9,9 +9,11 @@ BBMULTICONFIG = " \
     qemuarm-buster \
     qemuarm-bullseye \
     qemuarm-bookworm \
+    qemuarm-trixie \
     qemuarm64-buster \
     qemuarm64-bullseye \
     qemuarm64-bookworm \
+    qemuarm64-trixie \
     qemui386-buster \
     qemui386-bullseye \
     qemui386-bookworm \
@@ -19,6 +21,7 @@ BBMULTICONFIG = " \
     qemuamd64-bullseye \
     qemuamd64-sb-bullseye \
     qemuamd64-bookworm \
+    qemuamd64-trixie \
     container-amd64-buster \
     container-amd64-bullseye \
     container-amd64-bookworm \
diff --git a/meta-isar/conf/multiconfig/qemuamd64-trixie.conf b/meta-isar/conf/multiconfig/qemuamd64-trixie.conf
new file mode 100644
index 00000000..c06520cc
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuamd64-trixie.conf
@@ -0,0 +1,7 @@
+# This software is a part of ISAR.
+# Copyright (C) 2024 ilbers GmbH
+#
+# SPDX-License-Identifier: MIT
+
+MACHINE ?= "qemuamd64"
+DISTRO ?= "debian-trixie"
diff --git a/meta-isar/conf/multiconfig/qemuarm-trixie.conf b/meta-isar/conf/multiconfig/qemuarm-trixie.conf
new file mode 100644
index 00000000..91d1b137
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuarm-trixie.conf
@@ -0,0 +1,7 @@
+# This software is a part of ISAR.
+# Copyright (C) 2024 ilbers GmbH
+#
+# SPDX-License-Identifier: MIT
+
+MACHINE ?= "qemuarm"
+DISTRO ?= "debian-trixie"
diff --git a/meta-isar/conf/multiconfig/qemuarm64-trixie.conf b/meta-isar/conf/multiconfig/qemuarm64-trixie.conf
new file mode 100644
index 00000000..770199c2
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuarm64-trixie.conf
@@ -0,0 +1,7 @@
+# This software is a part of ISAR.
+# Copyright (C) 2024 ilbers GmbH
+#
+# SPDX-License-Identifier: MIT
+
+MACHINE ?= "qemuarm64"
+DISTRO ?= "debian-trixie"
diff --git a/meta/conf/distro/debian-trixie.conf b/meta/conf/distro/debian-trixie.conf
new file mode 100644
index 00000000..73b216d0
--- /dev/null
+++ b/meta/conf/distro/debian-trixie.conf
@@ -0,0 +1,17 @@
+# This software is a part of ISAR.
+# Copyright (C) 2024 ilbers GmbH
+#
+# SPDX-License-Identifier: MIT
+
+require debian-common.conf
+
+BASE_DISTRO_CODENAME = "trixie"
+
+HOST_DISTRO ?= "debian-${BASE_DISTRO_CODENAME}"
+
+DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
+DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686-pae 686 amd64 arm64 armmp-lpae \
+        armmp cloud-amd64 cloud-arm64 loongson-3 marvell mips32r2el mips64r2el \
+        octeon powerpc64le rpi rt-686-pae rt-amd64 rt-arm64 rt-armmp s390x"
+
+DISTRO_GCC = "12"
diff --git a/meta/conf/distro/debian-trixie.list b/meta/conf/distro/debian-trixie.list
new file mode 100644
index 00000000..4f5f665d
--- /dev/null
+++ b/meta/conf/distro/debian-trixie.list
@@ -0,0 +1,8 @@
+deb	http://deb.debian.org/debian trixie main contrib non-free-firmware non-free
+deb-src	http://deb.debian.org/debian trixie main contrib non-free-firmware non-free
+
+deb	http://deb.debian.org/debian-security/ trixie-security main contrib non-free-firmware non-free
+deb-src	http://deb.debian.org/debian-security/ trixie-security main contrib non-free-firmware non-free
+
+deb	http://deb.debian.org/debian trixie-updates main contrib non-free-firmware non-free
+deb-src	http://deb.debian.org/debian trixie-updates main contrib non-free-firmware non-free
diff --git a/testsuite/citest.py b/testsuite/citest.py
index d7ece76c..98607ac3 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -227,6 +227,19 @@ class NoCrossTest(CIBaseTest):
         except:
             self.cancel('KFAIL')
 
+    def test_nocross_trixie(self):
+        targets = [
+            'mc:qemuamd64-trixie:isar-image-ci',
+            'mc:qemuarm64-trixie:isar-image-ci',
+            'mc:qemuarm-trixie:isar-image-ci',
+                  ]
+
+        self.init()
+        try:
+            self.perform_build_test(targets, cross=False)
+        except:
+            self.cancel('KFAIL')
+
     def test_nocross_sid(self):
         targets = [
             'mc:qemuriscv64-sid:isar-image-base',
-- 
2.34.1

RE: [PATCH v2] meta: Add Debian Trixie

[Schmidt, Adriaan]

Anton Mikanovich, Thursday, January 25, 2024 11:29 AM:
> 
> Add the next testing target in Isar and CI.
> Also update documentation with the new distro name.
> 
> Building debian-trixie requires host >= bookworm.
> 
> Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
> ---
>  README.md                                       |  2 +-
>  doc/user_manual.md                              |  5 +++++
>  meta-isar/conf/mc.conf                          |  3 +++
>  .../conf/multiconfig/qemuamd64-trixie.conf      |  7 +++++++
>  meta-isar/conf/multiconfig/qemuarm-trixie.conf  |  7 +++++++
>  .../conf/multiconfig/qemuarm64-trixie.conf      |  7 +++++++
>  meta/conf/distro/debian-trixie.conf             | 17 +++++++++++++++++
>  meta/conf/distro/debian-trixie.list             |  8 ++++++++
>  testsuite/citest.py                             | 13 +++++++++++++
>  9 files changed, 68 insertions(+), 1 deletion(-)
>  create mode 100644 meta-isar/conf/multiconfig/qemuamd64-trixie.conf
>  create mode 100644 meta-isar/conf/multiconfig/qemuarm-trixie.conf
>  create mode 100644 meta-isar/conf/multiconfig/qemuarm64-trixie.conf
>  create mode 100644 meta/conf/distro/debian-trixie.conf
>  create mode 100644 meta/conf/distro/debian-trixie.list
> 
> diff --git a/README.md b/README.md
> index f549aa9f..5c9b2642 100644
> --- a/README.md
> +++ b/README.md
> @@ -22,7 +22,7 @@ To test the QEMU image, run the following command:
>          $ start_vm -a <arch of your build> -d <distro of your build>
> 
>  Ex: Architecture of your build could be arm,arm64,i386,amd64,etc.
> -    Distribution of your build could be buster,bullseye,bookworm,etc.
> +    Distribution of your build could be buster,bullseye,bookworm,trixie,etc.
> 
>  The default root password is 'root'.
> 
> diff --git a/doc/user_manual.md b/doc/user_manual.md
> index 2eb97647..4181db37 100644
> --- a/doc/user_manual.md
> +++ b/doc/user_manual.md
> @@ -62,6 +62,8 @@ The steps below describe how to build the images provided
> by default.
> 
>  The supported host system is >= buster.
> 
> +Building `debian-trixie` requires host system >= bookworm.
> +
>  Install the following packages:
>  ```
>  apt install \
> @@ -439,6 +441,7 @@ following distros:
>   - debian-buster
>   - debian-bullseye
>   - debian-bookworm
> + - debian-trixie (host >= bookworm)
>   - ubuntu-focal
>   - ubuntu-jammy (requires host dpkg >= 1.21)
>   - raspios-bullseye
> @@ -971,6 +974,8 @@ Debian cross-compilation works out of the box. Currently
> the following build con
>   - bookworm armhf
>   - bookworm arm64
>   - bookworm mipsel
> + - trixie armhf
> + - trixie arm64
> 
>  Experimental support for riscv64 is available as well.
> 
> diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf
> index d16f54b5..6403f689 100644
> --- a/meta-isar/conf/mc.conf
> +++ b/meta-isar/conf/mc.conf
> @@ -9,9 +9,11 @@ BBMULTICONFIG = " \
>      qemuarm-buster \
>      qemuarm-bullseye \
>      qemuarm-bookworm \
> +    qemuarm-trixie \
>      qemuarm64-buster \
>      qemuarm64-bullseye \
>      qemuarm64-bookworm \
> +    qemuarm64-trixie \
>      qemui386-buster \
>      qemui386-bullseye \
>      qemui386-bookworm \
> @@ -19,6 +21,7 @@ BBMULTICONFIG = " \
>      qemuamd64-bullseye \
>      qemuamd64-sb-bullseye \
>      qemuamd64-bookworm \
> +    qemuamd64-trixie \
>      container-amd64-buster \
>      container-amd64-bullseye \
>      container-amd64-bookworm \
> diff --git a/meta-isar/conf/multiconfig/qemuamd64-trixie.conf b/meta-
> isar/conf/multiconfig/qemuamd64-trixie.conf
> new file mode 100644
> index 00000000..c06520cc
> --- /dev/null
> +++ b/meta-isar/conf/multiconfig/qemuamd64-trixie.conf
> @@ -0,0 +1,7 @@
> +# This software is a part of ISAR.
> +# Copyright (C) 2024 ilbers GmbH
> +#
> +# SPDX-License-Identifier: MIT
> +
> +MACHINE ?= "qemuamd64"
> +DISTRO ?= "debian-trixie"
> diff --git a/meta-isar/conf/multiconfig/qemuarm-trixie.conf b/meta-
> isar/conf/multiconfig/qemuarm-trixie.conf
> new file mode 100644
> index 00000000..91d1b137
> --- /dev/null
> +++ b/meta-isar/conf/multiconfig/qemuarm-trixie.conf
> @@ -0,0 +1,7 @@
> +# This software is a part of ISAR.
> +# Copyright (C) 2024 ilbers GmbH
> +#
> +# SPDX-License-Identifier: MIT
> +
> +MACHINE ?= "qemuarm"
> +DISTRO ?= "debian-trixie"
> diff --git a/meta-isar/conf/multiconfig/qemuarm64-trixie.conf b/meta-
> isar/conf/multiconfig/qemuarm64-trixie.conf
> new file mode 100644
> index 00000000..770199c2
> --- /dev/null
> +++ b/meta-isar/conf/multiconfig/qemuarm64-trixie.conf
> @@ -0,0 +1,7 @@
> +# This software is a part of ISAR.
> +# Copyright (C) 2024 ilbers GmbH
> +#
> +# SPDX-License-Identifier: MIT
> +
> +MACHINE ?= "qemuarm64"
> +DISTRO ?= "debian-trixie"
> diff --git a/meta/conf/distro/debian-trixie.conf b/meta/conf/distro/debian-
> trixie.conf
> new file mode 100644
> index 00000000..73b216d0
> --- /dev/null
> +++ b/meta/conf/distro/debian-trixie.conf
> @@ -0,0 +1,17 @@
> +# This software is a part of ISAR.
> +# Copyright (C) 2024 ilbers GmbH
> +#
> +# SPDX-License-Identifier: MIT
> +
> +require debian-common.conf
> +
> +BASE_DISTRO_CODENAME = "trixie"
> +
> +HOST_DISTRO ?= "debian-${BASE_DISTRO_CODENAME}"
> +
> +DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
> +DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686-pae 686 amd64 arm64 armmp-lpae \
> +        armmp cloud-amd64 cloud-arm64 loongson-3 marvell mips32r2el
> mips64r2el \
> +        octeon powerpc64le rpi rt-686-pae rt-amd64 rt-arm64 rt-armmp s390x"

Trixie does not yet provide any RT kernel packages. [1]
I experimented with building trixie images, and ended up adding the bookworm-backports
repository to get a RT Kernel.

Adriaan

[1] https://packages.debian.org/search?keywords=linux-image-rt-amd64

> +
> +DISTRO_GCC = "12"
> diff --git a/meta/conf/distro/debian-trixie.list b/meta/conf/distro/debian-
> trixie.list
> new file mode 100644
> index 00000000..4f5f665d
> --- /dev/null
> +++ b/meta/conf/distro/debian-trixie.list
> @@ -0,0 +1,8 @@
> +deb	http://deb.debian.org/debian trixie main contrib non-free-firmware
> non-free
> +deb-src	http://deb.debian.org/debian trixie main contrib non-free-
> firmware non-free
> +
> +deb	http://deb.debian.org/debian-security/ trixie-security main contrib
> non-free-firmware non-free
> +deb-src	http://deb.debian.org/debian-security/ trixie-security main
> contrib non-free-firmware non-free
> +
> +deb	http://deb.debian.org/debian trixie-updates main contrib non-free-
> firmware non-free
> +deb-src	http://deb.debian.org/debian trixie-updates main contrib non-
> free-firmware non-free
> diff --git a/testsuite/citest.py b/testsuite/citest.py
> index d7ece76c..98607ac3 100755
> --- a/testsuite/citest.py
> +++ b/testsuite/citest.py
> @@ -227,6 +227,19 @@ class NoCrossTest(CIBaseTest):
>          except:
>              self.cancel('KFAIL')
> 
> +    def test_nocross_trixie(self):
> +        targets = [
> +            'mc:qemuamd64-trixie:isar-image-ci',
> +            'mc:qemuarm64-trixie:isar-image-ci',
> +            'mc:qemuarm-trixie:isar-image-ci',
> +                  ]
> +
> +        self.init()
> +        try:
> +            self.perform_build_test(targets, cross=False)
> +        except:
> +            self.cancel('KFAIL')
> +
>      def test_nocross_sid(self):
>          targets = [
>              'mc:qemuriscv64-sid:isar-image-base',
> --
> 2.34.1
> 
> --
> You received this message because you are subscribed to the Google Groups
> "isar-users" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to isar-users+unsubscribe@googlegroups.com.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/isar-users/20240125102915.2950913-1-
> amikan%40ilbers.de.

Re: [PATCH v2] meta: Add Debian Trixie

[Anton Mikanovich]

25/01/2024 12:53, Schmidt, Adriaan wrote:
> Trixie does not yet provide any RT kernel packages. [1]
> I experimented with building trixie images, and ended up adding the bookworm-backports
> repository to get a RT Kernel.
>
> Adriaan
>
> [1] https://packages.debian.org/search?keywords=linux-image-rt-amd64

Hello, Adriaan.

Thanks for this notice. I was checking available kernels during prepare 
v1, but
probably missed rt kernels (or can they be removed?).
Will recheck the list in next patch version.

RE: [PATCH v2] meta: Add Debian Trixie

[Schmidt, Adriaan]

Anton Mikanovich <amikan@ilbers.de>, Thursday, January 25, 2024 12:13 PM:
> 25/01/2024 12:53, Schmidt, Adriaan wrote:
> > Trixie does not yet provide any RT kernel packages. [1]
> > I experimented with building trixie images, and ended up adding the
> bookworm-backports
> > repository to get a RT Kernel.
> >
> > Adriaan
> >
> > [1] https://packages.debian.org/search?keywords=linux-image-rt-amd64
> 
> Hello, Adriaan.
> 
> Thanks for this notice. I was checking available kernels during prepare
> v1, but
> probably missed rt kernels (or can they be removed?).
> Will recheck the list in next patch version.

Hi Anton,

In general, we want/need the rt kernels.

With the current state, I don't think Isar should be "fixing" this (e.g., by
automatically adding another deb repo providing the rt kernels), but instead
anyone wanting to use Trixie+rt at this time needs to address this downstream.

So for Isar, the question is just about how such builds would fail.
I guess the clean thing would be to correctly reflect what's there,
so remove the rt kernels from DISTRO_KERNELS and add them back once the packages
are provided by Trixie. Then builds trying Trixie+rt now would fail early in 
bitbake because "nothing provides linux-image-rt-amd64".

Or the dirty approach, ignore the problem, it should fix itself over time...
Then trying to build Trixie+rt now would fail when apt can't find linux-image-rt-*.

I think either way would be fine. Just maybe document that limitation.

Adriaan

Re: [PATCH v2] meta: Add Debian Trixie

[Anton Mikanovich]

Hello Adriaan,

As RT kernels are now available in Trixie we can go ahead with it.
I will send rebased v3 with current kernels list version.

RE: [PATCH v2] meta: Add Debian Trixie

[Schmidt, Adriaan]

Anton Mikanovich <amikan@ilbers.de>, Monday, March 11, 2024 10:49 AM:
> Hello Adriaan,
> 
> As RT kernels are now available in Trixie we can go ahead with it.
> I will send rebased v3 with current kernels list version.

Hi Anton,
That's good news! Sometimes all we have to do is wait a little...
Thanks for tracking this!
Adriaan