From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6906006289225089024 X-Received: by 2002:a67:fc87:: with SMTP id x7mr20895114vsp.38.1607929890827; Sun, 13 Dec 2020 23:11:30 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a67:fc4d:: with SMTP id p13ls1842046vsq.7.gmail; Sun, 13 Dec 2020 23:11:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJwp+8tLtOnuhXVfOVoRbPNlHjNe4DcnXSsQkHuo8Ll9OIZaN0+DQ0AdBlpu4ODbTllMtIY6 X-Received: by 2002:a05:6102:3111:: with SMTP id e17mr23030608vsh.3.1607929890341; Sun, 13 Dec 2020 23:11:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607929890; cv=none; d=google.com; s=arc-20160816; b=rPFv0MPd2aRS7wjDVrRIN4G550haH+RRqw5UgVJhTusryjEbnAJuWvAztOiMdkTsaK WDo9ldXOsv5zXGXU7S/KCqzfK1+BSdMsBzUnx9mbkYgbqA7/U8tpX/CaoIO86JJTwrlb Xg+7SD+4MA8z/Pcsj1o8qH+uMRH4Non/y5aScbuBE6ohCaZ2bGjdX70DKgVvW4PSHQrM CuWplJzwYR/tjYr94eAp8hub1oqSpEW3mamE0iZWhTFu/3/6f99pq3QeL1JtwXGqd455 4VfZe9EHAUcc7TVdGOr6sRWPyUTqwEiavssIiJU7p6pa5sXo36eGgRfpBUAMVBDPP8GA KDsA== 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=Bxix/KwOLjD9FN0Lbxq+kzHypCwwH2O9Dxo4R+0AADE=; b=XtVM5S4JER6qXp/cAyKrZaChh2fa5GMHfd9a+0+lPymD4nhnhMiOYw7nHkZSfxmC+Q enN4fcCr+NpFWdeNCt9yP+zGp03NCfmDD3qxa64aXzGE/mtsDLZ+BEnRpm6Lfe1Xx9PX mVNsXyIOkBE3/dkTcCGndiJS7yJvNqmEL//l8AqN8uLrzIDuE3OzYfTffHT573Dez9UP Okuj3le04MHozN2DbvFATFP9tO6BOmO9PwlRr8P5RtHK8GKZGasoBRIMjXlcSKTHuDrA KOUFYRf4YykPbWhH0ikYC2reeeNWEt3Z7yVns61nYfefJSyqpEcAfwMI2WTAeU7rIqBX 6DKw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id e2si1385837vkk.0.2020.12.13.23.11.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 Dec 2020 23:11:30 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 0BE7BS1d003289 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 14 Dec 2020 08:11:28 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.38.225]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 0BE7BRXc030825; Mon, 14 Dec 2020 08:11:28 +0100 From: Jan Kiszka To: isar-users Cc: Henning Schild Subject: [PATCH 5/6] meta-isar: Add new distro ubuntu with suite "focal" Date: Mon, 14 Dec 2020 08:11:26 +0100 Message-Id: <22425854d3904c7b70c8aab541cabd733760bd1d.1607929886.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: EoBJG5ynjcFC From: Henning Schild Show that Isar can even build that popular distribution. Signed-off-by: Henning Schild [Jan: rebased, switched to 20.04/focal] Signed-off-by: Jan Kiszka --- meta-isar/conf/distro/ubuntu-focal-ports.list | 6 +++++ meta-isar/conf/distro/ubuntu-focal.conf | 24 +++++++++++++++++++ meta-isar/conf/distro/ubuntu-focal.list | 6 +++++ meta-isar/conf/local.conf.sample | 2 ++ meta-isar/conf/machine/qemuamd64.conf | 1 + meta-isar/conf/machine/qemuarm64.conf | 1 + .../conf/multiconfig/qemuamd64-focal.conf | 7 ++++++ .../conf/multiconfig/qemuarm64-focal.conf | 7 ++++++ scripts/ci_build.sh | 6 +++-- scripts/start_vm | 6 ++--- scripts/vm_smoke_test | 1 + 11 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 meta-isar/conf/distro/ubuntu-focal-ports.list create mode 100644 meta-isar/conf/distro/ubuntu-focal.conf create mode 100644 meta-isar/conf/distro/ubuntu-focal.list create mode 100644 meta-isar/conf/multiconfig/qemuamd64-focal.conf create mode 100644 meta-isar/conf/multiconfig/qemuarm64-focal.conf diff --git a/meta-isar/conf/distro/ubuntu-focal-ports.list b/meta-isar/conf/distro/ubuntu-focal-ports.list new file mode 100644 index 00000000..7e2d50f0 --- /dev/null +++ b/meta-isar/conf/distro/ubuntu-focal-ports.list @@ -0,0 +1,6 @@ +deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports focal main restricted universe multiverse +deb-src [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports focal main restricted universe multiverse +deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse +deb-src [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse +deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports focal-security main restricted universe multiverse +deb-src [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports focal-security main restricted universe multiverse diff --git a/meta-isar/conf/distro/ubuntu-focal.conf b/meta-isar/conf/distro/ubuntu-focal.conf new file mode 100644 index 00000000..0e4557e2 --- /dev/null +++ b/meta-isar/conf/distro/ubuntu-focal.conf @@ -0,0 +1,24 @@ +# +# Copyright (c) Siemens AG, 2018-2020 +# +# SPDX-License-Identifier: MIT + +require conf/distro/debian-common.conf + +DISTRO_APT_SOURCES_arm64 ?= "conf/distro/${DISTRO}-ports.list" +HOST_DISTRO_APT_SOURCES_append_arm64 = " ${DISTRO_APT_SOURCES}" + +BASE_DISTRO_CODENAME = "focal" + +# that is what debootstrap_1.0.118ubuntu1 does anyways +DISTRO_DEBOOTSTRAP_SCRIPT = "/usr/share/debootstrap/scripts/gutsy" + +DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh" + +DISTRO_KERNELS ?= " \ + aws azure azure-edge gcp generic gke kvm lowlatency oem virtual \ + snapdragon generic-lpae" + +IMAGE_PREINSTALL += "init" + +WIC_IMAGER_INSTALL += "python3-distutils" diff --git a/meta-isar/conf/distro/ubuntu-focal.list b/meta-isar/conf/distro/ubuntu-focal.list new file mode 100644 index 00000000..52a0b3f7 --- /dev/null +++ b/meta-isar/conf/distro/ubuntu-focal.list @@ -0,0 +1,6 @@ +deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu focal main restricted universe multiverse +deb-src [arch=amd64,i386] http://archive.ubuntu.com/ubuntu focal main restricted universe multiverse +deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu focal-updates main restricted universe multiverse +deb-src [arch=amd64,i386] http://archive.ubuntu.com/ubuntu focal-updates main restricted universe multiverse +deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu focal-security main restricted universe multiverse +deb-src [arch=amd64,i386] http://archive.ubuntu.com/ubuntu focal-security main restricted universe multiverse diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 3e435724..107496c1 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -63,6 +63,8 @@ BBMULTICONFIG = " \ stm32mp15x-buster \ rpi-stretch \ sifive-fu540-sid-ports \ + qemuarm64-focal \ + qemuamd64-focal \ " # diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf index 29fc579e..238bc907 100644 --- a/meta-isar/conf/machine/qemuamd64.conf +++ b/meta-isar/conf/machine/qemuamd64.conf @@ -4,6 +4,7 @@ DISTRO_ARCH ?= "amd64" KERNEL_NAME ?= "amd64" +KERNEL_NAME_ubuntu-focal ?= "generic" IMAGE_TYPE ?= "wic-img" WKS_FILE ?= "sdimage-efi" diff --git a/meta-isar/conf/machine/qemuarm64.conf b/meta-isar/conf/machine/qemuarm64.conf index 246da5a5..e5e762ff 100644 --- a/meta-isar/conf/machine/qemuarm64.conf +++ b/meta-isar/conf/machine/qemuarm64.conf @@ -4,6 +4,7 @@ DISTRO_ARCH ?= "arm64" KERNEL_NAME ?= "arm64" +KERNEL_NAME_ubuntu-focal ?= "generic" IMAGE_TYPE ?= "ext4-img" diff --git a/meta-isar/conf/multiconfig/qemuamd64-focal.conf b/meta-isar/conf/multiconfig/qemuamd64-focal.conf new file mode 100644 index 00000000..d3566ada --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuamd64-focal.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) Siemens AG, 2018-2020 +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "qemuamd64" +DISTRO ?= "ubuntu-focal" diff --git a/meta-isar/conf/multiconfig/qemuarm64-focal.conf b/meta-isar/conf/multiconfig/qemuarm64-focal.conf new file mode 100644 index 00000000..1cbc8fb8 --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuarm64-focal.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) Siemens AG, 2018-2020 +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "qemuarm64" +DISTRO ?= "ubuntu-focal" diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index f4c33a37..a8d9ad97 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -31,7 +31,8 @@ TARGETS_SET="\ mc:qemumipsel-stretch:isar-image-base \ mc:qemumipsel-buster:isar-image-base \ mc:nand-ubi-demo-buster:isar-image-ubi \ - mc:rpi-stretch:isar-image-base" + mc:rpi-stretch:isar-image-base \ + mc:qemuamd64-focal:isar-image-base" # qemu-user-static of <= buster too old to build that # mc:qemuarm64-buster:isar-image-base # mc:qemuarm64-bullseye:isar-image-base @@ -50,7 +51,8 @@ CROSS_TARGETS_SET="\ mc:qemuamd64-stretch:isar-image-base \ mc:de0-nano-soc-buster:isar-image-base \ mc:stm32mp15x-buster:isar-image-base \ - mc:rpi-stretch:isar-image-base" + mc:rpi-stretch:isar-image-base \ + mc:qemuarm64-focal:isar-image-base" CROSS_TARGETS_SET_BULLSEYE="\ mc:qemuarm-bullseye:isar-image-base \ diff --git a/scripts/start_vm b/scripts/start_vm index eda49462..dfa14c95 100755 --- a/scripts/start_vm +++ b/scripts/start_vm @@ -109,10 +109,10 @@ readonly ISARROOT="$(dirname "$0")"/.. readonly MACHINE_CONF=$ISARROOT/meta-isar/conf/machine/qemu$ARCH.conf eval "$(egrep 'MACHINE_SERIAL|QEMU_' $MACHINE_CONF |bb2sh)" -eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^IMAGE_TYPE=") +eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "\(^IMAGE_TYPE=\|^IMAGE_FULLNAME=\)") case "$IMAGE_TYPE" in ext4-img) - readonly ROOTFS_IMAGE=isar-image-base-debian-$DISTRO-qemu$ARCH.ext4.img + readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.ext4.img eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^KERNEL_IMAGE=") eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^INITRD_IMAGE=") @@ -129,7 +129,7 @@ case "$IMAGE_TYPE" in KARGS="console=$MACHINE_SERIAL root=/dev/$QEMU_ROOTFS_DEV rw $QEMU_KARGS" ;; wic-img) - readonly ROOTFS_IMAGE=isar-image-base-debian-$DISTRO-qemu$ARCH.wic.img + readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.wic.img EXTRA_ARGS="$EXTRA_ARGS -snapshot" ;; *) diff --git a/scripts/vm_smoke_test b/scripts/vm_smoke_test index 237205e2..ce082137 100755 --- a/scripts/vm_smoke_test +++ b/scripts/vm_smoke_test @@ -152,6 +152,7 @@ run_test arm buster # AMD64 machine if [ -z "$FAST_BUILD" ]; then run_test amd64 buster + run_test amd64 focal fi run_test amd64 stretch -- 2.26.2