From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6559169328210509824 X-Received: by 2002:a19:7412:: with SMTP id v18-v6mr62635lfe.5.1527175616342; Thu, 24 May 2018 08:26:56 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:ae0a:: with SMTP id f10-v6ls1412486lfc.14.gmail; Thu, 24 May 2018 08:26:55 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqKmUlaSzbhjKoMGo9XUso7Y0E6wkNo82eY7pPLYgGVvoptgUDVyEgxBbyLMsshuP5S51yQ X-Received: by 2002:a19:7907:: with SMTP id u7-v6mr345472lfc.33.1527175615669; Thu, 24 May 2018 08:26:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527175615; cv=none; d=google.com; s=arc-20160816; b=TwpDUDZx8TBzNiNdl7rJLVN0iUnrgh0fKGBgBTWJoTbXs2rLaCI/t4mjiUpSquATbk 5zkYBXJNDBfQLiXRxJiLvX53wmdi5HzZkQcXNQW6hLI9pwp1vn6Z0UzfLulrId9F1Buo +tSA/GfHyLoPkS7z0bR9qIHINsEfDOd2adnTulfv3SvJWwX4rzlkaOwGIu/n1QhctvLQ 35O8yd+n8LDDcW73Dpw4rMJLWeJJARy3qzxg12NvCPBJT3fQGosljdwvg9iRn8OrbbLh VcPWu4fG6f5X9hfqRV5AbVa3csy6UB+aKzaFwp/DOIEhEzq9zDX+brtItx1Mey417Kki KnFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=u9NL14Y+a4r+y+w5vRdInQjpHsHVJgNbdtkUZEinTKQ=; b=J6XeWgjag6vBjVHvlF20k9vl/Q2hVgNkNw/wz9BVLy8L7gIeOctaiaBB4IJm1+bljJ D1tTwhNd9s5DB8TJUk9hyg6IuNJ+jL0hJUO3YgaoVyEcUejgpCtpfNf9FyhPgGrMpEQ+ Ezv8oIMQqT8d3m9QemW1NoYyZE4zKgeSx8emxbhJbN9RdXpFrqXGD2njMed5MTKVsgfq k9VzdC2awkYXNxDdzuKejgalokMmfnf4fZVuA99k+b39InP531UFKfKGQM0PHAMBGkeg AskQm8G6URRR4EC/u7dKXDeEdL01yZWLgOpN4TaV/kgx3IhE1F3BOHeFFoAIa5tkG4K5 bLJg== 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 y205-v6si684557lfa.0.2018.05.24.08.26.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 May 2018 08:26:55 -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 mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w4OFQsmM010041 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 24 May 2018 17:26:55 +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 w4OFQs5s007182; Thu, 24 May 2018 17:26:54 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Alexander Smirnov , Henning Schild Subject: [PATCHv2 2/2] conf: Add support for new debian distro "buster" Date: Thu, 24 May 2018 17:26:52 +0200 Message-Id: X-Mailer: git-send-email 2.16.1 In-Reply-To: References: In-Reply-To: References: X-TUID: wWMn81t2UvG4 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 ++++++++++++++++++++ scripts/ci_build.sh | 4 ++++ scripts/vm_smoke_test | 4 ++++ 10 files changed, 98 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 a2f4b92..5bba720 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 390cc4c..a9fa6cb 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -41,11 +41,15 @@ BBMULTICONFIG = " \ qemuarm-wheezy \ qemuarm-jessie \ qemuarm-stretch \ + qemuarm-buster \ qemuarm64-stretch \ + qemuarm64-buster \ qemui386-jessie \ qemui386-stretch \ + qemui386-buster \ qemuamd64-jessie \ qemuamd64-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/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.1