From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6719774910994972672 X-Received: by 2002:adf:aac8:: with SMTP id i8mr11981533wrc.56.1564569517330; Wed, 31 Jul 2019 03:38:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:9321:: with SMTP id 30ls20377206wro.1.gmail; Wed, 31 Jul 2019 03:38:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqyolrql5X0YW0AgyYeOiplWPvSYAu2eGDVVdgg+5JkO/DjEkDmANhlTvh+dBDfw3rpv64ej X-Received: by 2002:a5d:6a52:: with SMTP id t18mr32767636wrw.178.1564569516916; Wed, 31 Jul 2019 03:38:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564569516; cv=none; d=google.com; s=arc-20160816; b=oe5QpuXGnObjac6zIy2RxpKhugxoPjCRwB47iNYrTQkFkZPEL1WeP/BAyBU52zpO6e pp1L4htIEobPE3W1TESsZil23nWjuglFiRrxQ2bK7NIHSu6c66eO6FaAg73mwrGi5QIt 6BNwMSPUEnzsNWTytaykTcOTc9izczL7TX/+Bmg155NTP90P4oCyUa/XQDYilv1Eitbb VH9zz31tEA+dcqOeFiENlU6CPshjvx1HR7FZAMY7IxAgi07K83TZlGULMCgqR9TdTZ7v AJZoALkf91hDZIVL09IgKVmqbyVAOuQzo/EWXWF+GbmShGbh+PACzD9fAIPqbk2bkya3 CJPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=06DTRL41KK/lsr+I4JsUr87Rnplls/lyd7eLEe+5pAE=; b=iWK4KWmW8bf//Xu3lC5yFzFS2MOkYvPAf+c5z7pqHa7WUBO/hTPfdr+IwWLs+F/1AD zuLbmJbVAk9OvoOc9LVJShAEMcDBpZ0DGySXoOcuJWymeZLiDcN9B++GXso7pbpMIRkp wZFnvFbwJrWlwH93RgguceO+j2C5wud/u1z/qoj+DWu4zO6CkZR6nQ7fmx2LSZicU8uF ydOIGCWfFd7iqwvXbYw9vMRTwSpsOre+AMX+yhdtKgoINONH9I1wL5schAYnFLPCkLUa jUcdFPxEki6bW9ZdzSUlFlxyMyNBK2VQnk2RybMuU+uCOYK8AFngHb+BFHw+iCcT5D1u 0OGA== 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id p4si2166358wme.2.2019.07.31.03.38.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Jul 2019 03:38:36 -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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=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 x6VAcahK025078 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 31 Jul 2019 12:38:36 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.71]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x6VAca8v026606; Wed, 31 Jul 2019 12:38:36 +0200 From: Henning Schild To: isar-users Cc: Henning Schild , Henning Schild Subject: [PATCH 2/3] conf: add new debian version "bullseye" Date: Wed, 31 Jul 2019 12:38:34 +0200 Message-Id: <20190731103835.21656-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190731103835.21656-1-henning.schild@siemens.com> References: <20190731103835.21656-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 9bX+6Qxth8TW From: Henning Schild Add all configuration files and CI targets. Signed-off-by: Henning Schild --- meta-isar/conf/local.conf.sample | 9 +++++++-- .../conf/multiconfig/qemuamd64-bullseye.conf | 20 +++++++++++++++++++ .../conf/multiconfig/qemuarm-bullseye.conf | 16 +++++++++++++++ .../conf/multiconfig/qemuarm64-bullseye.conf | 18 +++++++++++++++++ .../conf/multiconfig/qemui386-bullseye.conf | 17 ++++++++++++++++ .../conf/multiconfig/qemumipsel-bullseye.conf | 17 ++++++++++++++++ meta/conf/distro/debian-bullseye.conf | 17 ++++++++++++++++ meta/conf/distro/debian-bullseye.list | 6 ++++++ scripts/ci_build.sh | 6 ++++++ 9 files changed, 124 insertions(+), 2 deletions(-) create mode 100644 meta-isar/conf/multiconfig/qemuamd64-bullseye.conf create mode 100644 meta-isar/conf/multiconfig/qemuarm-bullseye.conf create mode 100644 meta-isar/conf/multiconfig/qemuarm64-bullseye.conf create mode 100644 meta-isar/conf/multiconfig/qemui386-bullseye.conf create mode 100644 meta-isar/conf/multiconfig/qemumipsel-bullseye.conf create mode 100644 meta/conf/distro/debian-bullseye.conf create mode 100644 meta/conf/distro/debian-bullseye.list diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 6f1405f..a228dfc 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -40,18 +40,23 @@ DISTRO_ARCH ??= "armhf" BBMULTICONFIG = " \ qemuarm-stretch \ qemuarm-buster \ + qemuarm-bullseye \ qemuarm64-stretch \ qemuarm64-buster \ + qemuarm64-bullseye \ qemui386-stretch \ qemui386-buster \ + qemui386-bullseye \ qemuamd64-stretch \ + qemuamd64-buster \ + qemuamd64-buster-tgz \ + qemuamd64-bullseye \ qemumipsel-stretch \ qemumipsel-buster \ + qemumipsel-bullseye \ bananapi-stretch \ de0-nano-soc-stretch \ hikey-stretch \ - qemuamd64-buster \ - qemuamd64-buster-tgz \ nand-ubi-demo-buster \ rpi-stretch \ " diff --git a/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf b/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf new file mode 100644 index 0000000..d0b79f7 --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf @@ -0,0 +1,20 @@ +# This software is a part of ISAR. + +MACHINE ?= "qemuamd64" + +DISTRO ?= "debian-bullseye" +DISTRO_ARCH ?= "amd64" + +KERNEL_NAME ?= "amd64" + +IMAGE_TYPE ?= "wic-img" +WKS_FILE ?= "sdimage-efi" +IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" + +IMAGE_INSTALL += "sshd-regen-keys" + +QEMU_ARCH ?= "x86_64" +QEMU_MACHINE ?= "q35" +QEMU_CPU ?= "" +QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE## -bios /usr/local/share/ovmf/OVMF.fd" + diff --git a/meta-isar/conf/multiconfig/qemuarm-bullseye.conf b/meta-isar/conf/multiconfig/qemuarm-bullseye.conf new file mode 100644 index 0000000..1989d90 --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuarm-bullseye.conf @@ -0,0 +1,16 @@ +# This software is a part of ISAR. + +MACHINE ?= "qemuarm" + +DISTRO ?= "debian-bullseye" +DISTRO_ARCH ?= "armhf" + +KERNEL_NAME ?= "armmp" + +QEMU_ROOTFS_DEV ?= "vda" + +QEMU_ARCH ?= "arm" +QEMU_MACHINE ?= "virt" +QEMU_CPU ?= "cortex-a15" +# TODO: start_vm doesn't support multiline vars +QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" diff --git a/meta-isar/conf/multiconfig/qemuarm64-bullseye.conf b/meta-isar/conf/multiconfig/qemuarm64-bullseye.conf new file mode 100644 index 0000000..e8dabac --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuarm64-bullseye.conf @@ -0,0 +1,18 @@ +# This software is a part of ISAR. +# Copyright (C) 2017 ilbers GmbH +# Copyright (c) Siemens AG, 2019 + +MACHINE ?= "qemuarm64" + +DISTRO ?= "debian-bullseye" +DISTRO_ARCH ?= "arm64" + +KERNEL_NAME ?= "arm64" + +QEMU_ROOTFS_DEV ?= "vda" + +QEMU_ARCH ?= "aarch64" +QEMU_MACHINE ?= "virt" +QEMU_CPU ?= "cortex-a57" +# TODO: start_vm doesn't support multiline vars +QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" diff --git a/meta-isar/conf/multiconfig/qemui386-bullseye.conf b/meta-isar/conf/multiconfig/qemui386-bullseye.conf new file mode 100644 index 0000000..0a16d10 --- /dev/null +++ b/meta-isar/conf/multiconfig/qemui386-bullseye.conf @@ -0,0 +1,17 @@ +# This software is a part of ISAR. + +MACHINE ?= "qemui386" + +DISTRO ?= "debian-bullseye" +DISTRO_ARCH ?= "i386" + +KERNEL_NAME ?= "686" + +IMAGE_TYPE ?= "wic-img" +WKS_FILE ?= "directdisk-isar" +IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}" + +QEMU_ARCH ?= "i386" +QEMU_MACHINE ?= "pc" +QEMU_CPU ?= "" +QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE##" diff --git a/meta-isar/conf/multiconfig/qemumipsel-bullseye.conf b/meta-isar/conf/multiconfig/qemumipsel-bullseye.conf new file mode 100644 index 0000000..aa3a6f8 --- /dev/null +++ b/meta-isar/conf/multiconfig/qemumipsel-bullseye.conf @@ -0,0 +1,17 @@ +# This software is a part of ISAR. +# Copyright (C) 2019 Mentor Graphics, a Siemens busines + +MACHINE ?= "qemumipsel" + +DISTRO ?= "debian-bullseye" +DISTRO_ARCH ?= "mipsel" + +KERNEL_NAME ?= "4kc-malta" + +QEMU_ROOTFS_DEV ?= "sda" + +QEMU_ARCH ?= "mipsel" +QEMU_MACHINE ?= "malta" +QEMU_CPU ?= "24Kc" +QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,format=raw" +QEMU_KARGS ?= "nokaslr" diff --git a/meta/conf/distro/debian-bullseye.conf b/meta/conf/distro/debian-bullseye.conf new file mode 100644 index 0000000..b38c3c1 --- /dev/null +++ b/meta/conf/distro/debian-bullseye.conf @@ -0,0 +1,17 @@ +# This software is a part of ISAR. + +require debian-common.conf + +BASE_DISTRO_CODENAME = "bullseye" + +HOST_DISTRO ?= "debian-${BASE_DISTRO_CODENAME}" + +DISTRO_APT_SOURCES += "conf/distro/debian-${BASE_DISTRO_CODENAME}.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 octeon powerpc64le rpi s390x marvell \ + rt-686-pae rt-amd64 rt-arm64 rt-armmp" + +IMAGE_PREINSTALL += "init" + +WIC_IMAGER_INSTALL += "python3-distutils" diff --git a/meta/conf/distro/debian-bullseye.list b/meta/conf/distro/debian-bullseye.list new file mode 100644 index 0000000..c7f23e9 --- /dev/null +++ b/meta/conf/distro/debian-bullseye.list @@ -0,0 +1,6 @@ +deb http://ftp.debian.org/debian bullseye main contrib non-free +deb-src http://ftp.debian.org/debian bullseye main contrib non-free +deb http://ftp.debian.org/debian bullseye-updates main contrib non-free +deb-src http://ftp.debian.org/debian bullseye-updates main contrib non-free +deb http://security.debian.org bullseye-security main contrib non-free +deb-src http://security.debian.org bullseye-security main contrib non-free diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 01f09b6..7da7a62 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -23,22 +23,28 @@ BB_ARGS="-v" TARGETS_SET="\ multiconfig:qemuarm-stretch:isar-image-base \ multiconfig:qemuarm-buster:isar-image-base \ + multiconfig:qemuarm-bullseye:isar-image-base \ multiconfig:qemuarm64-stretch:isar-image-base \ multiconfig:qemui386-stretch:isar-image-base \ multiconfig:qemui386-buster:isar-image-base \ + multiconfig:qemui386-bullseye:isar-image-base \ multiconfig:qemuamd64-stretch:isar-image-base \ multiconfig:qemuamd64-buster:isar-image-base \ multiconfig:qemuamd64-buster-tgz:isar-image-base \ + multiconfig:qemuamd64-bullseye:isar-image-base \ multiconfig:qemumipsel-stretch:isar-image-base \ multiconfig:qemumipsel-buster:isar-image-base \ + multiconfig:qemumipsel-bullseye:isar-image-base \ multiconfig:nand-ubi-demo-buster:isar-image-ubi \ multiconfig:rpi-stretch:isar-image-base" # qemu-user-static of <= buster too old to build that # multiconfig:qemuarm64-buster:isar-image-base + # multiconfig:qemuarm64-bullseye:isar-image-base CROSS_TARGETS_SET="\ multiconfig:qemuarm-stretch:isar-image-base \ multiconfig:qemuarm-buster:isar-image-base \ + multiconfig:qemuarm-bullseye:isar-image-base \ multiconfig:qemuarm64-stretch:isar-image-base \ multiconfig:qemuamd64-stretch:isar-image-base \ multiconfig:de0-nano-soc-stretch:isar-image-base \ -- 2.21.0