From: "Maxim Yu. Osipov" <mosipov@ilbers.de>
To: Henning Schild <henning.schild@siemens.com>, isar-users@googlegroups.com
Subject: Re: [PATCH v3] conf: Add support for new debian distro "buster"
Date: Fri, 17 Aug 2018 08:29:23 +0300 [thread overview]
Message-ID: <50692c99-c9e6-98b1-3a18-496c1b22561c@ilbers.de> (raw)
In-Reply-To: <20180816161604.26214-1-henning.schild@siemens.com>
On 08/16/2018 07:16 PM, Henning Schild wrote:
> 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.
Applied to the 'next'.
Thanks,
Maxim.
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
> doc/user_manual.md | 2 +-
> meta-isar/conf/distro/debian-buster.conf | 6 ++++++
> meta-isar/conf/distro/debian-buster.list | 3 +++
> meta-isar/conf/local.conf.sample | 4 ++++
> meta-isar/conf/multiconfig/qemuamd64-buster.conf | 19 +++++++++++++++++++
> meta-isar/conf/multiconfig/qemuarm-buster.conf | 18 ++++++++++++++++++
> meta-isar/conf/multiconfig/qemuarm64-buster.conf | 20 ++++++++++++++++++++
> meta-isar/conf/multiconfig/qemui386-buster.conf | 20 ++++++++++++++++++++
> .../buildchroot/buildchroot-target.bb | 2 ++
> scripts/ci_build.sh | 7 +++++++
> scripts/vm_smoke_test | 2 ++
> 11 files changed, 102 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/qemuarm64-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..7d1c921
> --- /dev/null
> +++ b/meta-isar/conf/distro/debian-buster.conf
> @@ -0,0 +1,6 @@
> +# 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 5kc-malta 686 686-pae amd64 arm64 armmp \
> + armmp-lpae cloud-amd64 loongson-3 marvell octeon powerpc64le 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..769d853 100644
> --- a/meta-isar/conf/local.conf.sample
> +++ b/meta-isar/conf/local.conf.sample
> @@ -41,12 +41,16 @@ BBMULTICONFIG = " \
> qemuarm-wheezy \
> qemuarm-jessie \
> qemuarm-stretch \
> + qemuarm-buster \
> qemuarm64-stretch \
> + qemuarm64-buster \
> 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/qemuarm64-buster.conf b/meta-isar/conf/multiconfig/qemuarm64-buster.conf
> new file mode 100644
> index 0000000..80b88f2
> --- /dev/null
> +++ b/meta-isar/conf/multiconfig/qemuarm64-buster.conf
> @@ -0,0 +1,20 @@
> +# This software is a part of ISAR.
> +# Copyright (C) 2017 ilbers GmbH
> +# Copyright (c) Siemens AG, 2018
> +
> +MACHINE ?= "qemuarm64"
> +
> +DISTRO ?= "debian-buster"
> +DISTRO_ARCH ?= "arm64"
> +
> +KERNEL_NAME ?= "arm64"
> +
> +IMAGE_PREINSTALL += "init"
> +
> +ROOTFS_DEV ?= "vda"
> +
> +QEMU_ARCH ?= "aarch64"
> +QEMU_MACHINE ?= "virt"
> +QEMU_CPU ?= "cortex-a57"
> +# 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..083c185 100755
> --- a/scripts/ci_build.sh
> +++ b/scripts/ci_build.sh
> @@ -87,7 +87,14 @@ else
> 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
> +
> + # qemu-user-static of <= jessie too old to build that
> + #multiconfig:qemuarm-buster:isar-image-base
> + # qemu-user-static of <= buster too old to build that
> + #multiconfig:qemuarm64-buster:isar-image-base
> fi
> diff --git a/scripts/vm_smoke_test b/scripts/vm_smoke_test
> index a88d127..6608f73 100755
> --- a/scripts/vm_smoke_test
> +++ b/scripts/vm_smoke_test
> @@ -148,10 +148,12 @@ run_test arm stretch
> # 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
>
--
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov
next prev parent reply other threads:[~2018-08-17 5:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-16 16:16 Henning Schild
2018-08-16 16:16 ` [PATCH] doc: update host dependency section Henning Schild
2018-08-16 16:24 ` [PATCH v3] conf: Add support for new debian distro "buster" Henning Schild
2018-08-17 5:29 ` Maxim Yu. Osipov [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-05-27 19:54 [PATCHv2 2/2] " Alexander Smirnov
2018-06-25 12:47 ` [PATCH v3] " Henning Schild
2018-07-13 11:13 ` Maxim Yu. Osipov
2018-07-13 12:36 ` Jan Kiszka
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=50692c99-c9e6-98b1-3a18-496c1b22561c@ilbers.de \
--to=mosipov@ilbers.de \
--cc=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