From: "Maxim Yu. Osipov" <mosipov@ilbers.de>
To: isar-users@googlegroups.com
Subject: [PATCH v2] conf: Add support for new debian distro "buster"
Date: Wed, 15 Aug 2018 04:26:09 +0200 [thread overview]
Message-ID: <20180815022609.10528-1-mosipov@ilbers.de> (raw)
From: Henning Schild <henning.schild@siemens.com>
Let us already include support for "buster" in Isar, to prove that we
can build images and to find issues before it is declared stable.
Note:
arm64-buster support is excluded so far as build on debian stretch system
hangs with error "qemu: unsupported syscall 277"
Signed-off-by: Henning Schild <henning.schild@siemens.com>
Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
---
doc/user_manual.md | 2 +-
meta-isar/conf/distro/debian-buster.conf | 7 +++++++
meta-isar/conf/distro/debian-buster.list | 3 +++
meta-isar/conf/local.conf.sample | 3 +++
meta-isar/conf/multiconfig/qemuamd64-buster.conf | 19 +++++++++++++++++++
meta-isar/conf/multiconfig/qemuarm-buster.conf | 18 ++++++++++++++++++
meta-isar/conf/multiconfig/qemui386-buster.conf | 20 ++++++++++++++++++++
.../buildchroot/buildchroot-target.bb | 2 ++
scripts/ci_build.sh | 3 +++
scripts/vm_smoke_test | 3 +++
10 files changed, 79 insertions(+), 1 deletion(-)
create mode 100644 meta-isar/conf/distro/debian-buster.conf
create mode 100644 meta-isar/conf/distro/debian-buster.list
create mode 100644 meta-isar/conf/multiconfig/qemuamd64-buster.conf
create mode 100644 meta-isar/conf/multiconfig/qemuarm-buster.conf
create mode 100644 meta-isar/conf/multiconfig/qemui386-buster.conf
diff --git a/doc/user_manual.md b/doc/user_manual.md
index 4e7f29a..34ea6e6 100644
--- a/doc/user_manual.md
+++ b/doc/user_manual.md
@@ -55,7 +55,7 @@ Install the following packages:
```
dosfstools
git
-debootstrap
+debootstrap/jessie-backports# for debian >= "buster"
dpkg-dev
parted
python
diff --git a/meta-isar/conf/distro/debian-buster.conf b/meta-isar/conf/distro/debian-buster.conf
new file mode 100644
index 0000000..162257f
--- /dev/null
+++ b/meta-isar/conf/distro/debian-buster.conf
@@ -0,0 +1,7 @@
+# This software is a part of ISAR.
+
+DISTRO_APT_SOURCES += "conf/distro/debian-buster.list"
+DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
+DISTRO_KERNELS ?= "4kc-malta 586 5kc-malta 686 686-pae amd64 arm64 armmp \
+ armmp-lpae kirkwood loongson-3 marvell octeon orion5x powerpc64le \
+ rt-686-pae rt-amd64 s390x"
diff --git a/meta-isar/conf/distro/debian-buster.list b/meta-isar/conf/distro/debian-buster.list
new file mode 100644
index 0000000..18311d8
--- /dev/null
+++ b/meta-isar/conf/distro/debian-buster.list
@@ -0,0 +1,3 @@
+deb http://ftp.de.debian.org/debian buster main contrib non-free
+deb http://ftp.de.debian.org/debian buster-updates main contrib non-free
+deb http://security.debian.org buster/updates main contrib non-free
diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index 27b43d1..0f37121 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -41,12 +41,15 @@ BBMULTICONFIG = " \
qemuarm-wheezy \
qemuarm-jessie \
qemuarm-stretch \
+ qemuarm-buster \
qemuarm64-stretch \
qemui386-jessie \
qemui386-stretch \
+ qemui386-buster \
qemuamd64-jessie \
qemuamd64-stretch \
bananapi-stretch \
+ qemuamd64-buster \
rpi-jessie \
"
diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
new file mode 100644
index 0000000..85404ae
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
@@ -0,0 +1,19 @@
+# This software is a part of ISAR.
+
+MACHINE ?= "qemuamd64"
+
+DISTRO ?= "debian-buster"
+DISTRO_ARCH ?= "amd64"
+
+KERNEL_NAME ?= "amd64"
+
+IMAGE_PREINSTALL += "init"
+
+IMAGE_TYPE ?= "wic-img"
+
+ROOTFS_DEV ?= "sda2"
+
+QEMU_ARCH ?= "x86_64"
+QEMU_MACHINE ?= "q35"
+QEMU_CPU ?= ""
+QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE## -bios /usr/local/share/ovmf/OVMF.fd"
diff --git a/meta-isar/conf/multiconfig/qemuarm-buster.conf b/meta-isar/conf/multiconfig/qemuarm-buster.conf
new file mode 100644
index 0000000..003f7c4
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuarm-buster.conf
@@ -0,0 +1,18 @@
+# This software is a part of ISAR.
+
+MACHINE ?= "qemuarm"
+
+DISTRO ?= "debian-buster"
+DISTRO_ARCH ?= "armhf"
+
+KERNEL_NAME ?= "armmp"
+
+IMAGE_PREINSTALL += "init"
+
+ROOTFS_DEV ?= "vda"
+
+QEMU_ARCH ?= "arm"
+QEMU_MACHINE ?= "virt"
+QEMU_CPU ?= "cortex-a15"
+# TODO: start_vm doesn't support multiline vars
+QEMU_ROOTFS_DEV ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
diff --git a/meta-isar/conf/multiconfig/qemui386-buster.conf b/meta-isar/conf/multiconfig/qemui386-buster.conf
new file mode 100644
index 0000000..e09cd0c
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemui386-buster.conf
@@ -0,0 +1,20 @@
+# This software is a part of ISAR.
+
+MACHINE ?= "qemui386"
+
+DISTRO ?= "debian-buster"
+DISTRO_ARCH ?= "i386"
+
+KERNEL_NAME ?= "686-pae"
+
+IMAGE_PREINSTALL += "init"
+
+IMAGE_TYPE ?= "wic-img"
+WKS_FILE ?= "directdisk-isar"
+
+ROOTFS_DEV ?= "sda2"
+
+QEMU_ARCH ?= "i386"
+QEMU_MACHINE ?= "pc"
+QEMU_CPU ?= ""
+QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE##"
diff --git a/meta/recipes-devtools/buildchroot/buildchroot-target.bb b/meta/recipes-devtools/buildchroot/buildchroot-target.bb
index 66b526a..34abb72 100644
--- a/meta/recipes-devtools/buildchroot/buildchroot-target.bb
+++ b/meta/recipes-devtools/buildchroot/buildchroot-target.bb
@@ -29,6 +29,8 @@ BUILDCHROOT_PREINSTALL_WIC = " \
e2fsprogs \
python3"
+BUILDCHROOT_PREINSTALL_WIC_append_debian-buster = " python3-distutils"
+
BUILDCHROOT_PREINSTALL_WIC_append_amd64 = " \
syslinux \
syslinux-common \
diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
index 28290c2..24b3353 100755
--- a/scripts/ci_build.sh
+++ b/scripts/ci_build.sh
@@ -84,10 +84,13 @@ else
bitbake $BB_ARGS \
multiconfig:qemuarm-jessie:isar-image-base \
multiconfig:qemuarm-stretch:isar-image-base \
+ multiconfig:qemuarm-buster:isar-image-base \
multiconfig:qemuarm64-stretch:isar-image-base \
multiconfig:qemui386-jessie:isar-image-base \
multiconfig:qemui386-stretch:isar-image-base \
+ multiconfig:qemui386-buster:isar-image-base \
multiconfig:qemuamd64-jessie:isar-image-base \
multiconfig:qemuamd64-stretch:isar-image-base \
+ multiconfig:qemuamd64-buster:isar-image-base \
multiconfig:rpi-jessie:isar-image-base
fi
diff --git a/scripts/vm_smoke_test b/scripts/vm_smoke_test
index a88d127..f2f6aea 100755
--- a/scripts/vm_smoke_test
+++ b/scripts/vm_smoke_test
@@ -144,14 +144,17 @@ done
# ARM machine
run_test arm jessie
run_test arm stretch
+run_test arm buster
# AMD64 machine
run_test amd64 jessie
run_test amd64 stretch
+run_test amd64 buster
# i386 machine
run_test i386 jessie
run_test i386 stretch
+run_test i386 buster
# ARM64 machine
run_test arm64 stretch
--
2.11.0
next reply other threads:[~2018-08-15 2:26 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-15 2:26 Maxim Yu. Osipov [this message]
2018-08-16 8:48 ` Henning Schild
2018-08-16 8:56 ` Jan Kiszka
2018-08-16 9:04 ` Maxim Yu. Osipov
2018-08-16 9:04 ` Henning Schild
2018-08-16 11:57 ` Maxim Yu. Osipov
2018-08-16 14:49 ` Henning Schild
2018-08-16 14:51 ` Jan Kiszka
2018-08-16 15:03 ` Henning Schild
2018-08-16 15:04 ` Jan Kiszka
2018-08-16 15:10 ` Henning Schild
2018-08-16 15:14 ` Jan Kiszka
2018-08-16 16:20 ` Henning Schild
2018-08-16 16:25 ` Jan Kiszka
2018-08-16 15:10 ` Maxim Yu. Osipov
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=20180815022609.10528-1-mosipov@ilbers.de \
--to=mosipov@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