* [PATCH 1/2] meta-isar: Separate images per MACHINE
@ 2019-03-12 20:27 Maxim Yu. Osipov
2019-03-12 20:27 ` [PATCH 2/2] doc/user_manual: Update after images per machine separation Maxim Yu. Osipov
2019-03-13 16:42 ` [PATCH 1/2] meta-isar: Separate images per MACHINE Maxim Yu. Osipov
0 siblings, 2 replies; 16+ messages in thread
From: Maxim Yu. Osipov @ 2019-03-12 20:27 UTC (permalink / raw)
To: isar-users
Image directory gets overwritten when running for two targets
with the same pair DISTRO and DISTRO_ARCH, resulting
start_vm script failure.
Note:
This patch affects the bitbake multiconfig target calling syntax:
PREVIOUS: "multiconfig:$MACHINE-$DISTRO:isar-image-base"
NEW: "multiconfig:$MACHINE-$DISTRO:isar-image-base-$MACHINE"
Suggested-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
---
meta-isar/conf/conf-notes.txt | 6 ++--
meta-isar/recipes-core/images/isar-image-base.bb | 2 ++
meta-isar/recipes-core/images/isar-image-ubi.bb | 2 ++
scripts/ci_build.sh | 40 ++++++++++++------------
scripts/start_vm | 16 +++++-----
5 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/meta-isar/conf/conf-notes.txt b/meta-isar/conf/conf-notes.txt
index 87bd2dc..84049e1 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:rpi-jessie:isar-image-base
+ multiconfig:qemuarm-stretch:isar-image-base-qemuarm
+ multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64
+ multiconfig:rpi-jessie:isar-image-base-rpi
diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb
index c86e63b..0ac0c44 100644
--- a/meta-isar/recipes-core/images/isar-image-base.bb
+++ b/meta-isar/recipes-core/images/isar-image-base.bb
@@ -11,3 +11,5 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260
PV = "1.0"
inherit isar-image
+
+PN .= "-${MACHINE}"
diff --git a/meta-isar/recipes-core/images/isar-image-ubi.bb b/meta-isar/recipes-core/images/isar-image-ubi.bb
index 4b7e109..8059105 100644
--- a/meta-isar/recipes-core/images/isar-image-ubi.bb
+++ b/meta-isar/recipes-core/images/isar-image-ubi.bb
@@ -12,6 +12,8 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260
inherit isar-image
+PN .= "-${MACHINE}"
+
SRC_URI += "file://ubinize.cfg.tmpl \
file://fitimage.its.tmpl"
diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
index bcc7545..b4df70e 100755
--- a/scripts/ci_build.sh
+++ b/scripts/ci_build.sh
@@ -1,7 +1,7 @@
# Script for CI system build
#
# Alexander Smirnov <asmirnov@ilbers.de>
-# Copyright (c) 2016-2018 ilbers GmbH
+# Copyright (c) 2016-2019 ilbers GmbH
#!/bin/sh
@@ -21,21 +21,21 @@ BUILD_DIR=./build
BB_ARGS="-v"
TARGETS_SET="\
- multiconfig:qemuarm-jessie:isar-image-base \
- multiconfig:qemuarm-stretch:isar-image-base \
- multiconfig:qemuarm-buster:isar-image-base \
- multiconfig:qemuarm64-stretch:isar-image-base \
- multiconfig:qemui386-jessie:isar-image-base \
- multiconfig:qemui386-stretch:isar-image-base \
- multiconfig:qemui386-buster:isar-image-base \
- multiconfig:qemuamd64-jessie:isar-image-base \
- multiconfig:qemuamd64-stretch:isar-image-base \
- multiconfig:qemuamd64-buster:isar-image-base \
- multiconfig:qemuamd64-buster-tgz:isar-image-base \
- multiconfig:nand-ubi-demo-buster:isar-image-ubi \
- multiconfig:rpi-jessie:isar-image-base"
+ multiconfig:qemuarm-jessie:isar-image-base-qemuarm \
+ multiconfig:qemuarm-stretch:isar-image-base-qemuarm \
+ multiconfig:qemuarm-buster:isar-image-base-qemuarm \
+ multiconfig:qemuarm64-stretch:isar-image-base-qemuarm64 \
+ multiconfig:qemui386-jessie:isar-image-base-qemui386 \
+ multiconfig:qemui386-stretch:isar-image-base-qemui386 \
+ multiconfig:qemui386-buster:isar-image-base-qemui386 \
+ multiconfig:qemuamd64-jessie:isar-image-base-qemuamd64 \
+ multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64 \
+ multiconfig:qemuamd64-buster:isar-image-base-qemuamd64 \
+ multiconfig:qemuamd64-buster-tgz:isar-image-base-qemuamd64 \
+ multiconfig:nand-ubi-demo-buster:isar-image-ubi-nand-ubi-demo \
+ multiconfig:rpi-jessie:isar-image-base-rpi"
# qemu-user-static of <= buster too old to build that
- # multiconfig:qemuarm64-buster:isar-image-base
+ # multiconfig:qemuarm64-buster:isar-image-base-qemuarm64
show_help() {
@@ -85,9 +85,9 @@ do
FAST_BUILD="1"
CROSS_BUILD="1"
TARGETS_SET="\
- multiconfig:qemuarm-stretch:isar-image-base \
- multiconfig:qemuarm64-stretch:isar-image-base \
- multiconfig:qemuamd64-stretch:isar-image-base"
+ multiconfig:qemuarm-stretch:isar-image-base-qemuarm \
+ multiconfig:qemuarm64-stretch:isar-image-base-qemuarm64 \
+ multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64 "
;;
-q|--quiet)
BB_ARGS=""
@@ -129,12 +129,12 @@ bitbake $BB_ARGS $TARGETS_SET
# parallel build with the same target arch (armhf) fails.
# The problem is being investigated
if [ -n "$FAST_BUILD" ]; then
- bitbake $BB_ARGS multiconfig:de0-nano-soc-stretch:isar-image-base
+ bitbake $BB_ARGS multiconfig:de0-nano-soc-stretch:isar-image-base-de0-nano-soc
fi
cp -a "${ISARROOT}/meta/classes/dpkg-base.bbclass" "${ISARROOT}/meta/classes/dpkg-base.bbclass.ci-backup"
echo -e "do_fetch_append() {\n\n}" >> "${ISARROOT}/meta/classes/dpkg-base.bbclass"
-bitbake $BB_ARGS multiconfig:qemuamd64-stretch:isar-image-base
+bitbake $BB_ARGS multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64
mv "${ISARROOT}/meta/classes/dpkg-base.bbclass.ci-backup" "${ISARROOT}/meta/classes/dpkg-base.bbclass"
diff --git a/scripts/start_vm b/scripts/start_vm
index 1da0742..0c007bf 100755
--- a/scripts/start_vm
+++ b/scripts/start_vm
@@ -1,7 +1,7 @@
#!/bin/sh
#
# This software is a part of ISAR.
-# Copyright (C) 2015-2017 ilbers GmbH
+# Copyright (C) 2015-2019 ilbers GmbH
set -e
@@ -46,7 +46,7 @@ show_help() {
echo " Supported: arm, i386, amd64, arm64."
echo " -b, --build BUILD set path to build directory."
echo " -d, --distro DISTRO set isar Debian distribution."
- echo " Supported: jessie, stretch."
+ echo " Supported: jessie, stretch, buster"
echo " -o, --out FILE Route QEMU console output to"
echo " specified file."
echo " -p, --pid FILE Store QEMU pid to file."
@@ -101,7 +101,7 @@ do
shift
done
-eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | grep "^DEPLOY_DIR_IMAGE=")
+eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base-qemu$ARCH | grep "^DEPLOY_DIR_IMAGE=")
readonly IMAGE_DIR=$DEPLOY_DIR_IMAGE
readonly ISARROOT="$(dirname "$0")"/..
@@ -112,13 +112,13 @@ eval "$(egrep 'MACHINE_SERIAL' $MACHINE_CONF |bb2sh)"
readonly CONFIG_CONF=$ISARROOT/meta-isar/conf/multiconfig/qemu$ARCH-$DISTRO.conf
eval "$(egrep 'QEMU_' $CONFIG_CONF |bb2sh)"
-eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | grep "^IMAGE_TYPE=")
+eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base-qemu$ARCH | grep "^IMAGE_TYPE=")
case "$IMAGE_TYPE" in
ext4-img)
- readonly ROOTFS_IMAGE=isar-image-base-debian-$DISTRO-qemu$ARCH.ext4.img
+ readonly ROOTFS_IMAGE=isar-image-base-qemu$ARCH-debian-$DISTRO-qemu$ARCH.ext4.img
- eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | grep "^KERNEL_IMAGE=")
- eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | grep "^INITRD_IMAGE=")
+ eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base-qemu$ARCH | grep "^KERNEL_IMAGE=")
+ eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base-qemu$ARCH | grep "^INITRD_IMAGE=")
QKERNEL=$IMAGE_DIR/${KERNEL_IMAGE}
QINITRD=/dev/null
[ -n "$INITRD_IMAGE" ] && QINITRD=$IMAGE_DIR/${INITRD_IMAGE}
@@ -128,7 +128,7 @@ 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
+ readonly ROOTFS_IMAGE=isar-image-base-qemu$ARCH-debian-$DISTRO-qemu$ARCH.wic.img
EXTRA_ARGS="$EXTRA_ARGS -snapshot"
;;
*)
--
2.11.0
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 2/2] doc/user_manual: Update after images per machine separation
2019-03-12 20:27 [PATCH 1/2] meta-isar: Separate images per MACHINE Maxim Yu. Osipov
@ 2019-03-12 20:27 ` Maxim Yu. Osipov
2019-03-14 7:14 ` Jan Kiszka
2019-03-13 16:42 ` [PATCH 1/2] meta-isar: Separate images per MACHINE Maxim Yu. Osipov
1 sibling, 1 reply; 16+ messages in thread
From: Maxim Yu. Osipov @ 2019-03-12 20:27 UTC (permalink / raw)
To: isar-users
Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
---
RECIPE-API-CHANGELOG.md | 23 +++++++++++++---
doc/user_manual.md | 72 +++++++++++++++++++++++++------------------------
2 files changed, 57 insertions(+), 38 deletions(-)
diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
index 197ce99..92f5dce 100644
--- a/RECIPE-API-CHANGELOG.md
+++ b/RECIPE-API-CHANGELOG.md
@@ -96,14 +96,14 @@ layer version higher than existing release corename, use the value 'next'.
### location of image artifacts
-Align with OpenEmbedded and place image artifacts in a per-machine folder placed
+Align with OpenEmbedded and place image artifacts in a per-machine directory placed
in tmp/deploy (to avoid collisions among other things).
### more consistent artifact names
multiconfig image artifacts are all placed in tmp/deploy/images. They include
kernel, initrd and ext4/wic images. A consistent naming scheme is now used:
-`IMAGE-DISTRO-MACHINE.TYPE`. This scheme was already used for ext4/wic images
+`IMAGE-MACHINE-DISTRO-MACHINE.TYPE`. This scheme was already used for ext4/wic images
so no visible changes there. Kernel and initrd images are however affected; for
instance:
@@ -114,7 +114,7 @@ vmlinuz-4.9.0-8-armmp_debian-stretch-qemuarm
is now
```
-isar-image-base-debian-stretch-qemuarm.vmlinuz-4.9.0-8-armmp
+isar-image-base-qemuarm-debian-stretch-qemuarm.vmlinuz-4.9.0-8-armmp
```
It should be noted that the `KERNEL_IMAGE` and `INITRD_IMAGE` variables were
@@ -145,3 +145,20 @@ a root password, leak that password via its script in /var/lib/dpkg/info.
Instead set the CFG_ROOT_PW variable to the encrypted password and use the
transient 'isar-cfg-rootpw' package (now installed as transient package per
default).
+
+### Change syntax of bitbake multiconfig target
+
+Image directory gets overwritten when running for two targets
+with the same pair `DISTRO` and `DISTRO_ARCH`, so images are separated
+per `MACHINE` now. This leads to change of bitbake multiconfig target calling syntax
+from
+
+```
+multiconfig:$MACHINE-$DISTRO:isar-image-base
+```
+
+to
+
+```
+multiconfig:$MACHINE-$DISTRO:isar-image-base-$MACHINE
+```
diff --git a/doc/user_manual.md b/doc/user_manual.md
index 6fe4d83..92fc871 100644
--- a/doc/user_manual.md
+++ b/doc/user_manual.md
@@ -130,15 +130,15 @@ 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-stretch:isar-image-base-qemuarm \
+ multiconfig:qemuarm-stretch:isar-image-debug-qemuarm
```
The following images are created:
```
-tmp/deploy/images/isar-image-base-qemuarm-debian-stretch.ext4.img
-tmp/deploy/images/isar-image-debug-qemuarm-debian-stretch.ext4.img
+tmp/deploy/images/isar-image-base-qemuarm-debian-stretch-qemuarm.ext4.img
+tmp/deploy/images/isar-image-debug-qemuarm-debian-stretch-qemuarm.ext4.img
```
### Building Target Images for Multiple Configurations
@@ -168,33 +168,34 @@ The following command will produce `isar-image-base` images for all targets:
```
$ bitbake \
- multiconfig:qemuarm-jessie:isar-image-base \
- multiconfig:qemuarm-stretch:isar-image-base \
- multiconfig:qemuarm-buster:isar-image-base \
- multiconfig:qemuarm64-stretch:isar-image-base \
- multiconfig:qemui386-jessie:isar-image-base \
- multiconfig:qemui386-stretch:isar-image-base \
- multiconfig:qemui386-buster:isar-image-base \
- multiconfig:qemuamd64-jessie:isar-image-base \
- multiconfig:qemuamd64-stretch:isar-image-base \
- multiconfig:qemuamd64-buster:isar-image-base \
- multiconfig:rpi-jessie:isar-image-base \
- multiconfig:bananapi-stretch:isar-image-base
+ multiconfig:qemuarm-jessie:isar-image-base-qemuarm \
+ multiconfig:qemuarm-stretch:isar-image-base-qemuarm \
+ multiconfig:qemuarm-buster:isar-image-base-qeruarm \
+ multiconfig:qemuarm64-stretch:isar-image-base-qemuarm64 \
+ multiconfig:qemui386-jessie:isar-image-base-qemui386 \
+ multiconfig:qemui386-stretch:isar-image-base-qemui386 \
+ multiconfig:qemui386-buster:isar-image-base-qemui386 \
+ multiconfig:qemuamd64-jessie:isar-image-base-qemuamd64 \
+ multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64 \
+ multiconfig:qemuamd64-buster:isar-image-base-qemuamd64 \
+ multiconfig:qemuamd64-buster-tgz:isar-image-base-qemuamd64 \
+ multiconfig:nand-ubi-demo-buster:isar-image-ubi-nand-ubi-demo \
+ multiconfig:rpi-jessie:isar-image-base-rpi
```
Created images are:
```
-tmp/deploy/images/isar-image-base-debian-jessie-qemuarm.ext4.img
-tmp/deploy/images/isar-image-base-debian-stretch-qemuarm.ext4.img
-tmp/deploy/images/isar-image-base-debian-stretch-qemuarm.ext4.img
-tmp/deploy/images/isar-image-base-debian-stretch-qemuarm64.ext4.img
-tmp/deploy/images/isar-image-base-debian-jessie-qemui386.ext4.img
-tmp/deploy/images/isar-image-base-debian-stretch-qemui386.ext4.img
-tmp/deploy/images/isar-image-base-debian-jessie-qemuamd64.ext4.img
-tmp/deploy/images/isar-image-base-debian-stretch-qemuamd64.ext4.img
-tmp/deploy/images/isar-image-base.rpi-sdimg
-tmp/deploy/images/isar-image-base-debian-stretch-bananapi.wic.img
+tmp/deploy/images/qemuarm/isar-image-base-qemuarm-debian-jessie-qemuarm.ext4.img
+tmp/deploy/images/qemuarm/isar-image-base-qemuarm-debian-stretch-qemuarm.ext4.img
+tmp/deploy/images/qemuarm/isar-image-base-qemuarm-debian-stretch-qemuarm.ext4.img
+tmp/deploy/images/qemuarm64/isar-image-base-qemuarm64-debian-stretch-qemuarm64.ext4.img
+tmp/deploy/images/qemui386/isar-image-base-qemui386-debian-jessie-qemui386.ext4.img
+tmp/deploy/images/qemui386/isar-image-base-qemui386-debian-stretch-qemui386.ext4.img
+tmp/deploy/images/qemuamd64/isar-image-base-qemuamd64-debian-jessie-qemuamd64.ext4.img
+tmp/deploy/images/qemuamd64/isar-image-base-qemuamd64-debian-stretch-qemuamd64.ext4.img
+tmp/deploy/images/nand-ubi-demo/isar-image-ubi-nand-ubi-demo-debian-buster-nand-ubi-demo.ubi.img
+tmp/deploy/images/rpi/isar-image-base-rpi.rpi-sdimg
```
### Generate full disk image
@@ -202,9 +203,9 @@ tmp/deploy/images/isar-image-base-debian-stretch-bananapi.wic.img
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-stretch:isar-image-base-qemui386
# Similarly, for the `amd64` target architecture, in this case EFI
- $ bitbake multiconfig:qemuamd64-stretch:isar-image-base
+ $ bitbake multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64
```
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`.
@@ -217,9 +218,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/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-qemuamd64-debian-stretch-qemuamd64.wic.img
# i386 image
-qemu-system-i386 -m 256M -nographic -hda tmp/deploy/images/isar-image-base-debian-stretch-qemui386.wic.img
+qemu-system-i386 -m 256M -nographic -hda tmp/deploy/images/qemui386/isar-image-base-qemui386-debian-stretch-qemui386.wic.img
```
---
@@ -308,7 +309,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-jessie:isar-image-base`), the following variable defines
+`multiconfig:qemuarm-stretch:isar-image-base-qemuarm`), the following variable defines
all supported configurations:
- `BBMULTICONFIG` - The list of the complete configuration definition files.
@@ -536,6 +537,7 @@ IMAGE_PREINSTALL = " \
inherit isar-image
+PN .= "-${MACHINE}"
```
### Additional Notes
@@ -668,7 +670,7 @@ target binary artifacts. Developer chroots to sdk rootfs and develops applicatio
### Solution
User manually triggers creation of SDK root filesystem for his target platform by launching the task `do_populate_sdk` for target image, f.e.
-`bitbake -c do_populate_sdk multiconfig:${MACHINE}-${DISTRO}:isar-image-base`.
+`bitbake -c do_populate_sdk multiconfig:${MACHINE}-${DISTRO}:isar-image-base-${MACHINE}`.
The resulting SDK rootfs is archived into `tmp/deploy/images/sdk-${DISTRO}-${DISTRO_ARCH}.tar.xz`.
It is additionally available for direct use under `tmp/deploy/images/sdk-${DISTRO}-${DISTRO_ARCH}/`.
@@ -680,7 +682,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-stretch:isar-image-base-qemuarm
```
- Mount the following directories in chroot by passing resulting rootfs as an argument to the script `mount_chroot.sh`:
@@ -760,7 +762,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-stretch:isar-image-base-qemuarm
```
- Set `ISAR_USE_CACHED_BASE_REPO` in `conf/local.conf`:
@@ -779,7 +781,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-stretch:isar-image-base-qemuarm
```
### Limitation
--
2.11.0
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] meta-isar: Separate images per MACHINE
2019-03-12 20:27 [PATCH 1/2] meta-isar: Separate images per MACHINE Maxim Yu. Osipov
2019-03-12 20:27 ` [PATCH 2/2] doc/user_manual: Update after images per machine separation Maxim Yu. Osipov
@ 2019-03-13 16:42 ` Maxim Yu. Osipov
2019-03-14 7:15 ` Jan Kiszka
2019-03-14 7:21 ` Claudius Heine
1 sibling, 2 replies; 16+ messages in thread
From: Maxim Yu. Osipov @ 2019-03-13 16:42 UTC (permalink / raw)
To: isar-users
Hi everybody,
Any feedback on this patch?
This is a "fast track" patch as it fixes problem which delayed the release.
Thanks,
Maxim.
On 3/12/19 9:27 PM, Maxim Yu. Osipov wrote:
> Image directory gets overwritten when running for two targets
> with the same pair DISTRO and DISTRO_ARCH, resulting
> start_vm script failure.
>
> Note:
> This patch affects the bitbake multiconfig target calling syntax:
> PREVIOUS: "multiconfig:$MACHINE-$DISTRO:isar-image-base"
> NEW: "multiconfig:$MACHINE-$DISTRO:isar-image-base-$MACHINE"
>
> Suggested-by: Jan Kiszka <jan.kiszka@siemens.com>
> Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
> ---
> meta-isar/conf/conf-notes.txt | 6 ++--
> meta-isar/recipes-core/images/isar-image-base.bb | 2 ++
> meta-isar/recipes-core/images/isar-image-ubi.bb | 2 ++
> scripts/ci_build.sh | 40 ++++++++++++------------
> scripts/start_vm | 16 +++++-----
> 5 files changed, 35 insertions(+), 31 deletions(-)
>
> diff --git a/meta-isar/conf/conf-notes.txt b/meta-isar/conf/conf-notes.txt
> index 87bd2dc..84049e1 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:rpi-jessie:isar-image-base
> + multiconfig:qemuarm-stretch:isar-image-base-qemuarm
> + multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64
> + multiconfig:rpi-jessie:isar-image-base-rpi
> diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb
> index c86e63b..0ac0c44 100644
> --- a/meta-isar/recipes-core/images/isar-image-base.bb
> +++ b/meta-isar/recipes-core/images/isar-image-base.bb
> @@ -11,3 +11,5 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260
> PV = "1.0"
>
> inherit isar-image
> +
> +PN .= "-${MACHINE}"
> diff --git a/meta-isar/recipes-core/images/isar-image-ubi.bb b/meta-isar/recipes-core/images/isar-image-ubi.bb
> index 4b7e109..8059105 100644
> --- a/meta-isar/recipes-core/images/isar-image-ubi.bb
> +++ b/meta-isar/recipes-core/images/isar-image-ubi.bb
> @@ -12,6 +12,8 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260
>
> inherit isar-image
>
> +PN .= "-${MACHINE}"
> +
> SRC_URI += "file://ubinize.cfg.tmpl \
> file://fitimage.its.tmpl"
>
> diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
> index bcc7545..b4df70e 100755
> --- a/scripts/ci_build.sh
> +++ b/scripts/ci_build.sh
> @@ -1,7 +1,7 @@
> # Script for CI system build
> #
> # Alexander Smirnov <asmirnov@ilbers.de>
> -# Copyright (c) 2016-2018 ilbers GmbH
> +# Copyright (c) 2016-2019 ilbers GmbH
>
> #!/bin/sh
>
> @@ -21,21 +21,21 @@ BUILD_DIR=./build
> BB_ARGS="-v"
>
> TARGETS_SET="\
> - multiconfig:qemuarm-jessie:isar-image-base \
> - multiconfig:qemuarm-stretch:isar-image-base \
> - multiconfig:qemuarm-buster:isar-image-base \
> - multiconfig:qemuarm64-stretch:isar-image-base \
> - multiconfig:qemui386-jessie:isar-image-base \
> - multiconfig:qemui386-stretch:isar-image-base \
> - multiconfig:qemui386-buster:isar-image-base \
> - multiconfig:qemuamd64-jessie:isar-image-base \
> - multiconfig:qemuamd64-stretch:isar-image-base \
> - multiconfig:qemuamd64-buster:isar-image-base \
> - multiconfig:qemuamd64-buster-tgz:isar-image-base \
> - multiconfig:nand-ubi-demo-buster:isar-image-ubi \
> - multiconfig:rpi-jessie:isar-image-base"
> + multiconfig:qemuarm-jessie:isar-image-base-qemuarm \
> + multiconfig:qemuarm-stretch:isar-image-base-qemuarm \
> + multiconfig:qemuarm-buster:isar-image-base-qemuarm \
> + multiconfig:qemuarm64-stretch:isar-image-base-qemuarm64 \
> + multiconfig:qemui386-jessie:isar-image-base-qemui386 \
> + multiconfig:qemui386-stretch:isar-image-base-qemui386 \
> + multiconfig:qemui386-buster:isar-image-base-qemui386 \
> + multiconfig:qemuamd64-jessie:isar-image-base-qemuamd64 \
> + multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64 \
> + multiconfig:qemuamd64-buster:isar-image-base-qemuamd64 \
> + multiconfig:qemuamd64-buster-tgz:isar-image-base-qemuamd64 \
> + multiconfig:nand-ubi-demo-buster:isar-image-ubi-nand-ubi-demo \
> + multiconfig:rpi-jessie:isar-image-base-rpi"
> # qemu-user-static of <= buster too old to build that
> - # multiconfig:qemuarm64-buster:isar-image-base
> + # multiconfig:qemuarm64-buster:isar-image-base-qemuarm64
>
>
> show_help() {
> @@ -85,9 +85,9 @@ do
> FAST_BUILD="1"
> CROSS_BUILD="1"
> TARGETS_SET="\
> - multiconfig:qemuarm-stretch:isar-image-base \
> - multiconfig:qemuarm64-stretch:isar-image-base \
> - multiconfig:qemuamd64-stretch:isar-image-base"
> + multiconfig:qemuarm-stretch:isar-image-base-qemuarm \
> + multiconfig:qemuarm64-stretch:isar-image-base-qemuarm64 \
> + multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64 "
> ;;
> -q|--quiet)
> BB_ARGS=""
> @@ -129,12 +129,12 @@ bitbake $BB_ARGS $TARGETS_SET
> # parallel build with the same target arch (armhf) fails.
> # The problem is being investigated
> if [ -n "$FAST_BUILD" ]; then
> - bitbake $BB_ARGS multiconfig:de0-nano-soc-stretch:isar-image-base
> + bitbake $BB_ARGS multiconfig:de0-nano-soc-stretch:isar-image-base-de0-nano-soc
> fi
>
> cp -a "${ISARROOT}/meta/classes/dpkg-base.bbclass" "${ISARROOT}/meta/classes/dpkg-base.bbclass.ci-backup"
> echo -e "do_fetch_append() {\n\n}" >> "${ISARROOT}/meta/classes/dpkg-base.bbclass"
>
> -bitbake $BB_ARGS multiconfig:qemuamd64-stretch:isar-image-base
> +bitbake $BB_ARGS multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64
>
> mv "${ISARROOT}/meta/classes/dpkg-base.bbclass.ci-backup" "${ISARROOT}/meta/classes/dpkg-base.bbclass"
> diff --git a/scripts/start_vm b/scripts/start_vm
> index 1da0742..0c007bf 100755
> --- a/scripts/start_vm
> +++ b/scripts/start_vm
> @@ -1,7 +1,7 @@
> #!/bin/sh
> #
> # This software is a part of ISAR.
> -# Copyright (C) 2015-2017 ilbers GmbH
> +# Copyright (C) 2015-2019 ilbers GmbH
>
> set -e
>
> @@ -46,7 +46,7 @@ show_help() {
> echo " Supported: arm, i386, amd64, arm64."
> echo " -b, --build BUILD set path to build directory."
> echo " -d, --distro DISTRO set isar Debian distribution."
> - echo " Supported: jessie, stretch."
> + echo " Supported: jessie, stretch, buster"
> echo " -o, --out FILE Route QEMU console output to"
> echo " specified file."
> echo " -p, --pid FILE Store QEMU pid to file."
> @@ -101,7 +101,7 @@ do
> shift
> done
>
> -eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | grep "^DEPLOY_DIR_IMAGE=")
> +eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base-qemu$ARCH | grep "^DEPLOY_DIR_IMAGE=")
> readonly IMAGE_DIR=$DEPLOY_DIR_IMAGE
>
> readonly ISARROOT="$(dirname "$0")"/..
> @@ -112,13 +112,13 @@ eval "$(egrep 'MACHINE_SERIAL' $MACHINE_CONF |bb2sh)"
> readonly CONFIG_CONF=$ISARROOT/meta-isar/conf/multiconfig/qemu$ARCH-$DISTRO.conf
> eval "$(egrep 'QEMU_' $CONFIG_CONF |bb2sh)"
>
> -eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | grep "^IMAGE_TYPE=")
> +eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base-qemu$ARCH | grep "^IMAGE_TYPE=")
> case "$IMAGE_TYPE" in
> ext4-img)
> - readonly ROOTFS_IMAGE=isar-image-base-debian-$DISTRO-qemu$ARCH.ext4.img
> + readonly ROOTFS_IMAGE=isar-image-base-qemu$ARCH-debian-$DISTRO-qemu$ARCH.ext4.img
>
> - eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | grep "^KERNEL_IMAGE=")
> - eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | grep "^INITRD_IMAGE=")
> + eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base-qemu$ARCH | grep "^KERNEL_IMAGE=")
> + eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base-qemu$ARCH | grep "^INITRD_IMAGE=")
> QKERNEL=$IMAGE_DIR/${KERNEL_IMAGE}
> QINITRD=/dev/null
> [ -n "$INITRD_IMAGE" ] && QINITRD=$IMAGE_DIR/${INITRD_IMAGE}
> @@ -128,7 +128,7 @@ 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
> + readonly ROOTFS_IMAGE=isar-image-base-qemu$ARCH-debian-$DISTRO-qemu$ARCH.wic.img
> EXTRA_ARGS="$EXTRA_ARGS -snapshot"
> ;;
> *)
>
--
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/2] doc/user_manual: Update after images per machine separation
2019-03-12 20:27 ` [PATCH 2/2] doc/user_manual: Update after images per machine separation Maxim Yu. Osipov
@ 2019-03-14 7:14 ` Jan Kiszka
2019-03-14 11:31 ` Baurzhan Ismagulov
0 siblings, 1 reply; 16+ messages in thread
From: Jan Kiszka @ 2019-03-14 7:14 UTC (permalink / raw)
To: Maxim Yu. Osipov, isar-users
On 12.03.19 21:27, Maxim Yu. Osipov wrote:
> Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
> ---
> RECIPE-API-CHANGELOG.md | 23 +++++++++++++---
> doc/user_manual.md | 72 +++++++++++++++++++++++++------------------------
> 2 files changed, 57 insertions(+), 38 deletions(-)
>
> diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
> index 197ce99..92f5dce 100644
> --- a/RECIPE-API-CHANGELOG.md
> +++ b/RECIPE-API-CHANGELOG.md
> @@ -96,14 +96,14 @@ layer version higher than existing release corename, use the value 'next'.
>
> ### location of image artifacts
>
> -Align with OpenEmbedded and place image artifacts in a per-machine folder placed
> +Align with OpenEmbedded and place image artifacts in a per-machine directory placed
> in tmp/deploy (to avoid collisions among other things).
>
> ### more consistent artifact names
>
> multiconfig image artifacts are all placed in tmp/deploy/images. They include
> kernel, initrd and ext4/wic images. A consistent naming scheme is now used:
> -`IMAGE-DISTRO-MACHINE.TYPE`. This scheme was already used for ext4/wic images
> +`IMAGE-MACHINE-DISTRO-MACHINE.TYPE`. This scheme was already used for ext4/wic images
Reading this again: Where does the first MACHINE in this file name come from?
Maybe it can be avoided, now that we officially name image recipes after the
machine.
Jan
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] meta-isar: Separate images per MACHINE
2019-03-13 16:42 ` [PATCH 1/2] meta-isar: Separate images per MACHINE Maxim Yu. Osipov
@ 2019-03-14 7:15 ` Jan Kiszka
2019-03-14 7:21 ` Claudius Heine
1 sibling, 0 replies; 16+ messages in thread
From: Jan Kiszka @ 2019-03-14 7:15 UTC (permalink / raw)
To: Maxim Yu. Osipov, isar-users
On 13.03.19 17:42, Maxim Yu. Osipov wrote:
> Hi everybody,
>
> Any feedback on this patch?
Just left one.
> This is a "fast track" patch as it fixes problem which delayed the release.
Hope there is way more on the fast track. A lot of critical patches are waiting
for a merge.
Jan
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] meta-isar: Separate images per MACHINE
2019-03-13 16:42 ` [PATCH 1/2] meta-isar: Separate images per MACHINE Maxim Yu. Osipov
2019-03-14 7:15 ` Jan Kiszka
@ 2019-03-14 7:21 ` Claudius Heine
2019-03-14 7:28 ` Jan Kiszka
2019-03-15 9:02 ` Maxim Yu. Osipov
1 sibling, 2 replies; 16+ messages in thread
From: Claudius Heine @ 2019-03-14 7:21 UTC (permalink / raw)
To: Maxim Yu. Osipov, isar-users
Hi Maxim,
On 13/03/2019 17.42, Maxim Yu. Osipov wrote:
> Hi everybody,
>
> Any feedback on this patch?
> This is a "fast track" patch as it fixes problem which delayed the release.
>
> Thanks,
> Maxim.
>
> On 3/12/19 9:27 PM, Maxim Yu. Osipov wrote:
>> Image directory gets overwritten when running for two targets
>> with the same pair DISTRO and DISTRO_ARCH, resulting
>> start_vm script failure.
>>
>> Note:
>> This patch affects the bitbake multiconfig target calling syntax:
>> PREVIOUS: "multiconfig:$MACHINE-$DISTRO:isar-image-base"
>> NEW: "multiconfig:$MACHINE-$DISTRO:isar-image-base-$MACHINE"
>>
>> Suggested-by: Jan Kiszka <jan.kiszka@siemens.com>
>> Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
>> ---
>> meta-isar/conf/conf-notes.txt | 6 ++--
>> meta-isar/recipes-core/images/isar-image-base.bb | 2 ++
>> meta-isar/recipes-core/images/isar-image-ubi.bb | 2 ++
>> scripts/ci_build.sh | 40
>> ++++++++++++------------
>> scripts/start_vm | 16 +++++-----
>> 5 files changed, 35 insertions(+), 31 deletions(-)
>>
>> diff --git a/meta-isar/conf/conf-notes.txt
>> b/meta-isar/conf/conf-notes.txt
>> index 87bd2dc..84049e1 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:rpi-jessie:isar-image-base
>> + multiconfig:qemuarm-stretch:isar-image-base-qemuarm
>> + multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64
>> + multiconfig:rpi-jessie:isar-image-base-rpi
I am not a big fan of having to specify the machine when building a image.
Would it be possible to have virtual recipes?
IMO all isar-image-base-* would provide a isar-image-base.
>> diff --git a/meta-isar/recipes-core/images/isar-image-base.bb
>> b/meta-isar/recipes-core/images/isar-image-base.bb
>> index c86e63b..0ac0c44 100644
>> --- a/meta-isar/recipes-core/images/isar-image-base.bb
>> +++ b/meta-isar/recipes-core/images/isar-image-base.bb
>> @@ -11,3 +11,5 @@ LIC_FILES_CHKSUM =
>> "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260
>> PV = "1.0"
>> inherit isar-image
>> +
>> +PN .= "-${MACHINE}"
>> diff --git a/meta-isar/recipes-core/images/isar-image-ubi.bb
>> b/meta-isar/recipes-core/images/isar-image-ubi.bb
>> index 4b7e109..8059105 100644
>> --- a/meta-isar/recipes-core/images/isar-image-ubi.bb
>> +++ b/meta-isar/recipes-core/images/isar-image-ubi.bb
>> @@ -12,6 +12,8 @@ LIC_FILES_CHKSUM =
>> "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260
>> inherit isar-image
>> +PN .= "-${MACHINE}"
>> +
>> SRC_URI += "file://ubinize.cfg.tmpl \
>> file://fitimage.its.tmpl"
>> diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
>> index bcc7545..b4df70e 100755
>> --- a/scripts/ci_build.sh
>> +++ b/scripts/ci_build.sh
>> @@ -1,7 +1,7 @@
>> # Script for CI system build
>> #
>> # Alexander Smirnov <asmirnov@ilbers.de>
>> -# Copyright (c) 2016-2018 ilbers GmbH
>> +# Copyright (c) 2016-2019 ilbers GmbH
>> #!/bin/sh
>> @@ -21,21 +21,21 @@ BUILD_DIR=./build
>> BB_ARGS="-v"
>> TARGETS_SET="\
>> - multiconfig:qemuarm-jessie:isar-image-base \
>> - multiconfig:qemuarm-stretch:isar-image-base \
>> - multiconfig:qemuarm-buster:isar-image-base \
>> - multiconfig:qemuarm64-stretch:isar-image-base \
>> - multiconfig:qemui386-jessie:isar-image-base \
>> - multiconfig:qemui386-stretch:isar-image-base \
>> - multiconfig:qemui386-buster:isar-image-base \
>> - multiconfig:qemuamd64-jessie:isar-image-base \
>> - multiconfig:qemuamd64-stretch:isar-image-base \
>> - multiconfig:qemuamd64-buster:isar-image-base \
>> - multiconfig:qemuamd64-buster-tgz:isar-image-base \
>> - multiconfig:nand-ubi-demo-buster:isar-image-ubi \
>> - multiconfig:rpi-jessie:isar-image-base"
>> + multiconfig:qemuarm-jessie:isar-image-base-qemuarm \
>> + multiconfig:qemuarm-stretch:isar-image-base-qemuarm \
>> + multiconfig:qemuarm-buster:isar-image-base-qemuarm \
>> + multiconfig:qemuarm64-stretch:isar-image-base-qemuarm64 \
>> + multiconfig:qemui386-jessie:isar-image-base-qemui386 \
>> + multiconfig:qemui386-stretch:isar-image-base-qemui386 \
>> + multiconfig:qemui386-buster:isar-image-base-qemui386 \
>> + multiconfig:qemuamd64-jessie:isar-image-base-qemuamd64 \
>> + multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64 \
>> + multiconfig:qemuamd64-buster:isar-image-base-qemuamd64 \
>> + multiconfig:qemuamd64-buster-tgz:isar-image-base-qemuamd64 \
>> +
>> multiconfig:nand-ubi-demo-buster:isar-image-ubi-nand-ubi-demo \
>> + multiconfig:rpi-jessie:isar-image-base-rpi"
>> # qemu-user-static of <= buster too old to build that
>> - # multiconfig:qemuarm64-buster:isar-image-base
>> + # multiconfig:qemuarm64-buster:isar-image-base-qemuarm64
>> show_help() {
>> @@ -85,9 +85,9 @@ do
>> FAST_BUILD="1"
>> CROSS_BUILD="1"
>> TARGETS_SET="\
>> - multiconfig:qemuarm-stretch:isar-image-base \
>> - multiconfig:qemuarm64-stretch:isar-image-base \
>> - multiconfig:qemuamd64-stretch:isar-image-base"
>> +
>> multiconfig:qemuarm-stretch:isar-image-base-qemuarm \
>> +
>> multiconfig:qemuarm64-stretch:isar-image-base-qemuarm64 \
>> +
>> multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64 "
>> ;;
>> -q|--quiet)
>> BB_ARGS=""
>> @@ -129,12 +129,12 @@ bitbake $BB_ARGS $TARGETS_SET
>> # parallel build with the same target arch (armhf) fails.
>> # The problem is being investigated
>> if [ -n "$FAST_BUILD" ]; then
>> - bitbake $BB_ARGS multiconfig:de0-nano-soc-stretch:isar-image-base
>> + bitbake $BB_ARGS
>> multiconfig:de0-nano-soc-stretch:isar-image-base-de0-nano-soc
>> fi
>> cp -a "${ISARROOT}/meta/classes/dpkg-base.bbclass"
>> "${ISARROOT}/meta/classes/dpkg-base.bbclass.ci-backup"
>> echo -e "do_fetch_append() {\n\n}" >>
>> "${ISARROOT}/meta/classes/dpkg-base.bbclass"
>> -bitbake $BB_ARGS multiconfig:qemuamd64-stretch:isar-image-base
>> +bitbake $BB_ARGS multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64
>> mv "${ISARROOT}/meta/classes/dpkg-base.bbclass.ci-backup"
>> "${ISARROOT}/meta/classes/dpkg-base.bbclass"
>> diff --git a/scripts/start_vm b/scripts/start_vm
>> index 1da0742..0c007bf 100755
>> --- a/scripts/start_vm
>> +++ b/scripts/start_vm
>> @@ -1,7 +1,7 @@
>> #!/bin/sh
>> #
>> # This software is a part of ISAR.
>> -# Copyright (C) 2015-2017 ilbers GmbH
>> +# Copyright (C) 2015-2019 ilbers GmbH
>> set -e
>> @@ -46,7 +46,7 @@ show_help() {
>> echo " Supported: arm, i386, amd64,
>> arm64."
>> echo " -b, --build BUILD set path to build directory."
>> echo " -d, --distro DISTRO set isar Debian distribution."
>> - echo " Supported: jessie, stretch."
>> + echo " Supported: jessie, stretch, buster"
Well that change together with the copyright update should be moved in a
different patch. It has nothing to do with 'Separate images per MACHINE'
IMO.
regards,
Claudius
>> echo " -o, --out FILE Route QEMU console output to"
>> echo " specified file."
>> echo " -p, --pid FILE Store QEMU pid to file."
>> @@ -101,7 +101,7 @@ do
>> shift
>> done
>> -eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base |
>> grep "^DEPLOY_DIR_IMAGE=")
>> +eval $(bitbake -e
>> multiconfig:qemu$ARCH-$DISTRO:isar-image-base-qemu$ARCH | grep
>> "^DEPLOY_DIR_IMAGE=")
>> readonly IMAGE_DIR=$DEPLOY_DIR_IMAGE
>> readonly ISARROOT="$(dirname "$0")"/..
>> @@ -112,13 +112,13 @@ eval "$(egrep 'MACHINE_SERIAL' $MACHINE_CONF
>> |bb2sh)"
>> readonly
>> CONFIG_CONF=$ISARROOT/meta-isar/conf/multiconfig/qemu$ARCH-$DISTRO.conf
>> eval "$(egrep 'QEMU_' $CONFIG_CONF |bb2sh)"
>> -eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base |
>> grep "^IMAGE_TYPE=")
>> +eval $(bitbake -e
>> multiconfig:qemu$ARCH-$DISTRO:isar-image-base-qemu$ARCH | grep
>> "^IMAGE_TYPE=")
>> case "$IMAGE_TYPE" in
>> ext4-img)
>> - readonly
>> ROOTFS_IMAGE=isar-image-base-debian-$DISTRO-qemu$ARCH.ext4.img
>> + readonly
>> ROOTFS_IMAGE=isar-image-base-qemu$ARCH-debian-$DISTRO-qemu$ARCH.ext4.img
>> - eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base |
>> grep "^KERNEL_IMAGE=")
>> - eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base |
>> grep "^INITRD_IMAGE=")
>> + eval $(bitbake -e
>> multiconfig:qemu$ARCH-$DISTRO:isar-image-base-qemu$ARCH | grep
>> "^KERNEL_IMAGE=")
>> + eval $(bitbake -e
>> multiconfig:qemu$ARCH-$DISTRO:isar-image-base-qemu$ARCH | grep
>> "^INITRD_IMAGE=")
>> QKERNEL=$IMAGE_DIR/${KERNEL_IMAGE}
>> QINITRD=/dev/null
>> [ -n "$INITRD_IMAGE" ] && QINITRD=$IMAGE_DIR/${INITRD_IMAGE}
>> @@ -128,7 +128,7 @@ 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
>> + readonly
>> ROOTFS_IMAGE=isar-image-base-qemu$ARCH-debian-$DISTRO-qemu$ARCH.wic.img
>> EXTRA_ARGS="$EXTRA_ARGS -snapshot"
>> ;;
>> *)
>>
>
>
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] meta-isar: Separate images per MACHINE
2019-03-14 7:21 ` Claudius Heine
@ 2019-03-14 7:28 ` Jan Kiszka
2019-03-14 8:07 ` Claudius Heine
2019-03-15 9:02 ` Maxim Yu. Osipov
1 sibling, 1 reply; 16+ messages in thread
From: Jan Kiszka @ 2019-03-14 7:28 UTC (permalink / raw)
To: [ext] Claudius Heine, Maxim Yu. Osipov, isar-users
On 14.03.19 08:21, [ext] Claudius Heine wrote:
> Hi Maxim,
>
> On 13/03/2019 17.42, Maxim Yu. Osipov wrote:
>> Hi everybody,
>>
>> Any feedback on this patch?
>> This is a "fast track" patch as it fixes problem which delayed the release.
>>
>> Thanks,
>> Maxim.
>>
>> On 3/12/19 9:27 PM, Maxim Yu. Osipov wrote:
>>> Image directory gets overwritten when running for two targets
>>> with the same pair DISTRO and DISTRO_ARCH, resulting
>>> start_vm script failure.
>>>
>>> Note:
>>> This patch affects the bitbake multiconfig target calling syntax:
>>> PREVIOUS: "multiconfig:$MACHINE-$DISTRO:isar-image-base"
>>> NEW: "multiconfig:$MACHINE-$DISTRO:isar-image-base-$MACHINE"
>>>
>>> Suggested-by: Jan Kiszka <jan.kiszka@siemens.com>
>>> Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
>>> ---
>>> meta-isar/conf/conf-notes.txt | 6 ++--
>>> meta-isar/recipes-core/images/isar-image-base.bb | 2 ++
>>> meta-isar/recipes-core/images/isar-image-ubi.bb | 2 ++
>>> scripts/ci_build.sh | 40 ++++++++++++------------
>>> scripts/start_vm | 16 +++++-----
>>> 5 files changed, 35 insertions(+), 31 deletions(-)
>>>
>>> diff --git a/meta-isar/conf/conf-notes.txt b/meta-isar/conf/conf-notes.txt
>>> index 87bd2dc..84049e1 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:rpi-jessie:isar-image-base
>>> + multiconfig:qemuarm-stretch:isar-image-base-qemuarm
>>> + multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64
>>> + multiconfig:rpi-jessie:isar-image-base-rpi
>
> I am not a big fan of having to specify the machine when building a image.
>
> Would it be possible to have virtual recipes?
>
> IMO all isar-image-base-* would provide a isar-image-base.
That would be useful if it has no unexpected side effects. Can we exclude that
we end up with multiple providers in some scenario? It seems so, but I'm not
100% sure ATM.
Jan
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] meta-isar: Separate images per MACHINE
2019-03-14 7:28 ` Jan Kiszka
@ 2019-03-14 8:07 ` Claudius Heine
2019-03-14 8:20 ` Claudius Heine
0 siblings, 1 reply; 16+ messages in thread
From: Claudius Heine @ 2019-03-14 8:07 UTC (permalink / raw)
To: Jan Kiszka, Maxim Yu. Osipov, isar-users
Hi Jan,
On 14/03/2019 08.28, Jan Kiszka wrote:
> On 14.03.19 08:21, [ext] Claudius Heine wrote:
>> Hi Maxim,
>>
>> On 13/03/2019 17.42, Maxim Yu. Osipov wrote:
>>> Hi everybody,
>>>
>>> Any feedback on this patch?
>>> This is a "fast track" patch as it fixes problem which delayed the
>>> release.
>>>
>>> Thanks,
>>> Maxim.
>>>
>>> On 3/12/19 9:27 PM, Maxim Yu. Osipov wrote:
>>>> Image directory gets overwritten when running for two targets
>>>> with the same pair DISTRO and DISTRO_ARCH, resulting
>>>> start_vm script failure.
>>>>
>>>> Note:
>>>> This patch affects the bitbake multiconfig target calling syntax:
>>>> PREVIOUS: "multiconfig:$MACHINE-$DISTRO:isar-image-base"
>>>> NEW: "multiconfig:$MACHINE-$DISTRO:isar-image-base-$MACHINE"
>>>>
>>>> Suggested-by: Jan Kiszka <jan.kiszka@siemens.com>
>>>> Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
>>>> ---
>>>> meta-isar/conf/conf-notes.txt | 6 ++--
>>>> meta-isar/recipes-core/images/isar-image-base.bb | 2 ++
>>>> meta-isar/recipes-core/images/isar-image-ubi.bb | 2 ++
>>>> scripts/ci_build.sh | 40
>>>> ++++++++++++------------
>>>> scripts/start_vm | 16 +++++-----
>>>> 5 files changed, 35 insertions(+), 31 deletions(-)
>>>>
>>>> diff --git a/meta-isar/conf/conf-notes.txt
>>>> b/meta-isar/conf/conf-notes.txt
>>>> index 87bd2dc..84049e1 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:rpi-jessie:isar-image-base
>>>> + multiconfig:qemuarm-stretch:isar-image-base-qemuarm
>>>> + multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64
>>>> + multiconfig:rpi-jessie:isar-image-base-rpi
>>
>> I am not a big fan of having to specify the machine when building a
>> image.
>>
>> Would it be possible to have virtual recipes?
>>
>> IMO all isar-image-base-* would provide a isar-image-base.
>
> That would be useful if it has no unexpected side effects. Can we
> exclude that we end up with multiple providers in some scenario? It
> seems so, but I'm not 100% sure ATM.
IIUC want is needed here is that the workdir of the images contain the
machine. We can do that indirectly via modifying the PN or directly via
modifying the WORKDIR.
Maxim choose the first option in this patch and that changes how the
target name of that recipe as well. I don't know why he choose to change
the PN, but if that was what is required for other reasons, then ok. But
I am not in favor of changing the target name since that breaks the UX.
My suggestion is just the easiest way to fix the UX.
We will end up with multiple providers if someone writes recipes that
provide the same target name, we cannot really do anything about this.
IMO this patch should not be merged from one rc to the next, because it
breaks the user interface. Renaming the core targets is a pretty big change.
Cheers,
Claudius
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] meta-isar: Separate images per MACHINE
2019-03-14 8:07 ` Claudius Heine
@ 2019-03-14 8:20 ` Claudius Heine
2019-03-14 12:22 ` Claudius Heine
0 siblings, 1 reply; 16+ messages in thread
From: Claudius Heine @ 2019-03-14 8:20 UTC (permalink / raw)
To: Jan Kiszka, Maxim Yu. Osipov, isar-users
On 14/03/2019 09.07, [ext] Claudius Heine wrote:
> Hi Jan,
>
> On 14/03/2019 08.28, Jan Kiszka wrote:
>> On 14.03.19 08:21, [ext] Claudius Heine wrote:
>>> Hi Maxim,
>>>
>>> On 13/03/2019 17.42, Maxim Yu. Osipov wrote:
>>>> Hi everybody,
>>>>
>>>> Any feedback on this patch?
>>>> This is a "fast track" patch as it fixes problem which delayed the
>>>> release.
>>>>
>>>> Thanks,
>>>> Maxim.
>>>>
>>>> On 3/12/19 9:27 PM, Maxim Yu. Osipov wrote:
>>>>> Image directory gets overwritten when running for two targets
>>>>> with the same pair DISTRO and DISTRO_ARCH, resulting
>>>>> start_vm script failure.
>>>>>
>>>>> Note:
>>>>> This patch affects the bitbake multiconfig target calling syntax:
>>>>> PREVIOUS: "multiconfig:$MACHINE-$DISTRO:isar-image-base"
>>>>> NEW: "multiconfig:$MACHINE-$DISTRO:isar-image-base-$MACHINE"
>>>>>
>>>>> Suggested-by: Jan Kiszka <jan.kiszka@siemens.com>
>>>>> Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
>>>>> ---
>>>>> meta-isar/conf/conf-notes.txt | 6 ++--
>>>>> meta-isar/recipes-core/images/isar-image-base.bb | 2 ++
>>>>> meta-isar/recipes-core/images/isar-image-ubi.bb | 2 ++
>>>>> scripts/ci_build.sh | 40
>>>>> ++++++++++++------------
>>>>> scripts/start_vm | 16 +++++-----
>>>>> 5 files changed, 35 insertions(+), 31 deletions(-)
>>>>>
>>>>> diff --git a/meta-isar/conf/conf-notes.txt
>>>>> b/meta-isar/conf/conf-notes.txt
>>>>> index 87bd2dc..84049e1 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:rpi-jessie:isar-image-base
>>>>> + multiconfig:qemuarm-stretch:isar-image-base-qemuarm
>>>>> + multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64
>>>>> + multiconfig:rpi-jessie:isar-image-base-rpi
>>>
>>> I am not a big fan of having to specify the machine when building a
>>> image.
>>>
>>> Would it be possible to have virtual recipes?
>>>
>>> IMO all isar-image-base-* would provide a isar-image-base.
>>
>> That would be useful if it has no unexpected side effects. Can we
>> exclude that we end up with multiple providers in some scenario? It
>> seems so, but I'm not 100% sure ATM.
>
> IIUC want is needed here is that the workdir of the images contain the
> machine. We can do that indirectly via modifying the PN or directly via
> modifying the WORKDIR.
I looked at the bitbake.conf. PF would be better to contain the machine,
since that will also affect the stamps. Like this:
PF .= "-${MACHINE}"
>
> Maxim choose the first option in this patch and that changes how the
> target name of that recipe as well. I don't know why he choose to change
> the PN, but if that was what is required for other reasons, then ok. But
> I am not in favor of changing the target name since that breaks the UX.
> My suggestion is just the easiest way to fix the UX.
>
> We will end up with multiple providers if someone writes recipes that
> provide the same target name, we cannot really do anything about this.
>
> IMO this patch should not be merged from one rc to the next, because it
> breaks the user interface. Renaming the core targets is a pretty big
> change.
>
> Cheers,
> Claudius
>
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/2] doc/user_manual: Update after images per machine separation
2019-03-14 7:14 ` Jan Kiszka
@ 2019-03-14 11:31 ` Baurzhan Ismagulov
2019-03-14 12:08 ` Jan Kiszka
0 siblings, 1 reply; 16+ messages in thread
From: Baurzhan Ismagulov @ 2019-03-14 11:31 UTC (permalink / raw)
To: isar-users
On Thu, Mar 14, 2019 at 08:14:34AM +0100, Jan Kiszka wrote:
> > diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
...
> > -`IMAGE-DISTRO-MACHINE.TYPE`. This scheme was already used for ext4/wic images
> > +`IMAGE-MACHINE-DISTRO-MACHINE.TYPE`. This scheme was already used for ext4/wic images
>
> Reading this again: Where does the first MACHINE in this file name come
> from? Maybe it can be avoided, now that we officially name image recipes
> after the machine.
I also don't like changing the UX in this version of the patch. Since we are
going to update tmp/work w.r.t. ${MACHINE} anyway, I suggest that we merge and
document the original workaround [1] that unbreaks the stuff and quickly move
forward with the critical patches and the right fix.
1. https://groups.google.com/d/msg/isar-users/9CJ1QmMbKYU/Sy8A6q6FBgAJ
With kind regards,
Baurzhan.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/2] doc/user_manual: Update after images per machine separation
2019-03-14 11:31 ` Baurzhan Ismagulov
@ 2019-03-14 12:08 ` Jan Kiszka
0 siblings, 0 replies; 16+ messages in thread
From: Jan Kiszka @ 2019-03-14 12:08 UTC (permalink / raw)
To: isar-users
On 14.03.19 12:31, Baurzhan Ismagulov wrote:
> On Thu, Mar 14, 2019 at 08:14:34AM +0100, Jan Kiszka wrote:
>>> diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
> ...
>>> -`IMAGE-DISTRO-MACHINE.TYPE`. This scheme was already used for ext4/wic images
>>> +`IMAGE-MACHINE-DISTRO-MACHINE.TYPE`. This scheme was already used for ext4/wic images
>>
>> Reading this again: Where does the first MACHINE in this file name come
>> from? Maybe it can be avoided, now that we officially name image recipes
>> after the machine.
>
> I also don't like changing the UX in this version of the patch. Since we are
> going to update tmp/work w.r.t. ${MACHINE} anyway, I suggest that we merge and
> document the original workaround [1] that unbreaks the stuff and quickly move
> forward with the critical patches and the right fix.
>
> 1. https://groups.google.com/d/msg/isar-users/9CJ1QmMbKYU/Sy8A6q6FBgAJ
Nope, this is broken as we analyzed.
Let's do this properly. The patch list for rc2 is long enough to justify the
extra time.
Jan
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] meta-isar: Separate images per MACHINE
2019-03-14 8:20 ` Claudius Heine
@ 2019-03-14 12:22 ` Claudius Heine
0 siblings, 0 replies; 16+ messages in thread
From: Claudius Heine @ 2019-03-14 12:22 UTC (permalink / raw)
To: Jan Kiszka, Maxim Yu. Osipov, isar-users
On 14/03/2019 09.20, [ext] Claudius Heine wrote:
> On 14/03/2019 09.07, [ext] Claudius Heine wrote:
>> Hi Jan,
>>
>> On 14/03/2019 08.28, Jan Kiszka wrote:
>>> On 14.03.19 08:21, [ext] Claudius Heine wrote:
>>>> Hi Maxim,
>>>>
>>>> On 13/03/2019 17.42, Maxim Yu. Osipov wrote:
>>>>> Hi everybody,
>>>>>
>>>>> Any feedback on this patch?
>>>>> This is a "fast track" patch as it fixes problem which delayed the
>>>>> release.
>>>>>
>>>>> Thanks,
>>>>> Maxim.
>>>>>
>>>>> On 3/12/19 9:27 PM, Maxim Yu. Osipov wrote:
>>>>>> Image directory gets overwritten when running for two targets
>>>>>> with the same pair DISTRO and DISTRO_ARCH, resulting
>>>>>> start_vm script failure.
>>>>>>
>>>>>> Note:
>>>>>> This patch affects the bitbake multiconfig target calling syntax:
>>>>>> PREVIOUS: "multiconfig:$MACHINE-$DISTRO:isar-image-base"
>>>>>> NEW: "multiconfig:$MACHINE-$DISTRO:isar-image-base-$MACHINE"
>>>>>>
>>>>>> Suggested-by: Jan Kiszka <jan.kiszka@siemens.com>
>>>>>> Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
>>>>>> ---
>>>>>> meta-isar/conf/conf-notes.txt | 6 ++--
>>>>>> meta-isar/recipes-core/images/isar-image-base.bb | 2 ++
>>>>>> meta-isar/recipes-core/images/isar-image-ubi.bb | 2 ++
>>>>>> scripts/ci_build.sh | 40
>>>>>> ++++++++++++------------
>>>>>> scripts/start_vm | 16 +++++-----
>>>>>> 5 files changed, 35 insertions(+), 31 deletions(-)
>>>>>>
>>>>>> diff --git a/meta-isar/conf/conf-notes.txt
>>>>>> b/meta-isar/conf/conf-notes.txt
>>>>>> index 87bd2dc..84049e1 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:rpi-jessie:isar-image-base
>>>>>> + multiconfig:qemuarm-stretch:isar-image-base-qemuarm
>>>>>> + multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64
>>>>>> + multiconfig:rpi-jessie:isar-image-base-rpi
>>>>
>>>> I am not a big fan of having to specify the machine when building a
>>>> image.
>>>>
>>>> Would it be possible to have virtual recipes?
>>>>
>>>> IMO all isar-image-base-* would provide a isar-image-base.
>>>
>>> That would be useful if it has no unexpected side effects. Can we
>>> exclude that we end up with multiple providers in some scenario? It
>>> seems so, but I'm not 100% sure ATM.
>>
>> IIUC want is needed here is that the workdir of the images contain the
>> machine. We can do that indirectly via modifying the PN or directly
>> via modifying the WORKDIR.
>
> I looked at the bitbake.conf. PF would be better to contain the machine,
> since that will also affect the stamps. Like this:
>
> PF .= "-${MACHINE}"
Well isar-image.bbclass does not use PF for the WORKDIR. It has this entry:
WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}"
while the default in the bitbake.conf is:
WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PF}"
If images are really version-less, then I would would recommend
something like this:
WORKDIR .= "-${MACHINE}"
PF .= "-${MACHINE}"
This way the stamps should be correctly placed as well as the work dir
not collide with work dirs of other machines.
Cheers,
Claudius
>
>>
>> Maxim choose the first option in this patch and that changes how the
>> target name of that recipe as well. I don't know why he choose to
>> change the PN, but if that was what is required for other reasons,
>> then ok. But I am not in favor of changing the target name since that
>> breaks the UX. My suggestion is just the easiest way to fix the UX.
>>
>> We will end up with multiple providers if someone writes recipes that
>> provide the same target name, we cannot really do anything about this.
>>
>> IMO this patch should not be merged from one rc to the next, because
>> it breaks the user interface. Renaming the core targets is a pretty
>> big change.
>>
>> Cheers,
>> Claudius
>>
>
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] meta-isar: Separate images per MACHINE
2019-03-14 7:21 ` Claudius Heine
2019-03-14 7:28 ` Jan Kiszka
@ 2019-03-15 9:02 ` Maxim Yu. Osipov
2019-03-15 10:25 ` Claudius Heine
1 sibling, 1 reply; 16+ messages in thread
From: Maxim Yu. Osipov @ 2019-03-15 9:02 UTC (permalink / raw)
To: Claudius Heine, isar-users
Hi Claudius,
Thank you for your fast feedback.
On 3/14/19 8:21 AM, Claudius Heine wrote:
> Hi Maxim,
>
> On 13/03/2019 17.42, Maxim Yu. Osipov wrote:
>> Hi everybody,
>>
>> Any feedback on this patch?
>> This is a "fast track" patch as it fixes problem which delayed the
>> release.
>>
>> Thanks,
>> Maxim.
>>
>> On 3/12/19 9:27 PM, Maxim Yu. Osipov wrote:
>>> Image directory gets overwritten when running for two targets
>>> with the same pair DISTRO and DISTRO_ARCH, resulting
>>> start_vm script failure.
>>>
>>> Note:
>>> This patch affects the bitbake multiconfig target calling syntax:
>>> PREVIOUS: "multiconfig:$MACHINE-$DISTRO:isar-image-base"
>>> NEW: "multiconfig:$MACHINE-$DISTRO:isar-image-base-$MACHINE"
>>>
>>> Suggested-by: Jan Kiszka <jan.kiszka@siemens.com>
>>> Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
>>> ---
>>> meta-isar/conf/conf-notes.txt | 6 ++--
>>> meta-isar/recipes-core/images/isar-image-base.bb | 2 ++
>>> meta-isar/recipes-core/images/isar-image-ubi.bb | 2 ++
>>> scripts/ci_build.sh | 40
>>> ++++++++++++------------
>>> scripts/start_vm | 16 +++++-----
>>> 5 files changed, 35 insertions(+), 31 deletions(-)
>>>
>>> diff --git a/meta-isar/conf/conf-notes.txt
>>> b/meta-isar/conf/conf-notes.txt
>>> index 87bd2dc..84049e1 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:rpi-jessie:isar-image-base
>>> + multiconfig:qemuarm-stretch:isar-image-base-qemuarm
>>> + multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64
>>> + multiconfig:rpi-jessie:isar-image-base-rpi
>
> I am not a big fan of having to specify the machine when building a image.
>
> Would it be possible to have virtual recipes?
>
> IMO all isar-image-base-* would provide a isar-image-base.
Not sure that I got your point.
OK, let's add two line to isar-image-base.bb
PF .= "-${MACHINE}"
PROVIDES += "isar-image-base"
Let's call 'bitbake multiconfig:qemuarm-stretch:isar-image-base' - (UX
is untouched - that's fine), but the problem that exactly
'isar-image-base' directory will be created under
"tmp/work/debian-stretch-armhf"
tmp/work/debian-stretch-armhf$ ls -l
total 52
drwxr-xr-x 4 myo myo 4096 Mar 15 09:53 buildchroot-host
drwxr-xr-x 4 myo myo 4096 Mar 15 09:55 buildchroot-target
drwxr-xr-x 4 myo myo 4096 Mar 15 09:59 enable-fsck-1.0-r0
drwxr-xr-x 6 myo myo 4096 Mar 15 09:59 example-module-armmp-1.0-r0
drwxr-xr-x 4 myo myo 4096 Mar 15 09:58 example-raw-0.3-r0
drwxr-xr-x 4 myo myo 4096 Mar 15 09:59 hello-isar-0.3-a18c14c-r0
drwxr-xr-x 3 myo myo 4096 Mar 15 09:51 isar-apt-1.0-r0
drwxr-xr-x 4 myo myo 4096 Mar 15 09:51
isar-bootstrap-host-debian-stretch-amd64
drwxr-xr-x 4 myo myo 4096 Mar 15 09:51 isar-bootstrap-target
drwxr-xr-x 4 myo myo 4096 Mar 15 09:59 isar-cfg-localepurge-1.0-r0
drwxr-xr-x 4 myo myo 4096 Mar 15 09:59 isar-cfg-rootpw-1.0-r0
drwxr-xr-x 5 myo myo 4096 Mar 15 09:59 isar-image-base
drwxr-xr-x 4 myo myo 4096 Mar 15 09:58 libhello-0.1-98f2e41-r0
myo@tiberius:~/work/isar/src/isar/build/tmp/work/debian-stretch-armhf$
so this doesn't help to fix the problem.
>
>>> diff --git a/meta-isar/recipes-core/images/isar-image-base.bb
>>> b/meta-isar/recipes-core/images/isar-image-base.bb
>>> index c86e63b..0ac0c44 100644
>>> --- a/meta-isar/recipes-core/images/isar-image-base.bb
>>> +++ b/meta-isar/recipes-core/images/isar-image-base.bb
>>> @@ -11,3 +11,5 @@ LIC_FILES_CHKSUM =
>>> "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260
>>> PV = "1.0"
>>> inherit isar-image
>>> +
>>> +PN .= "-${MACHINE}"
>>> diff --git a/meta-isar/recipes-core/images/isar-image-ubi.bb
>>> b/meta-isar/recipes-core/images/isar-image-ubi.bb
>>> index 4b7e109..8059105 100644
>>> --- a/meta-isar/recipes-core/images/isar-image-ubi.bb
>>> +++ b/meta-isar/recipes-core/images/isar-image-ubi.bb
>>> @@ -12,6 +12,8 @@ LIC_FILES_CHKSUM =
>>> "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260
>>> inherit isar-image
>>> +PN .= "-${MACHINE}"
>>> +
>>> SRC_URI += "file://ubinize.cfg.tmpl \
>>> file://fitimage.its.tmpl"
>>> diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
>>> index bcc7545..b4df70e 100755
>>> --- a/scripts/ci_build.sh
>>> +++ b/scripts/ci_build.sh
>>> @@ -1,7 +1,7 @@
>>> # Script for CI system build
>>> #
>>> # Alexander Smirnov <asmirnov@ilbers.de>
>>> -# Copyright (c) 2016-2018 ilbers GmbH
>>> +# Copyright (c) 2016-2019 ilbers GmbH
>>> #!/bin/sh
>>> @@ -21,21 +21,21 @@ BUILD_DIR=./build
>>> BB_ARGS="-v"
>>> TARGETS_SET="\
>>> - multiconfig:qemuarm-jessie:isar-image-base \
>>> - multiconfig:qemuarm-stretch:isar-image-base \
>>> - multiconfig:qemuarm-buster:isar-image-base \
>>> - multiconfig:qemuarm64-stretch:isar-image-base \
>>> - multiconfig:qemui386-jessie:isar-image-base \
>>> - multiconfig:qemui386-stretch:isar-image-base \
>>> - multiconfig:qemui386-buster:isar-image-base \
>>> - multiconfig:qemuamd64-jessie:isar-image-base \
>>> - multiconfig:qemuamd64-stretch:isar-image-base \
>>> - multiconfig:qemuamd64-buster:isar-image-base \
>>> - multiconfig:qemuamd64-buster-tgz:isar-image-base \
>>> - multiconfig:nand-ubi-demo-buster:isar-image-ubi \
>>> - multiconfig:rpi-jessie:isar-image-base"
>>> + multiconfig:qemuarm-jessie:isar-image-base-qemuarm \
>>> + multiconfig:qemuarm-stretch:isar-image-base-qemuarm \
>>> + multiconfig:qemuarm-buster:isar-image-base-qemuarm \
>>> + multiconfig:qemuarm64-stretch:isar-image-base-qemuarm64 \
>>> + multiconfig:qemui386-jessie:isar-image-base-qemui386 \
>>> + multiconfig:qemui386-stretch:isar-image-base-qemui386 \
>>> + multiconfig:qemui386-buster:isar-image-base-qemui386 \
>>> + multiconfig:qemuamd64-jessie:isar-image-base-qemuamd64 \
>>> + multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64 \
>>> + multiconfig:qemuamd64-buster:isar-image-base-qemuamd64 \
>>> +
>>> multiconfig:qemuamd64-buster-tgz:isar-image-base-qemuamd64 \
>>> + multiconfig:nand-ubi-demo-buster:isar-image-ubi-nand-ubi-demo \
>>> + multiconfig:rpi-jessie:isar-image-base-rpi"
>>> # qemu-user-static of <= buster too old to build that
>>> - # multiconfig:qemuarm64-buster:isar-image-base
>>> + # multiconfig:qemuarm64-buster:isar-image-base-qemuarm64
>>> show_help() {
>>> @@ -85,9 +85,9 @@ do
>>> FAST_BUILD="1"
>>> CROSS_BUILD="1"
>>> TARGETS_SET="\
>>> - multiconfig:qemuarm-stretch:isar-image-base \
>>> - multiconfig:qemuarm64-stretch:isar-image-base \
>>> - multiconfig:qemuamd64-stretch:isar-image-base"
>>> + multiconfig:qemuarm-stretch:isar-image-base-qemuarm \
>>> + multiconfig:qemuarm64-stretch:isar-image-base-qemuarm64 \
>>> + multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64 "
>>> ;;
>>> -q|--quiet)
>>> BB_ARGS=""
>>> @@ -129,12 +129,12 @@ bitbake $BB_ARGS $TARGETS_SET
>>> # parallel build with the same target arch (armhf) fails.
>>> # The problem is being investigated
>>> if [ -n "$FAST_BUILD" ]; then
>>> - bitbake $BB_ARGS multiconfig:de0-nano-soc-stretch:isar-image-base
>>> + bitbake $BB_ARGS
>>> multiconfig:de0-nano-soc-stretch:isar-image-base-de0-nano-soc
>>> fi
>>> cp -a "${ISARROOT}/meta/classes/dpkg-base.bbclass"
>>> "${ISARROOT}/meta/classes/dpkg-base.bbclass.ci-backup"
>>> echo -e "do_fetch_append() {\n\n}" >>
>>> "${ISARROOT}/meta/classes/dpkg-base.bbclass"
>>> -bitbake $BB_ARGS multiconfig:qemuamd64-stretch:isar-image-base
>>> +bitbake $BB_ARGS
>>> multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64
>>> mv "${ISARROOT}/meta/classes/dpkg-base.bbclass.ci-backup"
>>> "${ISARROOT}/meta/classes/dpkg-base.bbclass"
>>> diff --git a/scripts/start_vm b/scripts/start_vm
>>> index 1da0742..0c007bf 100755
>>> --- a/scripts/start_vm
>>> +++ b/scripts/start_vm
>>> @@ -1,7 +1,7 @@
>>> #!/bin/sh
>>> #
>>> # This software is a part of ISAR.
>>> -# Copyright (C) 2015-2017 ilbers GmbH
>>> +# Copyright (C) 2015-2019 ilbers GmbH
>>> set -e
>>> @@ -46,7 +46,7 @@ show_help() {
>>> echo " Supported: arm, i386, amd64,
>>> arm64."
>>> echo " -b, --build BUILD set path to build directory."
>>> echo " -d, --distro DISTRO set isar Debian distribution."
>>> - echo " Supported: jessie, stretch."
>>> + echo " Supported: jessie, stretch, buster"
>
> Well that change together with the copyright update should be moved in a
> different patch. It has nothing to do with 'Separate images per MACHINE'
> IMO.
Well...formally you are right, but in my opinion such "copyright"
commits just litter the patch queue.
Thanks,
Maxim.
> regards,
> Claudius
>
>>> echo " -o, --out FILE Route QEMU console output to"
>>> echo " specified file."
>>> echo " -p, --pid FILE Store QEMU pid to file."
>>> @@ -101,7 +101,7 @@ do
>>> shift
>>> done
>>> -eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base |
>>> grep "^DEPLOY_DIR_IMAGE=")
>>> +eval $(bitbake -e
>>> multiconfig:qemu$ARCH-$DISTRO:isar-image-base-qemu$ARCH | grep
>>> "^DEPLOY_DIR_IMAGE=")
>>> readonly IMAGE_DIR=$DEPLOY_DIR_IMAGE
>>> readonly ISARROOT="$(dirname "$0")"/..
>>> @@ -112,13 +112,13 @@ eval "$(egrep 'MACHINE_SERIAL' $MACHINE_CONF
>>> |bb2sh)"
>>> readonly
>>> CONFIG_CONF=$ISARROOT/meta-isar/conf/multiconfig/qemu$ARCH-$DISTRO.conf
>>> eval "$(egrep 'QEMU_' $CONFIG_CONF |bb2sh)"
>>> -eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base |
>>> grep "^IMAGE_TYPE=")
>>> +eval $(bitbake -e
>>> multiconfig:qemu$ARCH-$DISTRO:isar-image-base-qemu$ARCH | grep
>>> "^IMAGE_TYPE=")
>>> case "$IMAGE_TYPE" in
>>> ext4-img)
>>> - readonly
>>> ROOTFS_IMAGE=isar-image-base-debian-$DISTRO-qemu$ARCH.ext4.img
>>> + readonly
>>> ROOTFS_IMAGE=isar-image-base-qemu$ARCH-debian-$DISTRO-qemu$ARCH.ext4.img
>>> - eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base
>>> | grep "^KERNEL_IMAGE=")
>>> - eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base
>>> | grep "^INITRD_IMAGE=")
>>> + eval $(bitbake -e
>>> multiconfig:qemu$ARCH-$DISTRO:isar-image-base-qemu$ARCH | grep
>>> "^KERNEL_IMAGE=")
>>> + eval $(bitbake -e
>>> multiconfig:qemu$ARCH-$DISTRO:isar-image-base-qemu$ARCH | grep
>>> "^INITRD_IMAGE=")
>>> QKERNEL=$IMAGE_DIR/${KERNEL_IMAGE}
>>> QINITRD=/dev/null
>>> [ -n "$INITRD_IMAGE" ] && QINITRD=$IMAGE_DIR/${INITRD_IMAGE}
>>> @@ -128,7 +128,7 @@ 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
>>> + readonly
>>> ROOTFS_IMAGE=isar-image-base-qemu$ARCH-debian-$DISTRO-qemu$ARCH.wic.img
>>> EXTRA_ARGS="$EXTRA_ARGS -snapshot"
>>> ;;
>>> *)
>>>
>>
>>
>
--
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] meta-isar: Separate images per MACHINE
2019-03-15 9:02 ` Maxim Yu. Osipov
@ 2019-03-15 10:25 ` Claudius Heine
2019-03-15 11:22 ` Maxim Yu. Osipov
2019-03-15 14:28 ` Baurzhan Ismagulov
0 siblings, 2 replies; 16+ messages in thread
From: Claudius Heine @ 2019-03-15 10:25 UTC (permalink / raw)
To: Maxim Yu. Osipov, Claudius Heine, isar-users
[-- Attachment #1: Type: text/plain, Size: 3583 bytes --]
Hi Maxim,
Quoting Maxim Yu. Osipov (2019-03-15 10:02:48)
[...]
> >>> diff --git a/meta-isar/conf/conf-notes.txt
> >>> b/meta-isar/conf/conf-notes.txt
> >>> index 87bd2dc..84049e1 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:rpi-jessie:isar-image-base
> >>> + multiconfig:qemuarm-stretch:isar-image-base-qemuarm
> >>> + multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64
> >>> + multiconfig:rpi-jessie:isar-image-base-rpi
> >
> > I am not a big fan of having to specify the machine when building a image.
> >
> > Would it be possible to have virtual recipes?
> >
> > IMO all isar-image-base-* would provide a isar-image-base.
>
> Not sure that I got your point.
> OK, let's add two line to isar-image-base.bb
>
> PF .= "-${MACHINE}"
> PROVIDES += "isar-image-base"
Well that is not what my initial suggestion was.
If you want to use my initial suggestion and use PROVIDES then of course
you will have to do something like this:
PN .= "-${MACHINE}"
PROVIDES += "isar-image-base"
If you use my latest suggestion then you would have something like this:
PF .= "-${MACHINE}"
WORKDIR .= "-${MACHINE}"
If you sort of start combining my code then this will not work of
course.
Please investigate yourself what code you write does. I don't provide copy
paste stuff in reviews, just ideas. You might be lucky if they just work by
copy-pasting, but you might not be and have to think a bit yourself to
make it work. If I would do that, then I would have written the patch
myself.
[...]
> >>> --- a/scripts/start_vm
> >>> +++ b/scripts/start_vm
> >>> @@ -1,7 +1,7 @@
> >>> #!/bin/sh
> >>> #
> >>> # This software is a part of ISAR.
> >>> -# Copyright (C) 2015-2017 ilbers GmbH
> >>> +# Copyright (C) 2015-2019 ilbers GmbH
> >>> set -e
> >>> @@ -46,7 +46,7 @@ show_help() {
> >>> echo " Supported: arm, i386, amd64,
> >>> arm64."
> >>> echo " -b, --build BUILD set path to build directory."
> >>> echo " -d, --distro DISTRO set isar Debian distribution."
> >>> - echo " Supported: jessie, stretch."
> >>> + echo " Supported: jessie, stretch, buster"
> >
> > Well that change together with the copyright update should be moved in a
> > different patch. It has nothing to do with 'Separate images per MACHINE'
> > IMO.
>
> Well...formally you are right, but in my opinion such "copyright"
> commits just litter the patch queue.
Having unrelated changes in a commit will make is harder to review, and
litter the git history/blame stuff. So while it might be a small
inconveniece short term (by needing to create and submitt more than one
patch in a queue) it makes the history cleaner for the whole future.
Cheers,
Claudius
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de
PGP key: 6FF2 E59F 00C6 BC28 31D8 64C1 1173 CB19 9808 B153
Keyserver: hkp://pool.sks-keyservers.net
[-- Attachment #2: signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEb/LlnwDGvCgx2GTBEXPLGZgIsVMFAlyLfXoACgkQEXPLGZgI
sVOUAg/9Ei8kXsF6D5unrr7wFEnXJWwU02qw54kq+eFCIk7dVhMMNnWrc8fdDk8h
MqxhTtKGx6Dmv0Pjih284dSiJVhnXdmrvxiw32sejQ54vP0+kLOix48jDiBztcel
7mcunrTMIf3tqB3VJYd073jkglo8yCwqHLIQ6Q1x6wLRDe7Tc5RRtmU+7e/LP3vT
aF9DE2tXkLB9/1YgsMHBhs8Rw67n1bfKT1RZRl+ZMW+yNGpwlUmGtTva4Wze9qQa
ARnL7Y+DOnjWroVOzAxw2r67D1C5dxpy9otXVcR5AvX19eT9Q3oh6i6cu3MRnmHB
XAYJ7MZlunTTYKkt1JjQ35yW4KCi3f/DydqujaGuMuacDQ8Z3G0URXIngmI38fl0
2rPaG1osgxwod8eAluDQ5BrNx3hTgIrXT7nJilxUh0cfrq4UvSuIP+o702ard9EW
O/49jAMQbE5ccCaXsDlRqg6FGNbcfqfNmqTCL57NBTsCUWrba15WrLlDmx+XKE9B
uDoehoOLI8bvUbe6UQnr17OHEGkIDV5sJTkiRkp5tigHIh3aT3Sywr2PaEjhLkn8
xqsgRWEzALJqcGLnkTPHnTFO7gI0fvHkEsGg3ZXkpYtpnEp+E/p898cl1MZALw+S
jnq++WY2URbyaXfhYKBnB8uF5lXnFWSviWbzkg7tQJPmh1Z3PjU=
=MdsW
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] meta-isar: Separate images per MACHINE
2019-03-15 10:25 ` Claudius Heine
@ 2019-03-15 11:22 ` Maxim Yu. Osipov
2019-03-15 14:28 ` Baurzhan Ismagulov
1 sibling, 0 replies; 16+ messages in thread
From: Maxim Yu. Osipov @ 2019-03-15 11:22 UTC (permalink / raw)
To: Claudius Heine, Claudius Heine, isar-users
Hi Claudius,
I've just replied to email you sent me.
On 3/15/19 11:25 AM, Claudius Heine wrote:
<snip>
>> PF .= "-${MACHINE}"
>> PROVIDES += "isar-image-base"
>
> Well that is not what my initial suggestion was.
>
> If you want to use my initial suggestion and use PROVIDES then of course
> you will have to do something like this:
>
> PN .= "-${MACHINE}"
> PROVIDES += "isar-image-base"
This proposal doesn't work neither.
> If you use my latest suggestion then you would have something like this:
>
> PF .= "-${MACHINE}"
> WORKDIR .= "-${MACHINE}"
>
> If you sort of start combining my code then this will not work of
> course.
>
> Please investigate yourself what code you write does. I don't provide copy
> paste stuff in reviews, just ideas. You might be lucky if they just work by
> copy-pasting, but you might not be and have to think a bit yourself to
> make it work. If I would do that, then I would have written the patch
> myself.
Thank you for your valuable opinion.
Maxim.
--
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] meta-isar: Separate images per MACHINE
2019-03-15 10:25 ` Claudius Heine
2019-03-15 11:22 ` Maxim Yu. Osipov
@ 2019-03-15 14:28 ` Baurzhan Ismagulov
1 sibling, 0 replies; 16+ messages in thread
From: Baurzhan Ismagulov @ 2019-03-15 14:28 UTC (permalink / raw)
To: isar-users
Hi all,
I ask everyone to use this list for constructive discussion for the benefit of
the project. Communication, especially written one, can be frustrating, but it
always works when people treat each other with respect.
With kind regards,
Baurzhan.
On Fri, Mar 15, 2019 at 11:25:06AM +0100, Claudius Heine wrote:
> Hi Maxim,
>
> Quoting Maxim Yu. Osipov (2019-03-15 10:02:48)
> [...]
> > >>> diff --git a/meta-isar/conf/conf-notes.txt
> > >>> b/meta-isar/conf/conf-notes.txt
> > >>> index 87bd2dc..84049e1 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:rpi-jessie:isar-image-base
> > >>> +��� multiconfig:qemuarm-stretch:isar-image-base-qemuarm
> > >>> +��� multiconfig:qemuamd64-stretch:isar-image-base-qemuamd64
> > >>> +��� multiconfig:rpi-jessie:isar-image-base-rpi
> > >
> > > I am not a big fan of having to specify the machine when building a image.
> > >
> > > Would it be possible to have virtual recipes?
> > >
> > > IMO all isar-image-base-* would provide a isar-image-base.
> >
> > Not sure that I got your point.
> > OK, let's add two line to isar-image-base.bb
> >
> > PF .= "-${MACHINE}"
> > PROVIDES += "isar-image-base"
>
> Well that is not what my initial suggestion was.
>
> If you want to use my initial suggestion and use PROVIDES then of course
> you will have to do something like this:
>
> PN .= "-${MACHINE}"
> PROVIDES += "isar-image-base"
>
> If you use my latest suggestion then you would have something like this:
>
> PF .= "-${MACHINE}"
> WORKDIR .= "-${MACHINE}"
>
> If you sort of start combining my code then this will not work of
> course.
>
> Please investigate yourself what code you write does. I don't provide copy
> paste stuff in reviews, just ideas. You might be lucky if they just work by
> copy-pasting, but you might not be and have to think a bit yourself to
> make it work. If I would do that, then I would have written the patch
> myself.
>
> [...]
>
> > >>> --- a/scripts/start_vm
> > >>> +++ b/scripts/start_vm
> > >>> @@ -1,7 +1,7 @@
> > >>> � #!/bin/sh
> > >>> � #
> > >>> � # This software is a part of ISAR.
> > >>> -# Copyright (C) 2015-2017 ilbers GmbH
> > >>> +# Copyright (C) 2015-2019 ilbers GmbH
> > >>> � set -e
> > >>> @@ -46,7 +46,7 @@ show_help() {
> > >>> ����� echo "������������������������� Supported: arm, i386, amd64,
> > >>> arm64."
> > >>> ����� echo "��� -b, --build BUILD���� set path to build directory."
> > >>> ����� echo "��� -d, --distro DISTRO�� set isar Debian distribution."
> > >>> -��� echo "������������������������� Supported: jessie, stretch."
> > >>> +��� echo "������������������������� Supported: jessie, stretch, buster"
> > >
> > > Well that change together with the copyright update should be moved in a
> > > different patch. It has nothing to do with 'Separate images per MACHINE'
> > > IMO.
> >
> > Well...formally you are right, but in my opinion such "copyright"
> > commits just litter the patch queue.
>
> Having unrelated changes in a commit will make is harder to review, and
> litter the git history/blame stuff. So while it might be a small
> inconveniece short term (by needing to create and submitt more than one
> patch in a queue) it makes the history cleaner for the whole future.
>
> Cheers,
> Claudius
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2019-03-15 14:28 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-12 20:27 [PATCH 1/2] meta-isar: Separate images per MACHINE Maxim Yu. Osipov
2019-03-12 20:27 ` [PATCH 2/2] doc/user_manual: Update after images per machine separation Maxim Yu. Osipov
2019-03-14 7:14 ` Jan Kiszka
2019-03-14 11:31 ` Baurzhan Ismagulov
2019-03-14 12:08 ` Jan Kiszka
2019-03-13 16:42 ` [PATCH 1/2] meta-isar: Separate images per MACHINE Maxim Yu. Osipov
2019-03-14 7:15 ` Jan Kiszka
2019-03-14 7:21 ` Claudius Heine
2019-03-14 7:28 ` Jan Kiszka
2019-03-14 8:07 ` Claudius Heine
2019-03-14 8:20 ` Claudius Heine
2019-03-14 12:22 ` Claudius Heine
2019-03-15 9:02 ` Maxim Yu. Osipov
2019-03-15 10:25 ` Claudius Heine
2019-03-15 11:22 ` Maxim Yu. Osipov
2019-03-15 14:28 ` Baurzhan Ismagulov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox