From: Henning Schild <henning.schild@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Cc: Henning Schild <henning.schild@siemens.com>
Subject: [PATCH 2/3] conf: add new debian version "bullseye"
Date: Tue, 6 Aug 2019 16:54:36 +0200 [thread overview]
Message-ID: <20190806145437.8195-2-henning.schild@siemens.com> (raw)
In-Reply-To: <20190806145437.8195-1-henning.schild@siemens.com>
From: Henning Schild <henning.schild@siemens.com>
Add all configuration files and CI targets.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
meta-isar/conf/local.conf.sample | 9 +++++++--
.../conf/multiconfig/qemuamd64-bullseye.conf | 20 +++++++++++++++++++
.../conf/multiconfig/qemuarm-bullseye.conf | 16 +++++++++++++++
.../conf/multiconfig/qemuarm64-bullseye.conf | 18 +++++++++++++++++
.../conf/multiconfig/qemui386-bullseye.conf | 17 ++++++++++++++++
.../conf/multiconfig/qemumipsel-bullseye.conf | 17 ++++++++++++++++
meta/conf/distro/debian-bullseye.conf | 17 ++++++++++++++++
meta/conf/distro/debian-bullseye.list | 6 ++++++
scripts/ci_build.sh | 6 ++++++
9 files changed, 124 insertions(+), 2 deletions(-)
create mode 100644 meta-isar/conf/multiconfig/qemuamd64-bullseye.conf
create mode 100644 meta-isar/conf/multiconfig/qemuarm-bullseye.conf
create mode 100644 meta-isar/conf/multiconfig/qemuarm64-bullseye.conf
create mode 100644 meta-isar/conf/multiconfig/qemui386-bullseye.conf
create mode 100644 meta-isar/conf/multiconfig/qemumipsel-bullseye.conf
create mode 100644 meta/conf/distro/debian-bullseye.conf
create mode 100644 meta/conf/distro/debian-bullseye.list
diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index 5b3a0a1..60805eb 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -40,18 +40,23 @@ DISTRO_ARCH ??= "armhf"
BBMULTICONFIG = " \
qemuarm-stretch \
qemuarm-buster \
+ qemuarm-bullseye \
qemuarm64-stretch \
qemuarm64-buster \
+ qemuarm64-bullseye \
qemui386-stretch \
qemui386-buster \
+ qemui386-bullseye \
qemuamd64-stretch \
+ qemuamd64-buster \
+ qemuamd64-buster-tgz \
+ qemuamd64-bullseye \
qemumipsel-stretch \
qemumipsel-buster \
+ qemumipsel-bullseye \
bananapi-stretch \
de0-nano-soc-stretch \
hikey-stretch \
- qemuamd64-buster \
- qemuamd64-buster-tgz \
nand-ubi-demo-buster \
rpi-stretch \
"
diff --git a/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf b/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf
new file mode 100644
index 0000000..d0b79f7
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf
@@ -0,0 +1,20 @@
+# This software is a part of ISAR.
+
+MACHINE ?= "qemuamd64"
+
+DISTRO ?= "debian-bullseye"
+DISTRO_ARCH ?= "amd64"
+
+KERNEL_NAME ?= "amd64"
+
+IMAGE_TYPE ?= "wic-img"
+WKS_FILE ?= "sdimage-efi"
+IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
+
+IMAGE_INSTALL += "sshd-regen-keys"
+
+QEMU_ARCH ?= "x86_64"
+QEMU_MACHINE ?= "q35"
+QEMU_CPU ?= ""
+QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE## -bios /usr/local/share/ovmf/OVMF.fd"
+
diff --git a/meta-isar/conf/multiconfig/qemuarm-bullseye.conf b/meta-isar/conf/multiconfig/qemuarm-bullseye.conf
new file mode 100644
index 0000000..1989d90
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuarm-bullseye.conf
@@ -0,0 +1,16 @@
+# This software is a part of ISAR.
+
+MACHINE ?= "qemuarm"
+
+DISTRO ?= "debian-bullseye"
+DISTRO_ARCH ?= "armhf"
+
+KERNEL_NAME ?= "armmp"
+
+QEMU_ROOTFS_DEV ?= "vda"
+
+QEMU_ARCH ?= "arm"
+QEMU_MACHINE ?= "virt"
+QEMU_CPU ?= "cortex-a15"
+# TODO: start_vm doesn't support multiline vars
+QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
diff --git a/meta-isar/conf/multiconfig/qemuarm64-bullseye.conf b/meta-isar/conf/multiconfig/qemuarm64-bullseye.conf
new file mode 100644
index 0000000..e8dabac
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuarm64-bullseye.conf
@@ -0,0 +1,18 @@
+# This software is a part of ISAR.
+# Copyright (C) 2017 ilbers GmbH
+# Copyright (c) Siemens AG, 2019
+
+MACHINE ?= "qemuarm64"
+
+DISTRO ?= "debian-bullseye"
+DISTRO_ARCH ?= "arm64"
+
+KERNEL_NAME ?= "arm64"
+
+QEMU_ROOTFS_DEV ?= "vda"
+
+QEMU_ARCH ?= "aarch64"
+QEMU_MACHINE ?= "virt"
+QEMU_CPU ?= "cortex-a57"
+# TODO: start_vm doesn't support multiline vars
+QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
diff --git a/meta-isar/conf/multiconfig/qemui386-bullseye.conf b/meta-isar/conf/multiconfig/qemui386-bullseye.conf
new file mode 100644
index 0000000..0a16d10
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemui386-bullseye.conf
@@ -0,0 +1,17 @@
+# This software is a part of ISAR.
+
+MACHINE ?= "qemui386"
+
+DISTRO ?= "debian-bullseye"
+DISTRO_ARCH ?= "i386"
+
+KERNEL_NAME ?= "686"
+
+IMAGE_TYPE ?= "wic-img"
+WKS_FILE ?= "directdisk-isar"
+IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}"
+
+QEMU_ARCH ?= "i386"
+QEMU_MACHINE ?= "pc"
+QEMU_CPU ?= ""
+QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE##"
diff --git a/meta-isar/conf/multiconfig/qemumipsel-bullseye.conf b/meta-isar/conf/multiconfig/qemumipsel-bullseye.conf
new file mode 100644
index 0000000..aa3a6f8
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemumipsel-bullseye.conf
@@ -0,0 +1,17 @@
+# This software is a part of ISAR.
+# Copyright (C) 2019 Mentor Graphics, a Siemens busines
+
+MACHINE ?= "qemumipsel"
+
+DISTRO ?= "debian-bullseye"
+DISTRO_ARCH ?= "mipsel"
+
+KERNEL_NAME ?= "4kc-malta"
+
+QEMU_ROOTFS_DEV ?= "sda"
+
+QEMU_ARCH ?= "mipsel"
+QEMU_MACHINE ?= "malta"
+QEMU_CPU ?= "24Kc"
+QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,format=raw"
+QEMU_KARGS ?= "nokaslr"
diff --git a/meta/conf/distro/debian-bullseye.conf b/meta/conf/distro/debian-bullseye.conf
new file mode 100644
index 0000000..b38c3c1
--- /dev/null
+++ b/meta/conf/distro/debian-bullseye.conf
@@ -0,0 +1,17 @@
+# This software is a part of ISAR.
+
+require debian-common.conf
+
+BASE_DISTRO_CODENAME = "bullseye"
+
+HOST_DISTRO ?= "debian-${BASE_DISTRO_CODENAME}"
+
+DISTRO_APT_SOURCES += "conf/distro/debian-${BASE_DISTRO_CODENAME}.list"
+DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
+DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686 686-pae amd64 arm64 armmp \
+ armmp-lpae cloud-amd64 loongson-3 octeon powerpc64le rpi s390x marvell \
+ rt-686-pae rt-amd64 rt-arm64 rt-armmp"
+
+IMAGE_PREINSTALL += "init"
+
+WIC_IMAGER_INSTALL += "python3-distutils"
diff --git a/meta/conf/distro/debian-bullseye.list b/meta/conf/distro/debian-bullseye.list
new file mode 100644
index 0000000..c7f23e9
--- /dev/null
+++ b/meta/conf/distro/debian-bullseye.list
@@ -0,0 +1,6 @@
+deb http://ftp.debian.org/debian bullseye main contrib non-free
+deb-src http://ftp.debian.org/debian bullseye main contrib non-free
+deb http://ftp.debian.org/debian bullseye-updates main contrib non-free
+deb-src http://ftp.debian.org/debian bullseye-updates main contrib non-free
+deb http://security.debian.org bullseye-security main contrib non-free
+deb-src http://security.debian.org bullseye-security main contrib non-free
diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
index f4a8b06..7c21c98 100755
--- a/scripts/ci_build.sh
+++ b/scripts/ci_build.sh
@@ -23,22 +23,28 @@ BB_ARGS="-v"
TARGETS_SET="\
multiconfig:qemuarm-stretch:isar-image-base \
multiconfig:qemuarm-buster:isar-image-base \
+ multiconfig:qemuarm-bullseye:isar-image-base \
multiconfig:qemuarm64-stretch:isar-image-base \
multiconfig:qemui386-stretch:isar-image-base \
multiconfig:qemui386-buster:isar-image-base \
+ multiconfig:qemui386-bullseye:isar-image-base \
multiconfig:qemuamd64-stretch:isar-image-base \
multiconfig:qemuamd64-buster:isar-image-base \
multiconfig:qemuamd64-buster-tgz:isar-image-base \
+ multiconfig:qemuamd64-bullseye:isar-image-base \
multiconfig:qemumipsel-stretch:isar-image-base \
multiconfig:qemumipsel-buster:isar-image-base \
+ multiconfig:qemumipsel-bullseye:isar-image-base \
multiconfig:nand-ubi-demo-buster:isar-image-ubi \
multiconfig:rpi-stretch:isar-image-base"
# qemu-user-static of <= buster too old to build that
# multiconfig:qemuarm64-buster:isar-image-base
+ # multiconfig:qemuarm64-bullseye:isar-image-base
CROSS_TARGETS_SET="\
multiconfig:qemuarm-stretch:isar-image-base \
multiconfig:qemuarm-buster:isar-image-base \
+ multiconfig:qemuarm-bullseye:isar-image-base \
multiconfig:qemuarm64-stretch:isar-image-base \
multiconfig:qemuamd64-stretch:isar-image-base \
multiconfig:de0-nano-soc-stretch:isar-image-base \
--
2.21.0
next prev parent reply other threads:[~2019-08-06 14:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-06 14:54 [PATCH 1/3] doc: make buster the new default suite Henning Schild
2019-08-06 14:54 ` Henning Schild [this message]
2019-08-06 14:54 ` [PATCH 3/3] conf: add missing buster kernel names Henning Schild
2019-08-06 14:55 ` [PATCH 1/3] doc: make buster the new default suite Henning Schild
2019-09-04 6:34 ` Baurzhan Ismagulov
2019-09-04 6:44 ` Jan Kiszka
-- strict thread matches above, loose matches on Subject: below --
2019-07-31 10:38 Henning Schild
2019-07-31 10:38 ` [PATCH 2/3] conf: add new debian version "bullseye" Henning Schild
2019-07-31 10:44 ` Henning Schild
2019-07-31 10:47 ` Jan Kiszka
2019-07-31 13:03 ` Baurzhan Ismagulov
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=20190806145437.8195-2-henning.schild@siemens.com \
--to=henning.schild@siemens.com \
--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