* [PATCH 0/3] Enable Ubuntu 18.10
@ 2018-11-15 17:29 Henning Schild
2018-11-15 17:29 ` [PATCH 1/3] image: Copy KERNEL_IMAGE out using sudo Henning Schild
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Henning Schild @ 2018-11-15 17:29 UTC (permalink / raw)
To: isar-users; +Cc: Henning Schild
This series is kind of a show-case that Isar can be used to build
Ubuntu. I personally would not want to do that for anything serious, but
people might find that feature useful.
Adding another distro to the mix could end up being a lot of work. But
it could also help increase quality and might increase the visibitly of
Isar and maybe grow the community. Feel free to express your opinion and
start a distro war.
Note that p2 might be useful even if the series does not get merged.
Henning Schild (3):
image: Copy KERNEL_IMAGE out using sudo
meta/isar-bootstrap: allow passing a SCRIPT to debootstrap
conf: Add new distro ubuntu with suite "cosmic"
.../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 +++++++++++++++++
meta/classes/image.bbclass | 2 +-
.../isar-bootstrap/isar-bootstrap.inc | 7 ++++---
scripts/ci_build.sh | 5 ++++-
scripts/start_vm | 8 ++++++-
scripts/vm_smoke_test | 1 +
11 files changed, 82 insertions(+), 6 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
--
2.19.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/3] image: Copy KERNEL_IMAGE out using sudo
2018-11-15 17:29 [PATCH 0/3] Enable Ubuntu 18.10 Henning Schild
@ 2018-11-15 17:29 ` Henning Schild
2018-11-15 17:29 ` [PATCH 2/3] meta/isar-bootstrap: allow passing a SCRIPT to debootstrap Henning Schild
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Henning Schild @ 2018-11-15 17:29 UTC (permalink / raw)
To: isar-users; +Cc: Henning Schild
This is an addition to 8a2b89994405 and makes me remember a few sudo
discussions. In ubuntu the kernel will not be readable for a regular
user, so use sudo for the kernel as well.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
meta/classes/image.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index d033cf5..d7b352e 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -86,7 +86,7 @@ addtask mark_rootfs before do_copy_boot_files after do_rootfs
do_copy_boot_files() {
KERNEL_IMAGE=${@get_image_name(d, 'vmlinuz')[1]}
if [ -n "${KERNEL_IMAGE}" ]; then
- cp -f ${IMAGE_ROOTFS}/boot/${@get_image_name(d, 'vmlinuz')[0]} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE}
+ sudo cp -f ${IMAGE_ROOTFS}/boot/${@get_image_name(d, 'vmlinuz')[0]} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE}
fi
INITRD_IMAGE=${@get_image_name(d, 'initrd.img')[1]}
--
2.19.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/3] meta/isar-bootstrap: allow passing a SCRIPT to debootstrap
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 ` Henning Schild
2018-11-15 17:29 ` [PATCH 3/3] conf: Add new distro ubuntu with suite "cosmic" Henning Schild
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Henning Schild @ 2018-11-15 17:29 UTC (permalink / raw)
To: isar-users; +Cc: Henning Schild
Debootstrap uses scripts that usually have the same name as SUITE so we
never set them. In order to install a SUITE that an outdated version of
debootstrap does not (yet) know, we can tell debootstrap which SCRIPT to
use.
In fact many modern SUITEs will use SCRIPTS we might already have, we
just do not have the symlink to them.
i.e. "cosmic" uses the SCRIPT "gutsy" and a debootstrap from "stretch"
does know "gutsy" but not "cosmic"
So we can debootstrap SUITEs from the future, given they use a SCRIPT we
already have.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
index 21454b0..fc12e58 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -193,8 +193,8 @@ isar_bootstrap() {
${DEBOOTSTRAP_KEYRING} \
"${@get_distro_suite(d, True)}" \
"${ROOTFSDIR}" \
- "${@get_distro_source(d, True)}"
-
+ "${@get_distro_source(d, True)}" \
+ ${DISTRO_DEBOOTSTRAP_SCRIPT}
else
"${DEBOOTSTRAP}" $debootstrap_args \
--arch="${DISTRO_ARCH}" \
@@ -202,7 +202,8 @@ isar_bootstrap() {
${DEBOOTSTRAP_KEYRING} \
"${@get_distro_suite(d, False)}" \
"${ROOTFSDIR}" \
- "${@get_distro_source(d, False)}"
+ "${@get_distro_source(d, False)}" \
+ ${DISTRO_DEBOOTSTRAP_SCRIPT}
fi
# Install apt config
--
2.19.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/3] conf: Add new distro ubuntu with suite "cosmic"
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 ` Henning Schild
2018-11-15 19:58 ` Henning Schild
2018-11-15 17:35 ` [PATCH 0/3] Enable Ubuntu 18.10 Henning Schild
2019-01-28 16:58 ` Henning Schild
4 siblings, 1 reply; 9+ messages in thread
From: Henning Schild @ 2018-11-15 17:29 UTC (permalink / raw)
To: isar-users; +Cc: Henning Schild
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"
+# 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/3] Enable Ubuntu 18.10
2018-11-15 17:29 [PATCH 0/3] Enable Ubuntu 18.10 Henning Schild
` (2 preceding siblings ...)
2018-11-15 17:29 ` [PATCH 3/3] conf: Add new distro ubuntu with suite "cosmic" Henning Schild
@ 2018-11-15 17:35 ` Henning Schild
2018-11-15 17:48 ` Henning Schild
2019-01-28 16:58 ` Henning Schild
4 siblings, 1 reply; 9+ messages in thread
From: Henning Schild @ 2018-11-15 17:35 UTC (permalink / raw)
To: isar-users
Am Thu, 15 Nov 2018 18:29:28 +0100
schrieb Henning Schild <henning.schild@siemens.com>:
> This series is kind of a show-case that Isar can be used to build
> Ubuntu. I personally would not want to do that for anything serious,
> but people might find that feature useful.
>
> Adding another distro to the mix could end up being a lot of work. But
> it could also help increase quality and might increase the visibitly
> of Isar and maybe grow the community. Feel free to express your
> opinion and start a distro war.
On the one hand i am not a huge fan and would be strongly against that,
at least if we regard it as officially supported. On the other hand it
might be nice for a demo for people that think that Ubuntu is the same
as Linux.
And there might be a legal aspect, Canonical has a strange additional
license where any derived thing needs the brand names patched out
again. And since ubuntu is spreading its names all over its packages,
that comes close to a full rebuild. But Isar is not providing a
modified version of Ubuntu ... and i am not a lawyer.
Henning
> Note that p2 might be useful even if the series does not get merged.
>
> Henning Schild (3):
> image: Copy KERNEL_IMAGE out using sudo
> meta/isar-bootstrap: allow passing a SCRIPT to debootstrap
> conf: Add new distro ubuntu with suite "cosmic"
>
> .../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 +++++++++++++++++ meta/classes/image.bbclass |
> 2 +- .../isar-bootstrap/isar-bootstrap.inc | 7 ++++---
> scripts/ci_build.sh | 5 ++++-
> scripts/start_vm | 8 ++++++-
> scripts/vm_smoke_test | 1 +
> 11 files changed, 82 insertions(+), 6 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
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/3] Enable Ubuntu 18.10
2018-11-15 17:35 ` [PATCH 0/3] Enable Ubuntu 18.10 Henning Schild
@ 2018-11-15 17:48 ` Henning Schild
0 siblings, 0 replies; 9+ messages in thread
From: Henning Schild @ 2018-11-15 17:48 UTC (permalink / raw)
To: isar-users
Am Thu, 15 Nov 2018 18:35:05 +0100
schrieb "[ext] Henning Schild" <henning.schild@siemens.com>:
> Am Thu, 15 Nov 2018 18:29:28 +0100
> schrieb Henning Schild <henning.schild@siemens.com>:
>
> > This series is kind of a show-case that Isar can be used to build
> > Ubuntu. I personally would not want to do that for anything serious,
> > but people might find that feature useful.
> >
> > Adding another distro to the mix could end up being a lot of work.
> > But it could also help increase quality and might increase the
> > visibitly of Isar and maybe grow the community. Feel free to
> > express your opinion and start a distro war.
>
> On the one hand i am not a huge fan and would be strongly against
> that, at least if we regard it as officially supported. On the other
> hand it might be nice for a demo for people that think that Ubuntu is
> the same as Linux.
> And there might be a legal aspect, Canonical has a strange additional
> license where any derived thing needs the brand names patched out
> again. And since ubuntu is spreading its names all over its packages,
> that comes close to a full rebuild. But Isar is not providing a
> modified version of Ubuntu ... and i am not a lawyer.
https://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy
I think as long as you do not distribute modified versions you are
fine, so this only becomes an Isar topic if we ever provide images for
download.
Henning
> Henning
>
> > Note that p2 might be useful even if the series does not get merged.
> >
> > Henning Schild (3):
> > image: Copy KERNEL_IMAGE out using sudo
> > meta/isar-bootstrap: allow passing a SCRIPT to debootstrap
> > conf: Add new distro ubuntu with suite "cosmic"
> >
> > .../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 +++++++++++++++++ meta/classes/image.bbclass |
> > 2 +- .../isar-bootstrap/isar-bootstrap.inc | 7 ++++---
> > scripts/ci_build.sh | 5 ++++-
> > scripts/start_vm | 8 ++++++-
> > scripts/vm_smoke_test | 1 +
> > 11 files changed, 82 insertions(+), 6 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
> >
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/3] conf: Add new distro ubuntu with suite "cosmic"
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
0 siblings, 0 replies; 9+ messages in thread
From: Henning Schild @ 2018-11-15 19:58 UTC (permalink / raw)
To: isar-users
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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/3] Enable Ubuntu 18.10
2018-11-15 17:29 [PATCH 0/3] Enable Ubuntu 18.10 Henning Schild
` (3 preceding siblings ...)
2018-11-15 17:35 ` [PATCH 0/3] Enable Ubuntu 18.10 Henning Schild
@ 2019-01-28 16:58 ` Henning Schild
2019-01-28 17:05 ` Jan Kiszka
4 siblings, 1 reply; 9+ messages in thread
From: Henning Schild @ 2019-01-28 16:58 UTC (permalink / raw)
To: isar-users
pong
Am Thu, 15 Nov 2018 18:29:28 +0100
schrieb Henning Schild <henning.schild@siemens.com>:
> This series is kind of a show-case that Isar can be used to build
> Ubuntu. I personally would not want to do that for anything serious,
> but people might find that feature useful.
>
> Adding another distro to the mix could end up being a lot of work. But
> it could also help increase quality and might increase the visibitly
> of Isar and maybe grow the community. Feel free to express your
> opinion and start a distro war.
>
> Note that p2 might be useful even if the series does not get merged.
>
> Henning Schild (3):
> image: Copy KERNEL_IMAGE out using sudo
> meta/isar-bootstrap: allow passing a SCRIPT to debootstrap
> conf: Add new distro ubuntu with suite "cosmic"
>
> .../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 +++++++++++++++++ meta/classes/image.bbclass |
> 2 +- .../isar-bootstrap/isar-bootstrap.inc | 7 ++++---
> scripts/ci_build.sh | 5 ++++-
> scripts/start_vm | 8 ++++++-
> scripts/vm_smoke_test | 1 +
> 11 files changed, 82 insertions(+), 6 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
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/3] Enable Ubuntu 18.10
2019-01-28 16:58 ` Henning Schild
@ 2019-01-28 17:05 ` Jan Kiszka
0 siblings, 0 replies; 9+ messages in thread
From: Jan Kiszka @ 2019-01-28 17:05 UTC (permalink / raw)
To: [ext] Henning Schild, isar-users
On 28.01.19 17:58, [ext] Henning Schild wrote:
> pong
>
Seems like a reasonable extension, though it will increase the full test time a bit.
Did you check if the patches still apply and work?
Jan
> Am Thu, 15 Nov 2018 18:29:28 +0100
> schrieb Henning Schild <henning.schild@siemens.com>:
>
>> This series is kind of a show-case that Isar can be used to build
>> Ubuntu. I personally would not want to do that for anything serious,
>> but people might find that feature useful.
>>
>> Adding another distro to the mix could end up being a lot of work. But
>> it could also help increase quality and might increase the visibitly
>> of Isar and maybe grow the community. Feel free to express your
>> opinion and start a distro war.
>>
>> Note that p2 might be useful even if the series does not get merged.
>>
>> Henning Schild (3):
>> image: Copy KERNEL_IMAGE out using sudo
>> meta/isar-bootstrap: allow passing a SCRIPT to debootstrap
>> conf: Add new distro ubuntu with suite "cosmic"
>>
>> .../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 +++++++++++++++++ meta/classes/image.bbclass |
>> 2 +- .../isar-bootstrap/isar-bootstrap.inc | 7 ++++---
>> scripts/ci_build.sh | 5 ++++-
>> scripts/start_vm | 8 ++++++-
>> scripts/vm_smoke_test | 1 +
>> 11 files changed, 82 insertions(+), 6 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
>>
>
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-01-28 17:05 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox