From: Henning Schild <henning.schild@siemens.com>
To: Anton Mikanovich <amikan@ilbers.de>
Cc: isar-users@googlegroups.com
Subject: Re: [PATCH] meta: Add Debian Trixie
Date: Mon, 17 Jul 2023 13:16:46 +0200 [thread overview]
Message-ID: <20230717131646.412e105a@md1za8fc.ad001.siemens.net> (raw)
In-Reply-To: <20230717063832.783378-1-amikan@ilbers.de>
Am Mon, 17 Jul 2023 09:38:32 +0300
schrieb Anton Mikanovich <amikan@ilbers.de>:
> 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/local.conf.sample | 3 +++
> .../conf/multiconfig/qemuamd64-trixie.conf | 7 +++++++
> meta-isar/conf/multiconfig/qemuarm-trixie.conf | 7 +++++++
> .../conf/multiconfig/qemuarm64-trixie.conf | 7 +++++++
> meta-test/conf/local.conf.sample | 3 +++
> meta/conf/distro/debian-trixie.conf | 17
> +++++++++++++++++ meta/conf/distro/debian-trixie.list |
> 8 ++++++++ testsuite/citest.py | 13
> +++++++++++++ 10 files changed, 71 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 118acf52..c427c137 100644
> --- a/README.md
> +++ b/README.md
> @@ -19,7 +19,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 04cf52bb..fe96cfd5 100644
> --- a/doc/user_manual.md
> +++ b/doc/user_manual.md
> @@ -60,6 +60,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 \
> @@ -431,6 +433,7 @@ In Isar, each machine can use its specific Linux
> distro to generate `buildchroot
> - debian-buster
> - debian-bullseye
> - debian-bookworm
> + - debian-trixie (host >= bookworm)
> - ubuntu-focal
> - ubuntu-jammy (requires host dpkg >= 1.21)
> - raspios-bullseye
> @@ -961,6 +964,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/local.conf.sample
> b/meta-isar/conf/local.conf.sample index 762709f4..903722bd 100644
> --- a/meta-isar/conf/local.conf.sample
> +++ b/meta-isar/conf/local.conf.sample
> @@ -41,9 +41,11 @@ BBMULTICONFIG = " \
> qemuarm-buster \
> qemuarm-bullseye \
> qemuarm-bookworm \
> + qemuarm-trixie \
> qemuarm64-buster \
> qemuarm64-bullseye \
> qemuarm64-bookworm \
> + qemuarm64-trixie \
> qemui386-buster \
> qemui386-bullseye \
> qemui386-bookworm \
> @@ -51,6 +53,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..bc571c34
> --- /dev/null
> +++ b/meta-isar/conf/multiconfig/qemuamd64-trixie.conf
> @@ -0,0 +1,7 @@
> +# This software is a part of ISAR.
> +# Copyright (C) 2023 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..f4a01c69
> --- /dev/null
> +++ b/meta-isar/conf/multiconfig/qemuarm-trixie.conf
> @@ -0,0 +1,7 @@
> +# This software is a part of ISAR.
> +# Copyright (C) 2023 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..c8637a07
> --- /dev/null
> +++ b/meta-isar/conf/multiconfig/qemuarm64-trixie.conf
> @@ -0,0 +1,7 @@
> +# This software is a part of ISAR.
> +# Copyright (C) 2023 ilbers GmbH
> +#
> +# SPDX-License-Identifier: MIT
> +
> +MACHINE ?= "qemuarm64"
> +DISTRO ?= "debian-trixie"
> diff --git a/meta-test/conf/local.conf.sample
> b/meta-test/conf/local.conf.sample index b705d3a8..955ac640 100644
> --- a/meta-test/conf/local.conf.sample
> +++ b/meta-test/conf/local.conf.sample
> @@ -11,9 +11,11 @@ BBMULTICONFIG = " \
> qemuarm-buster \
> qemuarm-bullseye \
> qemuarm-bookworm \
> + qemuarm-trixie \
> qemuarm64-buster \
> qemuarm64-bullseye \
> qemuarm64-bookworm \
> + qemuarm64-trixie \
> qemui386-buster \
> qemui386-bullseye \
> qemui386-bookworm \
> @@ -21,6 +23,7 @@ BBMULTICONFIG = " \
> qemuamd64-bullseye \
> qemuamd64-sb-bullseye \
> qemuamd64-bookworm \
> + qemuamd64-trixie \
> container-amd64-buster \
> container-amd64-bullseye \
> container-amd64-bookworm \
> diff --git a/meta/conf/distro/debian-trixie.conf
> b/meta/conf/distro/debian-trixie.conf new file mode 100644
> index 00000000..c30f4ca7
> --- /dev/null
> +++ b/meta/conf/distro/debian-trixie.conf
> @@ -0,0 +1,17 @@
> +# This software is a part of ISAR.
> +# Copyright (C) 2023 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" +
These lists are kind of tricky to come up with. It usually boils down
to seeing which packages can be found on the mirrors.
Is this just a copy or did you check which packages there are?
regards,
Henning
> +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 b81d86f9..34258452 100755 ---
> a/testsuite/citest.py +++ b/testsuite/citest.py @@ -253,6 +253,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_sidports(self):
> targets = [
> 'mc:qemuriscv64-sid-ports:isar-image-base',
next prev parent reply other threads:[~2023-07-17 11:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-17 6:38 Anton Mikanovich
2023-07-17 11:16 ` Henning Schild [this message]
2023-07-17 11:22 ` Anton Mikanovich
2023-08-25 6:14 ` Anton Mikanovich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230717131646.412e105a@md1za8fc.ad001.siemens.net \
--to=henning.schild@siemens.com \
--cc=amikan@ilbers.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox