From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6589768255022301184 X-Received: by 2002:a19:d20e:: with SMTP id j14-v6mr1145469lfg.29.1534299984997; Tue, 14 Aug 2018 19:26:24 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9097:: with SMTP id l23-v6ls32725ljg.8.gmail; Tue, 14 Aug 2018 19:26:24 -0700 (PDT) X-Google-Smtp-Source: AA+uWPzVsws1WOkjK3jwyic8uOLJt0cGeQROj1NEczXDwEpvi/VprgYXm/W/zfm7YKFHnplDo4NG X-Received: by 2002:a2e:87cd:: with SMTP id v13-v6mr1006785ljj.10.1534299984448; Tue, 14 Aug 2018 19:26:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534299984; cv=none; d=google.com; s=arc-20160816; b=UNThWJ1Jtor/fBOZdSNUCD3emysaOuQKoBVaXbfvdFEQrbE6PqeKoz1b9D3U5drwSS kAKC45x+M3SvpR0NqfgustmokKA3HjcSFFRf+W9aMK2D07GwxeLxVfDRZ4s7MZVB0Gdv jWkbzoRm3JojFuaTAwmuYOFA6AZzqcmWt93Nm+gjTz1+6oaZDdbU4pOGykGq32r4jAGZ ON9OyzYtgW1h2DX45jFNN7eqLJ9pjfv+1SJ5zzqgcyOJAvNyUj1Wrlkb6RABcMmJC6ka /5YArZM6NeRxOInspqYu0SLOfm0JDH3C51nlzhSht1vbKY2KEPfJ4FNtPhWsfRslzIcn PcqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:to:from:arc-authentication-results; bh=w2EHNRNG2bv4jm1vqsUlhC7E9gDvkwi0g3Kas3WOsOE=; b=GyYUlpx/pb3jUEbcqDvSXq5HvynAewUmnC4y0Nf+p77RyM59cXiKDs7EyJTT8W1WCe VcUnZBIyhhhs6pg3VT9MPOzAYKI97ruFEJ1feQrr7pY13irebUsjKtQN+QaA9XHasxeL DAfctQR5DZ+twa8vCGPjAkdLhvv/n51GQbmf0WwN+g01pTQ3R4UcPOvAO1PzleNskpER ntO92LLAXen0zRjwSisCfoW27NjBP62NeOrjt8RcjbKW9gycNqCyygaePRf19TTtXJxo sh9VJ5dcXEJOOVxg7Kn61UrMQ8DqAIskStOVHiTVlpEfwdkgyiVb3p8Pwd00QC/tx4ur VmyQ== 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 x16-v6si740481ljj.4.2018.08.14.19.26.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Aug 2018 19:26:24 -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 azat.i.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w7F2QADB021141 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Wed, 15 Aug 2018 04:26:22 +0200 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH v2] conf: Add support for new debian distro "buster" Date: Wed, 15 Aug 2018 04:26:09 +0200 Message-Id: <20180815022609.10528-1-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 X-TUID: WU+qUEwv/c33 From: Henning Schild 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. Note: arm64-buster support is excluded so far as build on debian stretch system hangs with error "qemu: unsupported syscall 277" Signed-off-by: Henning Schild Signed-off-by: Maxim Yu. Osipov --- 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 | 3 +++ meta-isar/conf/multiconfig/qemuamd64-buster.conf | 19 +++++++++++++++++++ meta-isar/conf/multiconfig/qemuarm-buster.conf | 18 ++++++++++++++++++ meta-isar/conf/multiconfig/qemui386-buster.conf | 20 ++++++++++++++++++++ .../buildchroot/buildchroot-target.bb | 2 ++ scripts/ci_build.sh | 3 +++ scripts/vm_smoke_test | 3 +++ 10 files changed, 79 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/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..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 27b43d1..0f37121 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -41,12 +41,15 @@ BBMULTICONFIG = " \ qemuarm-wheezy \ qemuarm-jessie \ qemuarm-stretch \ + qemuarm-buster \ qemuarm64-stretch \ 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/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..24b3353 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -84,10 +84,13 @@ else bitbake $BB_ARGS \ 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: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 fi diff --git a/scripts/vm_smoke_test b/scripts/vm_smoke_test index a88d127..f2f6aea 100755 --- a/scripts/vm_smoke_test +++ b/scripts/vm_smoke_test @@ -144,14 +144,17 @@ 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 -- 2.11.0