From: Henning Schild <henning.schild@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Subject: Re: [PATCH 3/3] conf: Add new distro ubuntu with suite "cosmic"
Date: Thu, 15 Nov 2018 20:58:53 +0100 [thread overview]
Message-ID: <20181115205853.75ec1992@md1za8fc.ad001.siemens.net> (raw)
In-Reply-To: <20181115172931.12117-4-henning.schild@siemens.com>
Am Thu, 15 Nov 2018 18:29:31 +0100
schrieb Henning Schild <henning.schild@siemens.com>:
> Show that Isar can even build that popular distribution.
>
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
> .../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"
BASE_DISTRO="ubuntu" is missing
Henning
> +# 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
next prev parent reply other threads:[~2018-11-15 19:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-15 17:29 [PATCH 0/3] Enable Ubuntu 18.10 Henning Schild
2018-11-15 17:29 ` [PATCH 1/3] image: Copy KERNEL_IMAGE out using sudo Henning Schild
2018-11-15 17:29 ` [PATCH 2/3] meta/isar-bootstrap: allow passing a SCRIPT to debootstrap Henning Schild
2018-11-15 17:29 ` [PATCH 3/3] conf: Add new distro ubuntu with suite "cosmic" Henning Schild
2018-11-15 19:58 ` Henning Schild [this message]
2018-11-15 17:35 ` [PATCH 0/3] Enable Ubuntu 18.10 Henning Schild
2018-11-15 17:48 ` Henning Schild
2019-01-28 16:58 ` Henning Schild
2019-01-28 17:05 ` Jan Kiszka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181115205853.75ec1992@md1za8fc.ad001.siemens.net \
--to=henning.schild@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox