From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6589768255022301184 X-Received: by 2002:a1c:9e42:: with SMTP id h63-v6mr2708274wme.10.1534436653913; Thu, 16 Aug 2018 09:24:13 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:2d41:: with SMTP id t62-v6ls1125693wmt.11.canary-gmail; Thu, 16 Aug 2018 09:24:13 -0700 (PDT) X-Google-Smtp-Source: AA+uWPxHyfBLZrFuct1L2ijaSzyrg88gDussaqNn9vcSa2tp5c5E/kYH1eQLKPQ+DRnRJNYV5nxW X-Received: by 2002:a1c:e714:: with SMTP id e20-v6mr2455471wmh.31.1534436653485; Thu, 16 Aug 2018 09:24:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534436653; cv=none; d=google.com; s=arc-20160816; b=WlgaIwoQi8e7BvHBlnD2/N/zniSUXdxpNsr/EJj2jZa2WSGBOQTtAK9LlGtopXi71V uvNDV9L786YYP5POxFrLYG0qkagRT6Q+fbuEliFcc2UhR2TpFBShCN36wiyxP7UDhjJk Wq+uYSlZvh42St20/TuemH9inw9F7YtbYcjOjF0+enFrx02Bl9vZmqDFUn/20NesfiBL F3Uu6ZUAnTShaOqCIzzLB1Zkm/iqNqsBYWxUu/Ru1PFYgPYJFkJfXMbEpHAQakLy41sX xw098+aS6gH/9gRxnUL8drnh8So8phFdcTTBfMeSnvl4itd0PH7NedEgg1EOPTSyecMC 8icA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:to:from:date:arc-authentication-results; bh=KgnXkJVaUn2meAMscnFQtzYRZcVh4DIs2nJMnKbWWGM=; b=lORKNMKfRxG6tgLUw0VMmOOXBA7wiiVeIoWMSJQPBdXAiu9zisrGUCQVfsZxP7Wqb/ jiknzWXI8lDecmjYzuw7EaQqE1fSi02Mr+tf/9GAq9Huv+ch0Nt5cePuoyJLdmkdRs3F WWu1e0wI4nmBVQn8UeSlOSM/kbaVOxZeJrPCKFABBJit8SoUQrecbzl9++py+GFe7PRv CtEGomYYG+rUiUyPDMXgSFuvLBXs/4ho2NgQjNEE1EOb7QaunkGjRMHZKQAIEcR71zUe SfhQ4nbmWwks6CuYrULhQ1Cfdi9r0H7xNrgBnMAEf+QZGRLt0YA+hasq80dm5AbW2WBd bRlg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id i13-v6si1148194wrh.5.2018.08.16.09.24.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Aug 2018 09:24:13 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w7GGOCwm001645 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 16 Aug 2018 18:24:13 +0200 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id w7GGOChg005242 for ; Thu, 16 Aug 2018 18:24:12 +0200 Date: Thu, 16 Aug 2018 18:24:11 +0200 From: Henning Schild To: Subject: Re: [PATCH v3] conf: Add support for new debian distro "buster" Message-ID: <20180816182411.2b11a710@md1pvb1c.ad001.siemens.net> In-Reply-To: <20180816161604.26214-1-henning.schild@siemens.com> References: <20180816161604.26214-1-henning.schild@siemens.com> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: 7JiBen2YhJRN Am Thu, 16 Aug 2018 18:16:03 +0200 schrieb Henning Schild : > 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. > > Signed-off-by: Henning Schild > --- > 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 This is a note to ourselfs and might be just enough "documentation". At this stage the "buster" support is still a hidden feature, the user manual does not mention it yet. Henning > 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