From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6545799947022761984 X-Received: by 10.46.114.1 with SMTP id n1mr115507ljc.34.1524062814630; Wed, 18 Apr 2018 07:46:54 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:7d8a:: with SMTP id y132-v6ls524533lfc.6.gmail; Wed, 18 Apr 2018 07:46:54 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/ZGXULyfFuXuwKhMX4KSGb78RZg+31QkoO2g7Efb8EP/5hE0a/nTK+DtwSRqaAMFh7s1Qk X-Received: by 2002:a19:a583:: with SMTP id o125-v6mr145205lfe.36.1524062814085; Wed, 18 Apr 2018 07:46:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524062814; cv=none; d=google.com; s=arc-20160816; b=blSBeLlGv5C33FXcQl9kGoY8u21fH3vxSglDINr5wNCFVl9n1gTTEeDge3ejLHuaAd nzRyG5JYWZp18MdDSyYTGC6DgaSFHh9A3oPuC7TBbOVMb9MkKGLxlN9ca3hM7mLGav96 FtwHPTNcfNueDbq6RKO9q4pm5fxtUZ6yolsWGpzNeIoLX2XPJUf4NxmHqD3XX8OERP/W SfOLQVExecefMIioF7DYWl0K4gLK2ONiJChknyyQdYlXHLe+sc3l0Cr18g2hBW5xKyPH aB+U7iFvmqMBcvCwuNL9zEiMMKvm5aMwup7h5ZL485XqeVe9BYIMHdVanF2NptF67PMD ZekA== 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=h7uZqb98AyiG5AujpLVN1W95+rifoRZJTZbuNZUvWtU=; b=Xqvx2jgwcguNOKLpL2RRqeOF6ao3fa0icuGCe1I+opbc2gpgCJne0YqFGOoJcD1Jdj VX4Pl7zOP3U5qqlMNRJSFam8GCbUfdeD72wl0QckzAlXGk65nnOH24Mh5bBBzCoqgx3e XfeqgAl7Y7S0eVOOU5K1PKr9ExLjfWEV6sHBNM3YSz3D5xstUu3zB3+IVnL1v8kLFLLz fxfs0igdq/NXUs1GbbifsFRKrG5/zHI8+zxQr5rTLkAqD3A2Za6oddBUrNeqmaZWyZBY /QNAjRqmZIuSrK5haSBzFOT0XEEzOAzkKuXKckZlt9YJsJKgMbbVoJc+23O3DVE45SAs EFgw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id p138-v6si79469lfd.0.2018.04.18.07.46.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Apr 2018 07:46:54 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id w3IEkrPb020743 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 18 Apr 2018 16:46:53 +0200 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w3IEkrp0028323; Wed, 18 Apr 2018 16:46:53 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH] conf: Add support for new debian distro "buster" Date: Wed, 18 Apr 2018 16:46:50 +0200 Message-Id: <20180418144650.18083-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.16.1 X-TUID: qnzHlrvlZSk1 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 | 17 +++++++++++++++++ meta-isar/conf/multiconfig/qemuarm-buster.conf | 18 ++++++++++++++++++ meta-isar/conf/multiconfig/qemuarm64-buster.conf | 18 ++++++++++++++++++ meta-isar/conf/multiconfig/qemui386-buster.conf | 17 +++++++++++++++++ scripts/ci_build.sh | 4 ++++ scripts/vm_smoke_test | 4 ++++ 10 files changed, 93 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 058f7bd..2bd3793 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -58,7 +58,7 @@ git grub-efi-amd64-bin # wic UEFI: /usr/lib/grub/x86_64-efi/moddep.lst grub-efi-ia32-bin # wic UEFI: /usr/lib/grub/i386-efi/moddep.lst mtools # wic FAT: mcopy -debootstrap +debootstrap/jessie-backports# for debian >= "buster" parted python python3 # wic 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 39875c1..1ef86d7 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..32b49d3 --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf @@ -0,0 +1,17 @@ +# This software is a part of ISAR. + +MACHINE ?= "qemuamd64" + +DISTRO ?= "debian-buster" +DISTRO_ARCH ?= "amd64" + +KERNEL_NAME ?= "amd64" + +IMAGE_PREINSTALL += "init" + +ROOTFS_DEV ?= "sda" + +QEMU_ARCH ?= "x86_64" +QEMU_MACHINE ?= "pc" +QEMU_CPU ?= "" +QEMU_ROOTFS_DEV ?= "-hda ##ROOTFS_IMAGE##" 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..5442c8d --- /dev/null +++ b/meta-isar/conf/multiconfig/qemui386-buster.conf @@ -0,0 +1,17 @@ +# This software is a part of ISAR. + +MACHINE ?= "qemui386" + +DISTRO ?= "debian-buster" +DISTRO_ARCH ?= "i386" + +KERNEL_NAME ?= "686-pae" + +IMAGE_PREINSTALL += "init" + +ROOTFS_DEV ?= "sda" + +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 e941f8c..c977ec7 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -26,9 +26,13 @@ bitbake -v \ 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 fde0e05..555541b 100755 --- a/scripts/vm_smoke_test +++ b/scripts/vm_smoke_test @@ -71,16 +71,20 @@ run_test () { run_test arm wheezy 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