From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6624140832816496640 X-Received: by 2002:adf:b6ab:: with SMTP id j43mr342685wre.22.1542302973858; Thu, 15 Nov 2018 09:29:33 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:5287:: with SMTP id c7-v6ls5715334wrv.14.gmail; Thu, 15 Nov 2018 09:29:33 -0800 (PST) X-Google-Smtp-Source: AFSGD/XrI51BVHpWbYodkbljcRjmzVnQrXUMi4r2bYsaniVIpBOP+DHPzJMzohFMgAZA8/sRtYsD X-Received: by 2002:adf:ee51:: with SMTP id w17mr327972wro.17.1542302973447; Thu, 15 Nov 2018 09:29:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542302973; cv=none; d=google.com; s=arc-20160816; b=ayoz9d7p2o0NKvTjU1MrmHTtC9q2jSQkzWvSBMubQqx3wJCWLE/qk6s+XKtdSgdsCy RR0b9vXd63ySqPChE1BplWuP3kCexOOUMOlkfhmFDNcL55naxMwg9CUojD5Xq0zndPZz bWy8zmwbrIVfu1si4YCp6CfC5gj1cCWejIBIQ/Ev1p//qyol0oJiWDpjGkTrBuoTqVVy vDI6C9C30mltkDHP9YFB/et4TLuRoj5z6+Uy3WKbZfAZjUUb41O3TwxeiTcJYWVuO4b4 JfyvW5n8UoexIhsoekgm6KTsOfnht3hNISy6e/riwQZKLV5hmh4uNKMyf7rmwDm2hbcn Qt/A== 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=ISWMrnj0BEEep46JMA5N5msq3iERg5iKVaz2QMSns1Q=; b=SscHhOVHNpkTujJQd/CM+NwoqaInxx0nxbGuq7wEjChuiLJSlc+T+u1u4JrdmRPX+k Eyah40lDypPEzj6qREuCE8TBeV4Aqxc3fBnfN6Jua6wo6RYHKHB2x83ujQI6cCXJ3+V9 uvZrWKHanysmkcNA6O4LT957XjY+pNoy6NpwdPQuLW8lVFYwfKX7bCDjuBc9t+TvbRxV UBrubPonZzVn7umcxue6lN0OJCX4h/XSUirUET3Nr0wJkWgq6Zc1BQYCZ6VmwtuXMnIl 6o3DsD4dFoiLfYjRRiC8N1qecUoqrQkkS9tSEPMVOeHVxRjVWIAQyFAbFX8Lo8CSMtYW JxVA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id i190-v6si820164wme.4.2018.11.15.09.29.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 09:29:33 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id wAFHTXmw030691 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 15 Nov 2018 18:29:33 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.0.37]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id wAFHTW4Z005496; Thu, 15 Nov 2018 18:29:33 +0100 From: Henning Schild To: isar-users Cc: Henning Schild Subject: [PATCH 3/3] conf: Add new distro ubuntu with suite "cosmic" Date: Thu, 15 Nov 2018 18:29:31 +0100 Message-Id: <20181115172931.12117-4-henning.schild@siemens.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181115172931.12117-1-henning.schild@siemens.com> References: <20181115172931.12117-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: PY/+HEEIFRu2 Show that Isar can even build that popular distribution. Signed-off-by: Henning Schild --- .../conf/distro/ubuntu-cosmic-ports.list | 4 ++++ meta-isar/conf/distro/ubuntu-cosmic.conf | 15 +++++++++++++ meta-isar/conf/distro/ubuntu-cosmic.list | 4 ++++ meta-isar/conf/local.conf.sample | 2 ++ .../conf/multiconfig/qemuamd64-cosmic.conf | 21 +++++++++++++++++++ .../conf/multiconfig/qemuarm64-cosmic.conf | 19 +++++++++++++++++ scripts/ci_build.sh | 5 ++++- scripts/start_vm | 8 ++++++- scripts/vm_smoke_test | 1 + 9 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 meta-isar/conf/distro/ubuntu-cosmic-ports.list create mode 100644 meta-isar/conf/distro/ubuntu-cosmic.conf create mode 100644 meta-isar/conf/distro/ubuntu-cosmic.list create mode 100644 meta-isar/conf/multiconfig/qemuamd64-cosmic.conf create mode 100644 meta-isar/conf/multiconfig/qemuarm64-cosmic.conf diff --git a/meta-isar/conf/distro/ubuntu-cosmic-ports.list b/meta-isar/conf/distro/ubuntu-cosmic-ports.list new file mode 100644 index 0000000..cd4b1e2 --- /dev/null +++ b/meta-isar/conf/distro/ubuntu-cosmic-ports.list @@ -0,0 +1,4 @@ +deb http://de.ports.ubuntu.com/ubuntu-ports cosmic main restricted universe multiverse +deb http://de.ports.ubuntu.com/ubuntu-ports cosmic-updates main restricted universe multiverse +deb http://de.ports.ubuntu.com/ubuntu-ports cosmic-security main restricted universe multiverse +deb http://de.ports.ubuntu.com/ubuntu-ports cosmic-backports main restricted universe multiverse diff --git a/meta-isar/conf/distro/ubuntu-cosmic.conf b/meta-isar/conf/distro/ubuntu-cosmic.conf new file mode 100644 index 0000000..1779d0e --- /dev/null +++ b/meta-isar/conf/distro/ubuntu-cosmic.conf @@ -0,0 +1,15 @@ +# This software is a part of ISAR. + +require debian-common.conf + +BASE_DISTRO_CODENAME = "cosmic" +# that is what debootstrap_1.0.108ubuntu2 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-cosmic.list b/meta-isar/conf/distro/ubuntu-cosmic.list new file mode 100644 index 0000000..e95d189 --- /dev/null +++ b/meta-isar/conf/distro/ubuntu-cosmic.list @@ -0,0 +1,4 @@ +deb http://de.archive.ubuntu.com/ubuntu cosmic main restricted universe multiverse +deb http://de.archive.ubuntu.com/ubuntu cosmic-updates main restricted universe multiverse +deb http://de.archive.ubuntu.com/ubuntu cosmic-security main restricted universe multiverse +deb http://de.archive.ubuntu.com/ubuntu cosmic-backports main restricted universe multiverse diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index ffcb7ab..28fcaa0 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -43,6 +43,7 @@ BBMULTICONFIG = " \ qemuarm-buster \ qemuarm64-stretch \ qemuarm64-buster \ + qemuarm64-cosmic \ qemui386-jessie \ qemui386-stretch \ qemui386-buster \ @@ -52,6 +53,7 @@ BBMULTICONFIG = " \ de0-nano-soc-stretch \ hikey-stretch \ qemuamd64-buster \ + qemuamd64-cosmic \ rpi-jessie \ " diff --git a/meta-isar/conf/multiconfig/qemuamd64-cosmic.conf b/meta-isar/conf/multiconfig/qemuamd64-cosmic.conf new file mode 100644 index 0000000..8f1ade4 --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuamd64-cosmic.conf @@ -0,0 +1,21 @@ +# This software is a part of ISAR. + +MACHINE ?= "qemuamd64" + +DISTRO ?= "ubuntu-cosmic" +DISTRO_ARCH ?= "amd64" + +KERNEL_NAME ?= "generic" + +IMAGE_TYPE ?= "wic-img" +WKS_FILE ?= "sdimage-efi" +IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" + +DISTRO_APT_SOURCES += "conf/distro/ubuntu-cosmic.list" + +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/qemuarm64-cosmic.conf b/meta-isar/conf/multiconfig/qemuarm64-cosmic.conf new file mode 100644 index 0000000..191d23c --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuarm64-cosmic.conf @@ -0,0 +1,19 @@ +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2018 + +MACHINE ?= "qemuarm64" + +DISTRO ?= "ubuntu-cosmic" +DISTRO_ARCH ?= "arm64" + +KERNEL_NAME ?= "generic" + +QEMU_ROOTFS_DEV ?= "vda" + +DISTRO_APT_SOURCES += "conf/distro/ubuntu-cosmic-ports.list" + +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/scripts/ci_build.sh b/scripts/ci_build.sh index d2ed6fe..33e9b96 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -84,7 +84,8 @@ if [ -n "$CROSS_BUILD" ]; then multiconfig:qemuarm64-stretch:isar-image-base \ multiconfig:qemuamd64-jessie:isar-image-base \ multiconfig:qemuamd64-stretch:isar-image-base \ - multiconfig:qemuamd64-buster:isar-image-base + multiconfig:qemuamd64-buster:isar-image-base \ + multiconfig:qemuamd64-cosmic:isar-image-base else # Start build for all possible configurations bitbake $BB_ARGS \ @@ -98,7 +99,9 @@ else multiconfig:qemuamd64-jessie:isar-image-base \ multiconfig:qemuamd64-stretch:isar-image-base \ multiconfig:qemuamd64-buster:isar-image-base \ + multiconfig:qemuamd64-cosmic:isar-image-base \ multiconfig:rpi-jessie:isar-image-base # qemu-user-static of <= buster too old to build that #multiconfig:qemuarm64-buster:isar-image-base + #multiconfig:qemuarm64-cosmic:isar-image-base fi diff --git a/scripts/start_vm b/scripts/start_vm index 1da0742..4502476 100755 --- a/scripts/start_vm +++ b/scripts/start_vm @@ -128,7 +128,13 @@ case "$IMAGE_TYPE" in KARGS="console=$MACHINE_SERIAL root=/dev/$QEMU_ROOTFS_DEV rw" ;; wic-img) - readonly ROOTFS_IMAGE=isar-image-base-debian-$DISTRO-qemu$ARCH.wic.img + ## TODO we might want to have DISTRO and SUITE, but that would change + ## the interface ... and we only have that one ubuntu at the moment + if [ "$DISTRO" = "cosmic" ]; then + readonly ROOTFS_IMAGE=isar-image-base-ubuntu-$DISTRO-qemu$ARCH.wic.img + else + readonly ROOTFS_IMAGE=isar-image-base-debian-$DISTRO-qemu$ARCH.wic.img + fi EXTRA_ARGS="$EXTRA_ARGS -snapshot" ;; *) diff --git a/scripts/vm_smoke_test b/scripts/vm_smoke_test index 76c2e16..731c7ba 100755 --- a/scripts/vm_smoke_test +++ b/scripts/vm_smoke_test @@ -150,6 +150,7 @@ run_test arm buster run_test amd64 jessie run_test amd64 stretch run_test amd64 buster +run_test amd64 cosmic # i386 machine run_test i386 jessie -- 2.19.1