From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6559169328210509824 X-Received: by 2002:a7b:c047:: with SMTP id u7-v6mr114948wmc.9.1529930845900; Mon, 25 Jun 2018 05:47:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f809:: with SMTP id s9-v6ls1748295wrp.10.gmail; Mon, 25 Jun 2018 05:47:25 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeTBOMsv6CxEFC1YYu/0qj8kFhODXyQoJJYBOV9SlcOzrYmfXXfVvreldRfyhd1Ez4fBEOj X-Received: by 2002:a5d:4703:: with SMTP id y3-v6mr131520wrq.30.1529930845337; Mon, 25 Jun 2018 05:47:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529930845; cv=none; d=google.com; s=arc-20160816; b=irMDbaW6XipaCgqmshA++NmtD6I1ytTW/sHeaq1shaBN7qOPOGOcMCzI1TkRbSzAtF gOY6J+l+liWu71tuNwyaIvrMEaB1HW7fXLZ6jNAu1PEe7Qxb1rIil6YzqcuLQxmSXDoj OAIUHZz+rCenoS6wszvya20qBsFoK35Q3aLHIEnujX7T7N0CzgopZiDxY6iJfILgm6YB cCpnHZBVNQHUy2UZ8I3j32paOjiZSoF/kq1j6mNPk5dDlWOeLgb2TLffthjiB11iSqf9 dKJS9WGiDPVb9h2BGGu/EQDXU+uU1fz/sG1oYrCzAWIsnwuq0JuXj6Bwglf1irwmD6IQ ZMlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=i2iL4FoTMIRVexQtDtFZnDTiBCe8hAmPMyX23o6K9Gs=; b=BZ2p9CZi7qatUcq7QkBsdVSeQMcEwnJCrw3nWF/GDNYamIYe2nHeNEsAwzIEUSI0/4 w3+1yymSHmOU8/DpGwq0M6ShUkQn8VW2FbS+/cH/W+9vwhBPfGuYRkytv/KGil5cM+k9 sDIaQ35mrAEx+EBw0n1j7BMnTlsixGlhKaQxnMC2gSdyv4KY+7wqZQGqszZ5A6nyBSiA ggTiX874oJwbxTKa3P01HaMr/DtO1lcQZzaaqWK6DANsRMPqK5lhc2phFdl9TPODHcbE hzM8G0XtHqcjOTu8t9DIBk/BhJA2top12qb/5k78DsNA3xnqP2WQYdFUjTGUs++Qe5MP ZpDA== 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 t26-v6si151155wmh.1.2018.06.25.05.47.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jun 2018 05:47:25 -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 mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id w5PClOp2032478 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 25 Jun 2018 14:47:25 +0200 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id w5PClOh7015261; Mon, 25 Jun 2018 14:47:24 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Alexander Smirnov , "Maxim Yu. Osipov" , Henning Schild Subject: [PATCH v3] conf: Add support for new debian distro "buster" Date: Mon, 25 Jun 2018 14:47:22 +0200 Message-Id: <20180625124722.1894-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: X-TUID: IGCjI3RQdht2 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 | 7 +++++++ 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 | 18 ++++++++++++++++++ meta-isar/conf/multiconfig/qemui386-buster.conf | 20 ++++++++++++++++++++ meta/recipes-devtools/buildchroot/buildchroot.bb | 2 ++ scripts/ci_build.sh | 4 ++++ scripts/vm_smoke_test | 4 ++++ 11 files changed, 100 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 9921f3a..55261bf 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -53,7 +53,7 @@ Install the following packages: ``` dosfstools git -debootstrap +debootstrap/jessie-backports# for debian >= "buster" parted python qemu 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 16ef488..ddb077f 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..55ed421 --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuarm64-buster.conf @@ -0,0 +1,18 @@ +# This software is a part of ISAR. + +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.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb index 2ed5cf2..b6b87cb 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.bb +++ b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -37,6 +37,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 fec0000..ce8ccc2 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -76,9 +76,13 @@ bitbake $BB_ARGS \ multiconfig:qemuarm-wheezy:isar-image-base \ 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:qemuarm64-buster: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 diff --git a/scripts/vm_smoke_test b/scripts/vm_smoke_test index a88d127..2205df1 100755 --- a/scripts/vm_smoke_test +++ b/scripts/vm_smoke_test @@ -144,16 +144,20 @@ 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 +run_test arm64 buster exit $RET -- 2.16.4