[PATCH 1/3] doc: make buster the new default suite

[PATCH 1/3] doc: make buster the new default suite

[Henning Schild]

From: Henning Schild <henning@hennsch.de>

Buster is the new stable release. Mention it in the docs to clearly
state that we support it. And tell users to choose it for their next
image.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 doc/user_manual.md            | 38 +++++++++++++++++------------------
 meta-isar/conf/conf-notes.txt |  4 ++--
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/doc/user_manual.md b/doc/user_manual.md
index ed181aa..a301740 100644
--- a/doc/user_manual.md
+++ b/doc/user_manual.md
@@ -128,22 +128,22 @@ e.g.:
 
 ```
 MACHINE ??= "qemuarm"
-DISTRO ??= "debian-stretch"
+DISTRO ??= "debian-buster"
 DISTRO_ARCH ??= "armhf"
 ```
 
 Then, call `bitbake` with image names, e.g.:
 
 ```
-bitbake multiconfig:qemuarm-stretch:isar-image-base \
-        multiconfig:qemuarm-stretch:isar-image-debug
+bitbake multiconfig:qemuarm-buster:isar-image-base \
+        multiconfig:qemuarm-buster:isar-image-debug
 ```
 
 The following images are created:
 
 ```
-tmp/deploy/images/qemuarm/isar-image-base-qemuarm-debian-stretch.ext4.img
-tmp/deploy/images/qemuarm/isar-image-debug-qemuarm-debian-stretch.ext4.img
+tmp/deploy/images/qemuarm/isar-image-base-qemuarm-debian-buster.ext4.img
+tmp/deploy/images/qemuarm/isar-image-debug-qemuarm-debian-buster.ext4.img
 ```
 
 ### Building Target Images for Multiple Configurations
@@ -197,9 +197,9 @@ tmp/deploy/images/rpi/isar-image-base.rpi-sdimg
 A bootable disk image is generated if you set IMAGE_TYPE to 'wic-img'. Behind the scenes a tool called `wic` is used to assemble the images. It is controlled by a `.wks` file which you can choose with changing WKS_FILE. Some examples in the tree use that feature already.
 ```
  # Generate an image for the `i386` target architecture
- $ bitbake multiconfig:qemui386-stretch:isar-image-base
+ $ bitbake multiconfig:qemui386-buster:isar-image-base
  # Similarly, for the `amd64` target architecture, in this case EFI
- $ bitbake multiconfig:qemuamd64-stretch:isar-image-base
+ $ bitbake multiconfig:qemuamd64-buster:isar-image-base
 ```
 
 Variables may be used in `.wks.in` files; Isar will expand them and generate a regular `.wks` file before generating the disk image using `wic`.
@@ -212,9 +212,9 @@ enough to allow images to be testable under `qemu`.
 
 ```
 # AMD64 image, EFI
-qemu-system-x86_64 -m 256M -nographic -bios edk2/Build/OvmfX64/RELEASE_*/FV/OVMF.fd -hda tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img
+qemu-system-x86_64 -m 256M -nographic -bios edk2/Build/OvmfX64/RELEASE_*/FV/OVMF.fd -hda tmp/deploy/images/qemuamd64/isar-image-base-debian-buster-qemuamd64.wic.img
 # i386 image
-qemu-system-i386 -m 256M -nographic -hda tmp/deploy/images/qemui386/isar-image-base-debian-stretch-qemui386.wic.img
+qemu-system-i386 -m 256M -nographic -hda tmp/deploy/images/qemui386/isar-image-base-debian-buster-qemui386.wic.img
 ```
 
 ---
@@ -303,7 +303,7 @@ following variables define the default configuration to build for:
  - `DISTRO_ARCH` - The Debian architecture to build for (e.g., `armhf`).
 
 If BitBake is called with multiconfig targets (e.g.,
-`multiconfig:qemuarm-stretch:isar-image-base`), the following variable defines
+`multiconfig:qemuarm-buster:isar-image-base`), the following variable defines
 all supported configurations:
 
  - `BBMULTICONFIG` - The list of the complete configuration definition files.
@@ -708,7 +708,7 @@ One may chroot into the SDK and install required target packages with the help o
  - Trigger creation of SDK root filesystem
 
 ```
-bitbake -c do_populate_sdk multiconfig:qemuarm-stretch:isar-image-base
+bitbake -c do_populate_sdk multiconfig:qemuarm-buster:isar-image-base
 ```
 
  - Mount the following directories in chroot by passing resulting rootfs as an argument to the script `mount_chroot.sh`:
@@ -726,14 +726,14 @@ mount devtmpfs $1/dev     -t devtmpfs -o mode=0755,nosuid
 mount devpts   $1/dev/pts -t devpts   -o gid=5,mode=620
 mount tmpfs    $1/dev/shm -t tmpfs    -o rw,seclabel,nosuid,nodev
 
-$ sudo scripts/mount_chroot.sh ../build/tmp/deploy/images/qemuarm/sdk-debian-stretch-armhf
+$ sudo scripts/mount_chroot.sh ../build/tmp/deploy/images/qemuarm/sdk-debian-buster-armhf
 
 ```
 
  - chroot to isar SDK rootfs:
 
 ```
-$ sudo chroot build/tmp/deploy/images/qemuarm/sdk-debian-stretch-armhf
+$ sudo chroot build/tmp/deploy/images/qemuarm/sdk-debian-buster-armhf
 ```
  - Check that cross toolchains are installed
 
@@ -790,7 +790,7 @@ BASE_REPO_KEY = "file://<absolute_path_to_your_pub_key_file>"'
  - Trigger creation of local apt caching Debian packages during image generation.
 
 ```
-bitbake -c cache_base_repo multiconfig:qemuarm-stretch:isar-image-base
+bitbake -c cache_base_repo multiconfig:qemuarm-buster:isar-image-base
 ```
 
  - Set `ISAR_USE_CACHED_BASE_REPO` in `conf/local.conf`:
@@ -809,7 +809,7 @@ sudo rm -rf tmp
  - Trigger again generation of image (now using local caching repo):
 
 ```
-bitbake multiconfig:qemuarm-stretch:isar-image-base
+bitbake multiconfig:qemuarm-buster:isar-image-base
 ```
 
 ### Limitation
@@ -830,10 +830,10 @@ Add a new sources list entry to fetch the package from, i.e. include a new apt s
 
 Add docker-ce from arm64:
 
-Create a new layer containing `conf/distro/docker-stretch.list` with the following content:
+Create a new layer containing `conf/distro/docker-buster.list` with the following content:
 
 ```
-deb [arch=arm64] https://download.docker.com/linux/debian	stretch	stable
+deb [arch=arm64] https://download.docker.com/linux/debian	buster	stable
 ```
 
 Include the layer in your project.
@@ -843,11 +843,11 @@ To the local.conf add:
 ```
 IMAGE_PREINSTALL += "docker-ce"
 THIRD_PARTY_APT_KEYS_append = " https://download.docker.com/linux/debian/gpg;md5sum=1afae06b34a13c1b3d9cb61a26285a15"
-DISTRO_APT_SOURCES_append = " conf/distro/docker-stretch.list"
+DISTRO_APT_SOURCES_append = " conf/distro/docker-buster.list"
 ```
 
 And build the corresponding image target:
 
 ```
-bitbake multiconfig:qemuarm64-stretch:isar-image-base
+bitbake multiconfig:qemuarm64-buster:isar-image-base
 ```
diff --git a/meta-isar/conf/conf-notes.txt b/meta-isar/conf/conf-notes.txt
index ae9611e..74df97c 100644
--- a/meta-isar/conf/conf-notes.txt
+++ b/meta-isar/conf/conf-notes.txt
@@ -1,4 +1,4 @@
 Common targets are:
-    multiconfig:qemuarm-stretch:isar-image-base
-    multiconfig:qemuamd64-stretch:isar-image-base
+    multiconfig:qemuarm-buster:isar-image-base
+    multiconfig:qemuamd64-buster:isar-image-base
     multiconfig:rpi-stretch:isar-image-base
-- 
2.21.0

[PATCH 2/3] conf: add new debian version "bullseye"

[Henning Schild]

From: Henning Schild <henning@hennsch.de>

Add all configuration files and CI targets.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 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

[PATCH 3/3] conf: add missing buster kernel names

[Henning Schild]

From: Henning Schild <henning@hennsch.de>

Some upstream kernel names were missing, correct that.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta/conf/distro/debian-buster.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/conf/distro/debian-buster.conf b/meta/conf/distro/debian-buster.conf
index 021916b..bc3f5cf 100644
--- a/meta/conf/distro/debian-buster.conf
+++ b/meta/conf/distro/debian-buster.conf
@@ -9,7 +9,8 @@ HOST_DISTRO ?= "debian-buster"
 DISTRO_APT_SOURCES += "conf/distro/debian-buster.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 marvell octeon powerpc64le s390x"
+    armmp-lpae cloud-amd64 loongson-3 marvell octeon powerpc64le rpi s390x \
+    rt-686-pae rt-amd64 rt-arm64 rt-armmp"
 
 IMAGE_PREINSTALL += "init"
 
-- 
2.21.0

Re: [PATCH 2/3] conf: add new debian version "bullseye"

[Henning Schild]

Hi,

i guess the jenkins at Ilbers is still on stretch. It should be updated
to buster so we can build those arm64 images for buster and bullseye.

Henning

Am Wed, 31 Jul 2019 12:38:34 +0200
schrieb Henning Schild <henning.schild@siemens.com>:

> From: Henning Schild <henning@hennsch.de>
> 
> Add all configuration files and CI targets.
> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>  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 \

Re: [PATCH 1/3] doc: make buster the new default suite

[Henning Schild]

The whole series has a wrong author email address. Will fix that in a
v2.

Henning

Am Wed, 31 Jul 2019 12:38:33 +0200
schrieb Henning Schild <henning.schild@siemens.com>:

> From: Henning Schild <henning@hennsch.de>
> 
> Buster is the new stable release. Mention it in the docs to clearly
> state that we support it. And tell users to choose it for their next
> image.
> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>  doc/user_manual.md            | 38
> +++++++++++++++++------------------ meta-isar/conf/conf-notes.txt |
> 4 ++-- 2 files changed, 21 insertions(+), 21 deletions(-)
> 
> diff --git a/doc/user_manual.md b/doc/user_manual.md
> index ed181aa..a301740 100644
> --- a/doc/user_manual.md
> +++ b/doc/user_manual.md
> @@ -128,22 +128,22 @@ e.g.:
>  
>  ```
>  MACHINE ??= "qemuarm"
> -DISTRO ??= "debian-stretch"
> +DISTRO ??= "debian-buster"
>  DISTRO_ARCH ??= "armhf"
>  ```
>  
>  Then, call `bitbake` with image names, e.g.:
>  
>  ```
> -bitbake multiconfig:qemuarm-stretch:isar-image-base \
> -        multiconfig:qemuarm-stretch:isar-image-debug
> +bitbake multiconfig:qemuarm-buster:isar-image-base \
> +        multiconfig:qemuarm-buster:isar-image-debug
>  ```
>  
>  The following images are created:
>  
>  ```
> -tmp/deploy/images/qemuarm/isar-image-base-qemuarm-debian-stretch.ext4.img
> -tmp/deploy/images/qemuarm/isar-image-debug-qemuarm-debian-stretch.ext4.img
> +tmp/deploy/images/qemuarm/isar-image-base-qemuarm-debian-buster.ext4.img
> +tmp/deploy/images/qemuarm/isar-image-debug-qemuarm-debian-buster.ext4.img
>  ```
>  
>  ### Building Target Images for Multiple Configurations
> @@ -197,9 +197,9 @@ tmp/deploy/images/rpi/isar-image-base.rpi-sdimg
>  A bootable disk image is generated if you set IMAGE_TYPE to
> 'wic-img'. Behind the scenes a tool called `wic` is used to assemble
> the images. It is controlled by a `.wks` file which you can choose
> with changing WKS_FILE. Some examples in the tree use that feature
> already. ``` # Generate an image for the `i386` target architecture
> - $ bitbake multiconfig:qemui386-stretch:isar-image-base
> + $ bitbake multiconfig:qemui386-buster:isar-image-base
>   # Similarly, for the `amd64` target architecture, in this case EFI
> - $ bitbake multiconfig:qemuamd64-stretch:isar-image-base
> + $ bitbake multiconfig:qemuamd64-buster:isar-image-base
>  ```
>  
>  Variables may be used in `.wks.in` files; Isar will expand them and
> generate a regular `.wks` file before generating the disk image using
> `wic`. @@ -212,9 +212,9 @@ enough to allow images to be testable
> under `qemu`. ```
>  # AMD64 image, EFI
> -qemu-system-x86_64 -m 256M -nographic -bios
> edk2/Build/OvmfX64/RELEASE_*/FV/OVMF.fd -hda
> tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img
> +qemu-system-x86_64 -m 256M -nographic -bios
> edk2/Build/OvmfX64/RELEASE_*/FV/OVMF.fd -hda
> tmp/deploy/images/qemuamd64/isar-image-base-debian-buster-qemuamd64.wic.img
> # i386 image -qemu-system-i386 -m 256M -nographic -hda
> tmp/deploy/images/qemui386/isar-image-base-debian-stretch-qemui386.wic.img
> +qemu-system-i386 -m 256M -nographic -hda
> tmp/deploy/images/qemui386/isar-image-base-debian-buster-qemui386.wic.img
> ``` --- @@ -303,7 +303,7 @@ following variables define the default
> configuration to build for:
>   - `DISTRO_ARCH` - The Debian architecture to build for (e.g.,
> `armhf`). 
>  If BitBake is called with multiconfig targets (e.g.,
> -`multiconfig:qemuarm-stretch:isar-image-base`), the following
> variable defines +`multiconfig:qemuarm-buster:isar-image-base`), the
> following variable defines all supported configurations:
>  
>   - `BBMULTICONFIG` - The list of the complete configuration
> definition files. @@ -708,7 +708,7 @@ One may chroot into the SDK and
> install required target packages with the help o
>   - Trigger creation of SDK root filesystem
>  
>  ```
> -bitbake -c do_populate_sdk
> multiconfig:qemuarm-stretch:isar-image-base +bitbake -c
> do_populate_sdk multiconfig:qemuarm-buster:isar-image-base ```
>  
>   - Mount the following directories in chroot by passing resulting
> rootfs as an argument to the script `mount_chroot.sh`: @@ -726,14
> +726,14 @@ mount devtmpfs $1/dev     -t devtmpfs -o mode=0755,nosuid
> mount devpts   $1/dev/pts -t devpts   -o gid=5,mode=620 mount
> tmpfs    $1/dev/shm -t tmpfs    -o rw,seclabel,nosuid,nodev 
> -$ sudo
> scripts/mount_chroot.sh ../build/tmp/deploy/images/qemuarm/sdk-debian-stretch-armhf
> +$ sudo
> scripts/mount_chroot.sh ../build/tmp/deploy/images/qemuarm/sdk-debian-buster-armhf
> ``` 
>   - chroot to isar SDK rootfs:
>  
>  ```
> -$ sudo chroot
> build/tmp/deploy/images/qemuarm/sdk-debian-stretch-armhf +$ sudo
> chroot build/tmp/deploy/images/qemuarm/sdk-debian-buster-armhf ```
>   - Check that cross toolchains are installed
>  
> @@ -790,7 +790,7 @@ BASE_REPO_KEY =
> "file://<absolute_path_to_your_pub_key_file>"'
>   - Trigger creation of local apt caching Debian packages during
> image generation. 
>  ```
> -bitbake -c cache_base_repo
> multiconfig:qemuarm-stretch:isar-image-base +bitbake -c
> cache_base_repo multiconfig:qemuarm-buster:isar-image-base ```
>  
>   - Set `ISAR_USE_CACHED_BASE_REPO` in `conf/local.conf`:
> @@ -809,7 +809,7 @@ sudo rm -rf tmp
>   - Trigger again generation of image (now using local caching repo):
>  
>  ```
> -bitbake multiconfig:qemuarm-stretch:isar-image-base
> +bitbake multiconfig:qemuarm-buster:isar-image-base
>  ```
>  
>  ### Limitation
> @@ -830,10 +830,10 @@ Add a new sources list entry to fetch the
> package from, i.e. include a new apt s 
>  Add docker-ce from arm64:
>  
> -Create a new layer containing `conf/distro/docker-stretch.list` with
> the following content: +Create a new layer containing
> `conf/distro/docker-buster.list` with the following content: 
>  ```
> -deb [arch=arm64] https://download.docker.com/linux/debian
> stretch	stable +deb [arch=arm64]
> https://download.docker.com/linux/debian	buster	stable
> ``` 
>  Include the layer in your project.
> @@ -843,11 +843,11 @@ To the local.conf add:
>  ```
>  IMAGE_PREINSTALL += "docker-ce"
>  THIRD_PARTY_APT_KEYS_append = "
> https://download.docker.com/linux/debian/gpg;md5sum=1afae06b34a13c1b3d9cb61a26285a15"
> -DISTRO_APT_SOURCES_append = " conf/distro/docker-stretch.list"
> +DISTRO_APT_SOURCES_append = " conf/distro/docker-buster.list" ```
>  
>  And build the corresponding image target:
>  
>  ```
> -bitbake multiconfig:qemuarm64-stretch:isar-image-base
> +bitbake multiconfig:qemuarm64-buster:isar-image-base
>  ```
> diff --git a/meta-isar/conf/conf-notes.txt
> b/meta-isar/conf/conf-notes.txt index ae9611e..74df97c 100644
> --- a/meta-isar/conf/conf-notes.txt
> +++ b/meta-isar/conf/conf-notes.txt
> @@ -1,4 +1,4 @@
>  Common targets are:
> -    multiconfig:qemuarm-stretch:isar-image-base
> -    multiconfig:qemuamd64-stretch:isar-image-base
> +    multiconfig:qemuarm-buster:isar-image-base
> +    multiconfig:qemuamd64-buster:isar-image-base
>      multiconfig:rpi-stretch:isar-image-base

Re: [PATCH 2/3] conf: add new debian version "bullseye"

[Jan Kiszka]

On 31.07.19 12:44, [ext] Henning Schild wrote:
> Hi,
> 
> i guess the jenkins at Ilbers is still on stretch. It should be updated
> to buster so we can build those arm64 images for buster and bullseye.
> 

...or just be switched to docker containers (e.g. kas-isar) for easy base distro
selection.

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux

Re: [PATCH 2/3] conf: add new debian version "bullseye"

[Baurzhan Ismagulov]

On Wed, Jul 31, 2019 at 12:44:14PM +0200, Henning Schild wrote:
> i guess the jenkins at Ilbers is still on stretch. It should be updated
> to buster so we can build those arm64 images for buster and bullseye.

Yes, it is stretch ATM. FWIW, it's able to debootstrap buster and bullseye.
Let me check whether image building also works.

I'll look at upgrading to buster. I'd also like to move to dynamic test
environment generation. kas-docker is one option. Another one is to use the SDK
generated by Isar. Maybe it would make sense to test both.

With kind regards,
Baurzhan.

[PATCH 3/3] conf: add missing buster kernel names

[Henning Schild]

From: Henning Schild <henning.schild@siemens.com>

Some upstream kernel names were missing, correct that.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta/conf/distro/debian-buster.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/conf/distro/debian-buster.conf b/meta/conf/distro/debian-buster.conf
index 021916b..bc3f5cf 100644
--- a/meta/conf/distro/debian-buster.conf
+++ b/meta/conf/distro/debian-buster.conf
@@ -9,7 +9,8 @@ HOST_DISTRO ?= "debian-buster"
 DISTRO_APT_SOURCES += "conf/distro/debian-buster.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 marvell octeon powerpc64le s390x"
+    armmp-lpae cloud-amd64 loongson-3 marvell octeon powerpc64le rpi s390x \
+    rt-686-pae rt-amd64 rt-arm64 rt-armmp"
 
 IMAGE_PREINSTALL += "init"
 
-- 
2.21.0