* [PATCH v3 0/6]
@ 2021-11-19 9:09 Uladzimir Bely
2021-11-19 9:09 ` [PATCH v3 1/6] image: Support multiple image types in WORKDIR and STAMPS Uladzimir Bely
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Uladzimir Bely @ 2021-11-19 9:09 UTC (permalink / raw)
To: isar-users
Changed since v2:
- get back multiconfigs removed in v2/v1;
- mc:qemuamd64-buster now builds wic-img and ext4-img and doesn't
conflict with mc:qemuamd64--cpiogz and mc:qemuamd64--tgz;
- docs updated to fit new (array-like) meaning of the variable
IMAGE_TYPE (IMAGE_FSTYPES with last patch).
Changes since v1:
- removed mc:qemuamd64-buster-cpiogz config;
- mc:qemuamd64-buster config now includes cpiogz image type.
The patchset makes possible to build several image types for
the specific target by listing all them in IMG_FSTYPES variable.
This also deprecates using IMG_TYPE variable.
Actually, IMG_TYPE=>IMG_FSTYPES renaming is done just
to correspond Yocto/OE naming and is not mandatory.
So, the last patch in series may be omitted.
Uladzimir Bely (6):
image: Support multiple image types in WORKDIR and STAMPS
wic-img: Set weak default value for WKS_FILE
start_vm: Use the first image type to start VM
multiconfig: Add ext4-img type to qemuamd64-buster multiconfig.
doc: Update docs to fit new IMAGE_TYPE meaning
api: Rename IMAGE_TYPE to IMAGE_FSTYPES
RECIPE-API-CHANGELOG.md | 5 +++
doc/user_manual.md | 31 +++++++++++++------
meta-isar/conf/machine/bananapi.conf | 2 +-
meta-isar/conf/machine/container-amd64.conf | 2 +-
meta-isar/conf/machine/de0-nano-soc.conf | 2 +-
meta-isar/conf/machine/hikey.conf | 2 +-
meta-isar/conf/machine/nand-ubi-demo.conf | 2 +-
meta-isar/conf/machine/nanopi-neo.conf | 2 +-
meta-isar/conf/machine/qemuamd64.conf | 2 +-
meta-isar/conf/machine/qemuarm.conf | 2 +-
meta-isar/conf/machine/qemuarm64.conf | 2 +-
meta-isar/conf/machine/qemui386.conf | 2 +-
meta-isar/conf/machine/qemumipsel.conf | 2 +-
meta-isar/conf/machine/qemuriscv64.conf | 2 +-
meta-isar/conf/machine/rpi.conf | 2 +-
meta-isar/conf/machine/sifive-fu540.conf | 2 +-
meta-isar/conf/machine/stm32mp15x.conf | 2 +-
meta-isar/conf/machine/virtualbox.conf | 2 +-
meta-isar/conf/machine/vmware.conf | 2 +-
.../multiconfig/qemuamd64-buster-cpiogz.conf | 2 +-
.../multiconfig/qemuamd64-buster-tgz.conf | 2 +-
.../conf/multiconfig/qemuamd64-buster.conf | 2 ++
meta/classes/image.bbclass | 14 ++++++---
meta/classes/wic-img.bbclass | 2 ++
scripts/start_vm | 8 +++--
testsuite/start_vm.py | 2 +-
26 files changed, 65 insertions(+), 37 deletions(-)
--
2.20.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 1/6] image: Support multiple image types in WORKDIR and STAMPS
2021-11-19 9:09 [PATCH v3 0/6] Uladzimir Bely
@ 2021-11-19 9:09 ` Uladzimir Bely
2021-11-19 9:09 ` [PATCH v3 2/6] wic-img: Set weak default value for WKS_FILE Uladzimir Bely
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Uladzimir Bely @ 2021-11-19 9:09 UTC (permalink / raw)
To: isar-users
If we want to support several image types listed in IMAGE_TYPE,
we should consider this part in WORKDIR, STAMP and STAMPCLEAN.
The solution is to replace spaces with underscores
Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
meta/classes/image.bbclass | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 5a0f32e4..2d060704 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -1,10 +1,12 @@
# This software is a part of ISAR.
# Copyright (C) 2015-2017 ilbers GmbH
+# Replace possible multiple spaces with single underscores
+IMAGE_SUFFIX = "${@'_'.join(d.getVar("IMAGE_TYPE", True).split())}"
# Make workdir and stamps machine-specific without changing common PN target
-WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_TYPE}/${PV}-${PR}"
-STAMP = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_TYPE}/${PV}-${PR}"
-STAMPCLEAN = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_TYPE}/*-*"
+WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_SUFFIX}/${PV}-${PR}"
+STAMP = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_SUFFIX}/${PV}-${PR}"
+STAMPCLEAN = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_SUFFIX}/*-*"
IMAGE_INSTALL ?= ""
IMAGE_TYPE ?= "ext4-img"
--
2.20.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 2/6] wic-img: Set weak default value for WKS_FILE
2021-11-19 9:09 [PATCH v3 0/6] Uladzimir Bely
2021-11-19 9:09 ` [PATCH v3 1/6] image: Support multiple image types in WORKDIR and STAMPS Uladzimir Bely
@ 2021-11-19 9:09 ` Uladzimir Bely
2021-11-19 9:09 ` [PATCH v3 3/6] start_vm: Use the first image type to start VM Uladzimir Bely
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Uladzimir Bely @ 2021-11-19 9:09 UTC (permalink / raw)
To: isar-users
In case user lists "wic-img" in IMAGE_TYPE variable, bitbake fails
at early parsing stages because WKS_FILE is not defined at this
moment.
Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
meta/classes/wic-img.bbclass | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass
index caad1b1f..7332e955 100644
--- a/meta/classes/wic-img.bbclass
+++ b/meta/classes/wic-img.bbclass
@@ -6,6 +6,8 @@
WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}')}"
+WKS_FILE ??= "sdimage-efi"
+
do_copy_wks_template[file-checksums] += "${WKS_FILE_CHECKSUM}"
do_copy_wks_template () {
cp -f '${WKS_TEMPLATE_PATH}' '${WORKDIR}/${WKS_TEMPLATE_FILE}'
--
2.20.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 3/6] start_vm: Use the first image type to start VM
2021-11-19 9:09 [PATCH v3 0/6] Uladzimir Bely
2021-11-19 9:09 ` [PATCH v3 1/6] image: Support multiple image types in WORKDIR and STAMPS Uladzimir Bely
2021-11-19 9:09 ` [PATCH v3 2/6] wic-img: Set weak default value for WKS_FILE Uladzimir Bely
@ 2021-11-19 9:09 ` Uladzimir Bely
2021-11-19 9:09 ` [PATCH v3 4/6] multiconfig: Add ext4-img type to qemuamd64-buster multiconfig Uladzimir Bely
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Uladzimir Bely @ 2021-11-19 9:09 UTC (permalink / raw)
To: isar-users
If there are several image types listed in IMAGE_TYPE, we need
to use the only to start VM. Let first one be the default.
Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
scripts/start_vm | 2 ++
testsuite/start_vm.py | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/start_vm b/scripts/start_vm
index 28ada302..38355a6a 100755
--- a/scripts/start_vm
+++ b/scripts/start_vm
@@ -110,6 +110,8 @@ 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=\|^IMAGE_FULLNAME=\)")
+# Take first image type for VM if there are several defined
+IMAGE_TYPE=$(echo "$IMAGE_TYPE" | awk '{print $1}')
case "$IMAGE_TYPE" in
ext4-img)
readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.ext4.img
diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py
index 8f0ccd64..63c90059 100755
--- a/testsuite/start_vm.py
+++ b/testsuite/start_vm.py
@@ -28,7 +28,7 @@ def format_qemu_cmdline(arch, build, distro, out, pid):
extra_args = ''
cpu = ['']
- image_type = get_bitbake_var(bb_output, 'IMAGE_TYPE')
+ image_type = get_bitbake_var(bb_output, 'IMAGE_TYPE').split()[0]
deploy_dir_image = get_bitbake_var(bb_output, 'DEPLOY_DIR_IMAGE')
base = 'ubuntu' if distro in ['focal', 'bionic'] else 'debian'
if image_type == 'ext4-img':
--
2.20.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 4/6] multiconfig: Add ext4-img type to qemuamd64-buster multiconfig.
2021-11-19 9:09 [PATCH v3 0/6] Uladzimir Bely
` (2 preceding siblings ...)
2021-11-19 9:09 ` [PATCH v3 3/6] start_vm: Use the first image type to start VM Uladzimir Bely
@ 2021-11-19 9:09 ` Uladzimir Bely
2021-11-19 9:09 ` [PATCH v3 5/6] doc: Update docs to fit new IMAGE_TYPE meaning Uladzimir Bely
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Uladzimir Bely @ 2021-11-19 9:09 UTC (permalink / raw)
To: isar-users
If we have two image types in qemuamd64-buster mc configuration
we are able to test multiple image support and we don't overlap
separate configurations for -cpiog and -tgz.
Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
meta-isar/conf/multiconfig/qemuamd64-buster.conf | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
index 3fabd675..d6981bfe 100644
--- a/meta-isar/conf/multiconfig/qemuamd64-buster.conf
+++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
@@ -2,3 +2,5 @@
MACHINE ?= "qemuamd64"
DISTRO ?= "debian-buster"
+
+IMAGE_TYPE ?= "wic-img ext4-img"
--
2.20.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 5/6] doc: Update docs to fit new IMAGE_TYPE meaning
2021-11-19 9:09 [PATCH v3 0/6] Uladzimir Bely
` (3 preceding siblings ...)
2021-11-19 9:09 ` [PATCH v3 4/6] multiconfig: Add ext4-img type to qemuamd64-buster multiconfig Uladzimir Bely
@ 2021-11-19 9:09 ` Uladzimir Bely
2021-11-19 9:09 ` [PATCH v3 6/6] api: Rename IMAGE_TYPE to IMAGE_FSTYPES Uladzimir Bely
2021-11-19 9:19 ` [PATCH v3 0/6] ub...@ilbers.de
6 siblings, 0 replies; 8+ messages in thread
From: Uladzimir Bely @ 2021-11-19 9:09 UTC (permalink / raw)
To: isar-users
While now IMAGE_TYPE allows to specify several image types,
separated by space, this needs to be mentioned in manuals.
Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
doc/user_manual.md | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/doc/user_manual.md b/doc/user_manual.md
index 535d456a..f8f58a5c 100644
--- a/doc/user_manual.md
+++ b/doc/user_manual.md
@@ -210,7 +210,10 @@ tmp/deploy/images/rpi/isar-image-base.rpi-sdimg
### Generate full disk image
-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.
+A bootable disk image is generated if `wic-img` is listed in IMAGE_TYPE.
+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 mc:qemui386-buster:isar-image-base
@@ -246,7 +249,7 @@ https://github.com/intel/bmap-tools
### Generate container image with root filesystem
-A runnable container image is generated if you set IMAGE_TYPE to
+A runnable container image is generated if IMAGE_TYPE variable includes
'container-img'.
Getting a container image can be the main purpose of an Isar configuration,
but not only.
@@ -457,6 +460,14 @@ Isar can generate various images types for specific machine. The type of the ima
- `ubi-img` - A image for use on mtd nand partitions employing UBI
- `vm-img` - A image for use on VirtualBox or VMware
+There are several image types can be listed in `IMAGE_TYPE` divided by space.
+
+Instead of setting multiple image types in one target, user can also use
+[multiconfig](#building-target-images-for-multiple-configurations) feature and specify
+different image types in different multiconfigs (use qemuamd64-buster-cpiogz.conf
+and qemuamd64-buster-tgz.conf as examples). The only requirement is that image types
+from different multiconfigs for the same machine/distros should not overlap.
+
---
## Add a New Distro
@@ -508,7 +519,7 @@ Every machine is described in its configuration file. The file defines the follo
- `KERNEL_IMAGE` - The name of kernel binary that it installed to `/boot` folder in target filesystem. This variable is used by Isar to extract the kernel binary and put it into the deploy folder. This makes sense for embedded devices, where kernel and root filesystem are written to different flash partitions. This variable is optional.
- `INITRD_IMAGE` - The name of `ramdisk` binary. The meaning of this variable is similar to `KERNEL_IMAGE`. This variable is optional.
- `MACHINE_SERIAL` - The name of serial device that will be used for console output.
- - `IMAGE_TYPE` - The type of images to be generated for this machine.
+ - `IMAGE_TYPE` - The types of images to be generated for this machine.
Below is an example of machine configuration file for `Raspberry Pi` board:
```
--
2.20.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 6/6] api: Rename IMAGE_TYPE to IMAGE_FSTYPES
2021-11-19 9:09 [PATCH v3 0/6] Uladzimir Bely
` (4 preceding siblings ...)
2021-11-19 9:09 ` [PATCH v3 5/6] doc: Update docs to fit new IMAGE_TYPE meaning Uladzimir Bely
@ 2021-11-19 9:09 ` Uladzimir Bely
2021-11-19 9:19 ` [PATCH v3 0/6] ub...@ilbers.de
6 siblings, 0 replies; 8+ messages in thread
From: Uladzimir Bely @ 2021-11-19 9:09 UTC (permalink / raw)
To: isar-users
The variable is renamed to get closer to OpenEmbedded/Poky
variables naming. If user still uses IMAGE_TYPE, it will be used
with the deprecation warning shown.
Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
RECIPE-API-CHANGELOG.md | 5 +++++
doc/user_manual.md | 22 ++++++++++---------
meta-isar/conf/machine/bananapi.conf | 2 +-
meta-isar/conf/machine/container-amd64.conf | 2 +-
meta-isar/conf/machine/de0-nano-soc.conf | 2 +-
meta-isar/conf/machine/hikey.conf | 2 +-
meta-isar/conf/machine/nand-ubi-demo.conf | 2 +-
meta-isar/conf/machine/nanopi-neo.conf | 2 +-
meta-isar/conf/machine/qemuamd64.conf | 2 +-
meta-isar/conf/machine/qemuarm.conf | 2 +-
meta-isar/conf/machine/qemuarm64.conf | 2 +-
meta-isar/conf/machine/qemui386.conf | 2 +-
meta-isar/conf/machine/qemumipsel.conf | 2 +-
meta-isar/conf/machine/qemuriscv64.conf | 2 +-
meta-isar/conf/machine/rpi.conf | 2 +-
meta-isar/conf/machine/sifive-fu540.conf | 2 +-
meta-isar/conf/machine/stm32mp15x.conf | 2 +-
meta-isar/conf/machine/virtualbox.conf | 2 +-
meta-isar/conf/machine/vmware.conf | 2 +-
.../multiconfig/qemuamd64-buster-cpiogz.conf | 2 +-
.../multiconfig/qemuamd64-buster-tgz.conf | 2 +-
.../conf/multiconfig/qemuamd64-buster.conf | 2 +-
meta/classes/image.bbclass | 8 ++++---
scripts/start_vm | 8 +++----
testsuite/start_vm.py | 2 +-
25 files changed, 47 insertions(+), 38 deletions(-)
diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
index 7312d4d4..55836258 100644
--- a/RECIPE-API-CHANGELOG.md
+++ b/RECIPE-API-CHANGELOG.md
@@ -301,3 +301,8 @@ Kernel update with "apt-get" will not work since bootloader configuration will
not be updated. It used to "kind of work" for grub and efi, that hack is gone.
When using the plugins it is advised to name the partition "/boot" and to exclude boot from the follwing rootfs to not waste space.
+
+### Rename IMAGE_TYPE to IMAGE_FSTYPES
+
+The variable is renamed to get closer to OE/Poky variables naming. The old naming
+will still also work, but with deprecation warning shown.
diff --git a/doc/user_manual.md b/doc/user_manual.md
index f8f58a5c..f6badb8e 100644
--- a/doc/user_manual.md
+++ b/doc/user_manual.md
@@ -210,7 +210,7 @@ tmp/deploy/images/rpi/isar-image-base.rpi-sdimg
### Generate full disk image
-A bootable disk image is generated if `wic-img` is listed in IMAGE_TYPE.
+A bootable disk image is generated if `wic-img` is listed in IMAGE_FSTYPES.
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.
@@ -249,7 +249,7 @@ https://github.com/intel/bmap-tools
### Generate container image with root filesystem
-A runnable container image is generated if IMAGE_TYPE variable includes
+A runnable container image is generated if IMAGE_FSTYPES variable includes
'container-img'.
Getting a container image can be the main purpose of an Isar configuration,
but not only.
@@ -290,8 +290,8 @@ The resulting container image archives (only for `docker-archive` and
For one-shot builds (use `local.conf` otherwise):
```
-export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE IMAGE_TYPE CONTAINER_FORMAT"
-export IMAGE_TYPE="container-img"
+export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE IMAGE_FSTYPES CONTAINER_FORMAT"
+export IMAGE_FSTYPES="container-img"
export CONTAINER_FORMAT="docker-archive"
```
@@ -452,7 +452,9 @@ Please refer to `Add a Custom Application` section for more information about wr
## Image Type Selection
-Isar can generate various images types for specific machine. The type of the image to be generated may be specified through the `IMAGE_TYPE` variable. Currently, the following image types are provided:
+Isar can generate various images types for specific machine. The type of the
+image to be generated may be specified through the `IMAGE_FSTYPES` variable.
+Currently, the following image types are provided:
- `ext4` - Raw ext4 filesystem image (default option for `qemuarm` machine).
- `rpi-sdimg` - A complete, partitioned Raspberry Pi SD card image (default option for the `rpi` machine).
@@ -460,7 +462,7 @@ Isar can generate various images types for specific machine. The type of the ima
- `ubi-img` - A image for use on mtd nand partitions employing UBI
- `vm-img` - A image for use on VirtualBox or VMware
-There are several image types can be listed in `IMAGE_TYPE` divided by space.
+There are several image types can be listed in `IMAGE_FSTYPES` divided by space.
Instead of setting multiple image types in one target, user can also use
[multiconfig](#building-target-images-for-multiple-configurations) feature and specify
@@ -519,7 +521,7 @@ Every machine is described in its configuration file. The file defines the follo
- `KERNEL_IMAGE` - The name of kernel binary that it installed to `/boot` folder in target filesystem. This variable is used by Isar to extract the kernel binary and put it into the deploy folder. This makes sense for embedded devices, where kernel and root filesystem are written to different flash partitions. This variable is optional.
- `INITRD_IMAGE` - The name of `ramdisk` binary. The meaning of this variable is similar to `KERNEL_IMAGE`. This variable is optional.
- `MACHINE_SERIAL` - The name of serial device that will be used for console output.
- - `IMAGE_TYPE` - The types of images to be generated for this machine.
+ - `IMAGE_FSTYPES` - The types of images to be generated for this machine.
Below is an example of machine configuration file for `Raspberry Pi` board:
```
@@ -528,7 +530,7 @@ IMAGE_PREINSTALL = "linux-image-rpi-rpfv \
KERNEL_IMAGE = "vmlinuz-4.4.0-1-rpi"
INITRD_IMAGE = "initrd.img-4.4.0-1-rpi"
MACHINE_SERIAL = "ttyAMA0"
-IMAGE_TYPE = "rpi-sdimg"
+IMAGE_FSTYPES = "rpi-sdimg"
```
To add new machine user should perform the following steps:
@@ -561,7 +563,7 @@ The user may use `meta-isar/recipes-core/images` as a template for new image rec
### General Information
The image recipe in Isar creates a folder with target root filesystem. Its default location is:
```
-tmp/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_TYPE}/${PV}-${PR}/rootfs
+tmp/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_FSTYPES}/${PV}-${PR}/rootfs
```
Every image type in Isar is implemented as a `bitbake` class. The goal of these classes is to pack root filesystem folder to appropriate format.
@@ -584,7 +586,7 @@ The content of `do_my_image` function can be implemented either in shell or in P
In the machine configuration file, set the following:
```
-IMAGE_TYPE = "my-image"
+IMAGE_FSTYPES = "my-image"
```
### Reference Classes
diff --git a/meta-isar/conf/machine/bananapi.conf b/meta-isar/conf/machine/bananapi.conf
index cec80578..dd3a0667 100644
--- a/meta-isar/conf/machine/bananapi.conf
+++ b/meta-isar/conf/machine/bananapi.conf
@@ -9,6 +9,6 @@ KERNEL_NAME ?= "armmp"
IMAGE_INSTALL += "u-boot-script"
-IMAGE_TYPE ?= "wic-img"
+IMAGE_FSTYPES ?= "wic-img"
WKS_FILE ?= "bananapi"
IMAGER_INSTALL += "u-boot-sunxi"
diff --git a/meta-isar/conf/machine/container-amd64.conf b/meta-isar/conf/machine/container-amd64.conf
index d2978c46..1f7669ad 100644
--- a/meta-isar/conf/machine/container-amd64.conf
+++ b/meta-isar/conf/machine/container-amd64.conf
@@ -4,4 +4,4 @@
# SPDX-License-Identifier: MIT
DISTRO_ARCH ?= "amd64"
-IMAGE_TYPE ?= "container-img"
+IMAGE_FSTYPES ?= "container-img"
diff --git a/meta-isar/conf/machine/de0-nano-soc.conf b/meta-isar/conf/machine/de0-nano-soc.conf
index 5e35602c..f822e24b 100644
--- a/meta-isar/conf/machine/de0-nano-soc.conf
+++ b/meta-isar/conf/machine/de0-nano-soc.conf
@@ -11,7 +11,7 @@ PREFERRED_PROVIDER_u-boot-de0-nano-soc = "u-boot-de0-nano-soc"
U_BOOT_CONFIG_de0-nano-soc = "socfpga_de0_nano_soc_defconfig"
U_BOOT_BIN_de0-nano-soc = "u-boot-with-spl.sfp"
-IMAGE_TYPE ?= "wic-img"
+IMAGE_FSTYPES ?= "wic-img"
WKS_FILE ?= "de0-nano-soc.wks.in"
IMAGER_INSTALL += "u-boot-de0-nano-soc"
IMAGER_BUILD_DEPS += "u-boot-de0-nano-soc"
diff --git a/meta-isar/conf/machine/hikey.conf b/meta-isar/conf/machine/hikey.conf
index 09dfaf49..615d6749 100644
--- a/meta-isar/conf/machine/hikey.conf
+++ b/meta-isar/conf/machine/hikey.conf
@@ -7,7 +7,7 @@ DISTRO_ARCH = "arm64"
KERNEL_NAME ?= "mainline"
-IMAGE_TYPE = "wic-img"
+IMAGE_FSTYPES = "wic-img"
WKS_FILE ?= "hikey"
IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
diff --git a/meta-isar/conf/machine/nand-ubi-demo.conf b/meta-isar/conf/machine/nand-ubi-demo.conf
index 25ec72f3..5be337f9 100644
--- a/meta-isar/conf/machine/nand-ubi-demo.conf
+++ b/meta-isar/conf/machine/nand-ubi-demo.conf
@@ -8,6 +8,6 @@ BAUDRATE_TTY ?= "115200"
MKUBIFS_ARGS := "-m 0x1000 -e 0x3e000 -c 1500"
UBINIZE_ARGS = "-vv -m 0x1000 -p 0x40000"
-IMAGE_TYPE ?= "ubi-ubifs-img"
+IMAGE_FSTYPES ?= "ubi-ubifs-img"
DTB_FILES = "imx6q-sabrelite.dtb"
diff --git a/meta-isar/conf/machine/nanopi-neo.conf b/meta-isar/conf/machine/nanopi-neo.conf
index 703b4f4e..2475ce9d 100644
--- a/meta-isar/conf/machine/nanopi-neo.conf
+++ b/meta-isar/conf/machine/nanopi-neo.conf
@@ -7,7 +7,7 @@ DISTRO_ARCH ?= "armhf"
KERNEL_NAME ?= "armmp"
-IMAGE_TYPE ?= "wic-img"
+IMAGE_FSTYPES ?= "wic-img"
WKS_FILE ?= "nanopi-neo.wks.in"
IMAGE_INSTALL += "u-boot-script"
diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf
index dab4f094..ccfde391 100644
--- a/meta-isar/conf/machine/qemuamd64.conf
+++ b/meta-isar/conf/machine/qemuamd64.conf
@@ -6,7 +6,7 @@ DISTRO_ARCH ?= "amd64"
KERNEL_NAME ?= "amd64"
KERNEL_NAME_ubuntu-focal ?= "generic"
-IMAGE_TYPE ?= "wic-img"
+IMAGE_FSTYPES ?= "wic-img"
WKS_FILE ?= "sdimage-efi"
IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
diff --git a/meta-isar/conf/machine/qemuarm.conf b/meta-isar/conf/machine/qemuarm.conf
index fbbdc233..20a71ea4 100644
--- a/meta-isar/conf/machine/qemuarm.conf
+++ b/meta-isar/conf/machine/qemuarm.conf
@@ -5,7 +5,7 @@ DISTRO_ARCH ?= "armhf"
KERNEL_NAME ?= "armmp"
-IMAGE_TYPE ?= "ext4-img"
+IMAGE_FSTYPES ?= "ext4-img"
QEMU_ROOTFS_DEV ?= "vda"
diff --git a/meta-isar/conf/machine/qemuarm64.conf b/meta-isar/conf/machine/qemuarm64.conf
index e5e762ff..ca23cef5 100644
--- a/meta-isar/conf/machine/qemuarm64.conf
+++ b/meta-isar/conf/machine/qemuarm64.conf
@@ -6,7 +6,7 @@ DISTRO_ARCH ?= "arm64"
KERNEL_NAME ?= "arm64"
KERNEL_NAME_ubuntu-focal ?= "generic"
-IMAGE_TYPE ?= "ext4-img"
+IMAGE_FSTYPES ?= "ext4-img"
QEMU_ROOTFS_DEV ?= "vda"
diff --git a/meta-isar/conf/machine/qemui386.conf b/meta-isar/conf/machine/qemui386.conf
index e6afb06b..17cff1eb 100644
--- a/meta-isar/conf/machine/qemui386.conf
+++ b/meta-isar/conf/machine/qemui386.conf
@@ -4,7 +4,7 @@ DISTRO_ARCH ?= "i386"
KERNEL_NAME ?= "686-pae"
-IMAGE_TYPE ?= "wic-img"
+IMAGE_FSTYPES ?= "wic-img"
WKS_FILE ?= "directdisk-isar"
IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}"
diff --git a/meta-isar/conf/machine/qemumipsel.conf b/meta-isar/conf/machine/qemumipsel.conf
index 85178ee9..b34e46de 100644
--- a/meta-isar/conf/machine/qemumipsel.conf
+++ b/meta-isar/conf/machine/qemumipsel.conf
@@ -5,7 +5,7 @@ DISTRO_ARCH ?= "mipsel"
KERNEL_NAME ?= "4kc-malta"
-IMAGE_TYPE ?= "ext4-img"
+IMAGE_FSTYPES ?= "ext4-img"
QEMU_ROOTFS_DEV ?= "sda"
diff --git a/meta-isar/conf/machine/qemuriscv64.conf b/meta-isar/conf/machine/qemuriscv64.conf
index f4f5312a..5c687a03 100644
--- a/meta-isar/conf/machine/qemuriscv64.conf
+++ b/meta-isar/conf/machine/qemuriscv64.conf
@@ -8,7 +8,7 @@ DISTRO_ARCH ?= "riscv64"
KERNEL_NAME ?= "riscv64"
-IMAGE_TYPE ?= "ext4-img"
+IMAGE_FSTYPES ?= "ext4-img"
QEMU_ROOTFS_DEV ?= "vda"
diff --git a/meta-isar/conf/machine/rpi.conf b/meta-isar/conf/machine/rpi.conf
index 31f22191..61852a9b 100644
--- a/meta-isar/conf/machine/rpi.conf
+++ b/meta-isar/conf/machine/rpi.conf
@@ -4,4 +4,4 @@
MACHINE_SERIAL ?= "ttyAMA0"
BAUDRATE_TTY ?= "9600"
-IMAGE_TYPE ?= "rpi-sdimg"
+IMAGE_FSTYPES ?= "rpi-sdimg"
diff --git a/meta-isar/conf/machine/sifive-fu540.conf b/meta-isar/conf/machine/sifive-fu540.conf
index c815f4a8..d73f0475 100644
--- a/meta-isar/conf/machine/sifive-fu540.conf
+++ b/meta-isar/conf/machine/sifive-fu540.conf
@@ -7,7 +7,7 @@ DISTRO_ARCH = "riscv64"
KERNEL_NAME ?= "mainline"
-IMAGE_TYPE ?= "wic-img"
+IMAGE_FSTYPES ?= "wic-img"
WKS_FILE ?= "sifive-fu540"
IMAGER_INSTALL += "opensbi-sifive-fu540"
IMAGER_BUILD_DEPS += "opensbi-sifive-fu540"
diff --git a/meta-isar/conf/machine/stm32mp15x.conf b/meta-isar/conf/machine/stm32mp15x.conf
index e963d080..22e88ea9 100644
--- a/meta-isar/conf/machine/stm32mp15x.conf
+++ b/meta-isar/conf/machine/stm32mp15x.conf
@@ -11,7 +11,7 @@ PREFERRED_PROVIDER_u-boot-stm32mp15x = "u-boot-stm32mp15x"
U_BOOT_CONFIG_stm32mp15x = "stm32mp15_trusted_defconfig"
U_BOOT_BIN_stm32mp15x = "u-boot.stm32"
-IMAGE_TYPE ?= "wic-img"
+IMAGE_FSTYPES ?= "wic-img"
WKS_FILE ?= "stm32mp15x.wks.in"
IMAGER_INSTALL += "trusted-firmware-a-stm32mp15x optee-os-stm32mp15x u-boot-stm32mp15x"
IMAGER_BUILD_DEPS += "trusted-firmware-a-stm32mp15x optee-os-stm32mp15x u-boot-stm32mp15x"
diff --git a/meta-isar/conf/machine/virtualbox.conf b/meta-isar/conf/machine/virtualbox.conf
index b20eaca6..c0f65842 100644
--- a/meta-isar/conf/machine/virtualbox.conf
+++ b/meta-isar/conf/machine/virtualbox.conf
@@ -12,4 +12,4 @@ WKS_FILE ?= "sdimage-efi"
IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
VMDK_SUBFORMAT = "monolithicSparse"
-IMAGE_TYPE ?= "vm-img"
+IMAGE_FSTYPES ?= "vm-img"
diff --git a/meta-isar/conf/machine/vmware.conf b/meta-isar/conf/machine/vmware.conf
index 731559e7..5832b299 100644
--- a/meta-isar/conf/machine/vmware.conf
+++ b/meta-isar/conf/machine/vmware.conf
@@ -12,4 +12,4 @@ WKS_FILE ?= "sdimage-efi"
IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
VMDK_SUBFORMAT = "streamOptimized"
-IMAGE_TYPE ?= "vm-img"
+IMAGE_FSTYPES ?= "vm-img"
diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf
index cadcdacf..37f89581 100644
--- a/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf
+++ b/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf
@@ -6,4 +6,4 @@
MACHINE ?= "qemuamd64"
DISTRO ?= "debian-buster"
-IMAGE_TYPE = "cpiogz-img"
+IMAGE_FSTYPES = "cpiogz-img"
diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf
index 17de3384..e3992e60 100644
--- a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf
+++ b/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf
@@ -6,4 +6,4 @@
MACHINE ?= "qemuamd64"
DISTRO ?= "debian-buster"
-IMAGE_TYPE ?= "targz-img"
+IMAGE_FSTYPES ?= "targz-img"
diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
index d6981bfe..5615198d 100644
--- a/meta-isar/conf/multiconfig/qemuamd64-buster.conf
+++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
@@ -3,4 +3,4 @@
MACHINE ?= "qemuamd64"
DISTRO ?= "debian-buster"
-IMAGE_TYPE ?= "wic-img ext4-img"
+IMAGE_FSTYPES ?= "wic-img ext4-img"
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 2d060704..0fab40e0 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -2,14 +2,14 @@
# Copyright (C) 2015-2017 ilbers GmbH
# Replace possible multiple spaces with single underscores
-IMAGE_SUFFIX = "${@'_'.join(d.getVar("IMAGE_TYPE", True).split())}"
+IMAGE_SUFFIX = "${@'_'.join(d.getVar("IMAGE_FSTYPES", True).split())}"
# Make workdir and stamps machine-specific without changing common PN target
WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_SUFFIX}/${PV}-${PR}"
STAMP = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_SUFFIX}/${PV}-${PR}"
STAMPCLEAN = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_SUFFIX}/*-*"
IMAGE_INSTALL ?= ""
-IMAGE_TYPE ?= "ext4-img"
+IMAGE_FSTYPES ?= "${@ d.getVar("IMAGE_TYPE", True) if d.getVar("IMAGE_TYPE", True) else "ext4-img"}"
IMAGE_ROOTFS ?= "${WORKDIR}/rootfs"
IMAGE_INSTALL += "${@ ("linux-image-" + d.getVar("KERNEL_NAME", True)) if d.getVar("KERNEL_NAME", True) else ""}"
@@ -38,6 +38,8 @@ BUILDROOT_WORK = "${BUILDCHROOT_DIR}${PP_WORK}"
python(){
if (d.getVar('IMAGE_TRANSIENT_PACKAGES')):
bb.warn("IMAGE_TRANSIENT_PACKAGES is set and no longer supported")
+ if (d.getVar('IMAGE_TYPE')):
+ bb.warn("IMAGE_TYPE is deprecated, please switch to IMAGE_FSTYPES")
}
def cfg_script(d):
@@ -222,4 +224,4 @@ EOSUDO
addtask rootfs_finalize before do_rootfs after do_rootfs_postprocess
# Last so that the image type can overwrite tasks if needed
-inherit ${IMAGE_TYPE}
+inherit ${IMAGE_FSTYPES}
diff --git a/scripts/start_vm b/scripts/start_vm
index 38355a6a..2d8a8b7e 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=\|^IMAGE_FULLNAME=\)")
+eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "\(^IMAGE_FSTYPES=\|^IMAGE_FULLNAME=\)")
# Take first image type for VM if there are several defined
-IMAGE_TYPE=$(echo "$IMAGE_TYPE" | awk '{print $1}')
-case "$IMAGE_TYPE" in
+IMAGE_FSTYPES=$(echo "$IMAGE_FSTYPES" | awk '{print $1}')
+case "$IMAGE_FSTYPES" in
ext4-img)
readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.ext4.img
@@ -135,7 +135,7 @@ case "$IMAGE_TYPE" in
EXTRA_ARGS="$EXTRA_ARGS -snapshot"
;;
*)
- echo "IMAGE_TYPE \"$IMAGE_TYPE\" not supported"
+ echo "IMAGE_FSTYPES \"$IMAGE_FSTYPES\" not supported"
exit 1
;;
esac
diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py
index 63c90059..4f5b2ec4 100755
--- a/testsuite/start_vm.py
+++ b/testsuite/start_vm.py
@@ -28,7 +28,7 @@ def format_qemu_cmdline(arch, build, distro, out, pid):
extra_args = ''
cpu = ['']
- image_type = get_bitbake_var(bb_output, 'IMAGE_TYPE').split()[0]
+ image_type = get_bitbake_var(bb_output, 'IMAGE_FSTYPES').split()[0]
deploy_dir_image = get_bitbake_var(bb_output, 'DEPLOY_DIR_IMAGE')
base = 'ubuntu' if distro in ['focal', 'bionic'] else 'debian'
if image_type == 'ext4-img':
--
2.20.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 0/6]
2021-11-19 9:09 [PATCH v3 0/6] Uladzimir Bely
` (5 preceding siblings ...)
2021-11-19 9:09 ` [PATCH v3 6/6] api: Rename IMAGE_TYPE to IMAGE_FSTYPES Uladzimir Bely
@ 2021-11-19 9:19 ` ub...@ilbers.de
6 siblings, 0 replies; 8+ messages in thread
From: ub...@ilbers.de @ 2021-11-19 9:19 UTC (permalink / raw)
To: isar-users
[-- Attachment #1.1: Type: text/plain, Size: 2637 bytes --]
Sorry, forgot to add title here (Support multiple image types in one build)
and patchset attached to the wrong topic...
пятница, 19 ноября 2021 г. в 12:09:09 UTC+3, ub...@ilbers.de:
> Changed since v2:
> - get back multiconfigs removed in v2/v1;
> - mc:qemuamd64-buster now builds wic-img and ext4-img and doesn't
> conflict with mc:qemuamd64--cpiogz and mc:qemuamd64--tgz;
> - docs updated to fit new (array-like) meaning of the variable
> IMAGE_TYPE (IMAGE_FSTYPES with last patch).
>
> Changes since v1:
> - removed mc:qemuamd64-buster-cpiogz config;
> - mc:qemuamd64-buster config now includes cpiogz image type.
>
> The patchset makes possible to build several image types for
> the specific target by listing all them in IMG_FSTYPES variable.
>
> This also deprecates using IMG_TYPE variable.
>
> Actually, IMG_TYPE=>IMG_FSTYPES renaming is done just
> to correspond Yocto/OE naming and is not mandatory.
> So, the last patch in series may be omitted.
>
> Uladzimir Bely (6):
> image: Support multiple image types in WORKDIR and STAMPS
> wic-img: Set weak default value for WKS_FILE
> start_vm: Use the first image type to start VM
> multiconfig: Add ext4-img type to qemuamd64-buster multiconfig.
> doc: Update docs to fit new IMAGE_TYPE meaning
> api: Rename IMAGE_TYPE to IMAGE_FSTYPES
>
> RECIPE-API-CHANGELOG.md | 5 +++
> doc/user_manual.md | 31 +++++++++++++------
> meta-isar/conf/machine/bananapi.conf | 2 +-
> meta-isar/conf/machine/container-amd64.conf | 2 +-
> meta-isar/conf/machine/de0-nano-soc.conf | 2 +-
> meta-isar/conf/machine/hikey.conf | 2 +-
> meta-isar/conf/machine/nand-ubi-demo.conf | 2 +-
> meta-isar/conf/machine/nanopi-neo.conf | 2 +-
> meta-isar/conf/machine/qemuamd64.conf | 2 +-
> meta-isar/conf/machine/qemuarm.conf | 2 +-
> meta-isar/conf/machine/qemuarm64.conf | 2 +-
> meta-isar/conf/machine/qemui386.conf | 2 +-
> meta-isar/conf/machine/qemumipsel.conf | 2 +-
> meta-isar/conf/machine/qemuriscv64.conf | 2 +-
> meta-isar/conf/machine/rpi.conf | 2 +-
> meta-isar/conf/machine/sifive-fu540.conf | 2 +-
> meta-isar/conf/machine/stm32mp15x.conf | 2 +-
> meta-isar/conf/machine/virtualbox.conf | 2 +-
> meta-isar/conf/machine/vmware.conf | 2 +-
> .../multiconfig/qemuamd64-buster-cpiogz.conf | 2 +-
> .../multiconfig/qemuamd64-buster-tgz.conf | 2 +-
> .../conf/multiconfig/qemuamd64-buster.conf | 2 ++
> meta/classes/image.bbclass | 14 ++++++---
> meta/classes/wic-img.bbclass | 2 ++
> scripts/start_vm | 8 +++--
> testsuite/start_vm.py | 2 +-
> 26 files changed, 65 insertions(+), 37 deletions(-)
>
> --
> 2.20.1
>
>
[-- Attachment #1.2: Type: text/html, Size: 3320 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-11-19 9:19 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-19 9:09 [PATCH v3 0/6] Uladzimir Bely
2021-11-19 9:09 ` [PATCH v3 1/6] image: Support multiple image types in WORKDIR and STAMPS Uladzimir Bely
2021-11-19 9:09 ` [PATCH v3 2/6] wic-img: Set weak default value for WKS_FILE Uladzimir Bely
2021-11-19 9:09 ` [PATCH v3 3/6] start_vm: Use the first image type to start VM Uladzimir Bely
2021-11-19 9:09 ` [PATCH v3 4/6] multiconfig: Add ext4-img type to qemuamd64-buster multiconfig Uladzimir Bely
2021-11-19 9:09 ` [PATCH v3 5/6] doc: Update docs to fit new IMAGE_TYPE meaning Uladzimir Bely
2021-11-19 9:09 ` [PATCH v3 6/6] api: Rename IMAGE_TYPE to IMAGE_FSTYPES Uladzimir Bely
2021-11-19 9:19 ` [PATCH v3 0/6] ub...@ilbers.de
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox