From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6589768255022301184 X-Received: by 2002:a1c:7904:: with SMTP id l4-v6mr2509237wme.31.1534436167372; Thu, 16 Aug 2018 09:16:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f28e:: with SMTP id k14-v6ls1520000wro.6.gmail; Thu, 16 Aug 2018 09:16:06 -0700 (PDT) X-Google-Smtp-Source: AA+uWPxYO4OHHvdqyaBcElxLbxvTCXBVptWKWABMHLOVRBfPrn8NdSrA7zSxmRVwEI0iyyC5/Biu X-Received: by 2002:adf:9a32:: with SMTP id z47-v6mr257476wrb.21.1534436166979; Thu, 16 Aug 2018 09:16:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534436166; cv=none; d=google.com; s=arc-20160816; b=Ga9UjsEpc2rUB02BdN2ZAkYGHU9VRdGaFP1/yW0jfljQTa5R7J0FTP01zFghNpavnG 7ANCIWn0GbSBPwXnWpIkVs3pvaAczJRB1PZXDg/lNQNSnIWWKbr9+W9Li/LF/3yZkCZa qsmW5DfPkG/9aXlwf4Ua62tvEmvKxVr1ob2DaTyx+EEr/7PFxq+aW7WedBVPbMaIzDZk H5OjYQMjz2aLTtRbUPJZsd4l9GFRYL+dhdaF/wcMTSkmS4iHaUgj78TPsnNW2qoghu4T vP2iMRDFVyb81zmbY6DbUxWKug5aU+C2SItLGRJzqPsbSmEYsRw49gOGPj530dRpoOim f6VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=k0AgcvpIIpsHQSFQL/YNPMad7BaFqhg7lPbIiqnug2M=; b=vPtYParqNSPQxuRxZ9esXieEBf1OeJ/szeO0cCRJ/RETFuT9jVpAVIPkHfRcdaDVjF WqNtT5TuwjGgELQxWnSZsVlnxiD8ag+Ao6sEbwGUpek1Fk8Mbsi95f06psRbdQQXFwjN T3dLHUOmzaim0kye3pmnjwi4IJcIhvZaJylxba6XIP9h1a5rZ5g6c48lkXFVZEJ1twxi hxWIuoaYzGB2opm8AImx6OlbhWVkdHF75kR1j3AvAnt+Ob8ZGtB87G2B/EpVPy55Pr+a xJCCost7VP+6W/gqPXUWgQe0o1PULu0WhZi6upBWV3oQIMpLExW58FaZlisR68+GN18Z No8Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id l2-v6si37997wmh.1.2018.08.16.09.16.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Aug 2018 09:16:06 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id w7GGG6io019183 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 16 Aug 2018 18:16:06 +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 w7GGG6vx021071; Thu, 16 Aug 2018 18:16:06 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v3] conf: Add support for new debian distro "buster" Date: Thu, 16 Aug 2018 18:16:03 +0200 Message-Id: <20180816161604.26214-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.16.4 X-TUID: 5/mYDps77Vvn 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 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 -- 2.16.4