From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6589768255022301184 X-Received: by 2002:a1c:c90f:: with SMTP id f15-v6mr2796993wmb.0.1534483772391; Thu, 16 Aug 2018 22:29:32 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:826a:: with SMTP id 97-v6ls1905493wrb.0.gmail; Thu, 16 Aug 2018 22:29:31 -0700 (PDT) X-Google-Smtp-Source: AA+uWPwC/RedMPoCwP/HMJUms+PBopWS73UNzyFfrMx6Prd5vDZ5pDqOeGjU6kPbX/7fp/FJddWb X-Received: by 2002:a5d:52c1:: with SMTP id r1-v6mr2916688wrv.0.1534483771917; Thu, 16 Aug 2018 22:29:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534483771; cv=none; d=google.com; s=arc-20160816; b=G9kjsx8gwO5FLubUDbDLL+vcBYi0z+JpCGv0fucd+8NU2ghnmfauWPlzhHB0BF0woQ Dxa2ieBM/IGqt4tbpGH4KnxgCPJwPfevWcHOu8BVi34VEivaO4VGH0FmHSKErossxzpK KSBWXq8Q8LOBKznpfDFd1sAo21Y4E8glL3on9jJLVn6vU/+FxPFmJS6yaofF27gfu7Lw 8ZH9hd9fAPey/kktvhMX/EwdsDT48Df7Fpcr0la3C2U14rlkYR53Puqh7PHY77ea6XtS buAaBzuVtvUbzLi0eZnMzeCdg+u9xnSEPiDH/xEicHdWrs3cMPBIHZF+kJvnui8PR7PY JwaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:organization:from:references:to:subject :arc-authentication-results; bh=mPhSXZiaQtb6cL9/FNfyaAmdNgEDzHPuHnzCCd5a9eg=; b=JSxQICaFR8jLjToeGhp2QtqhKhB0UmhI4RM5Q8Ynaa1XqW84ca2aEmulGNVCnYSCm6 JgfCZOQvydDWMzThLbdznPz5QUCtsfKrW3jppgtvcRvY0gVJ5U5vswcrx97pmOk9avJp IoVIikU10W+n86ZUVyLcZRaQqmg2Ps0FT3JRE61FPMoZDCvkau6oDitw2AUpUpIdNwW9 maZNZ+MjgVhHmlU2PKbk9Hk4Dwju0GsYEW01ahbIWKR+t0Z+Ls0Dt0ZWjJ0UbCTD6Zjr 9Ofcpj5+GMliFzJxPDF6QHIonj8KrgR3ELnDW6/4vweoLDmcTDdbbn+ug8zC3KAIB4Hz wrRQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id j17-v6si17677wme.0.2018.08.16.22.29.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Aug 2018 22:29:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from [192.168.50.180] (nat-ppp-217.71.235.199-satnet-spb.ru [217.71.235.199] (may be forged)) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w7H5TSKK004953 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Fri, 17 Aug 2018 07:29:30 +0200 Subject: Re: [PATCH v3] conf: Add support for new debian distro "buster" To: Henning Schild , isar-users@googlegroups.com References: <20180816161604.26214-1-henning.schild@siemens.com> From: "Maxim Yu. Osipov" Organization: ilbers GmbH Message-ID: <50692c99-c9e6-98b1-3a18-496c1b22561c@ilbers.de> Date: Fri, 17 Aug 2018 08:29:23 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20180816161604.26214-1-henning.schild@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: yrzbcV1LnZJH 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 > --- > 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