From: Jan Kiszka <jan.kis...@siemens.com>
This prepares for multiple targets of the same architecture. This will
have some variations that result in different images.
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
build-images.sh | 6 +++---
kas.yml | 2 +-
recipes-core/images/demo-image.bb | 2 ++
start-qemu.sh | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/build-images.sh b/build-images.sh
index 2ccca12..87bfc28 100755
--- a/build-images.sh
+++ b/build-images.sh
@@ -36,7 +36,7 @@ while [ $# -gt 0 ]; do
--all)
KAS_TARGET=
while read MACHINE DESCRIPTION; do
- KAS_TARGET="${KAS_TARGET}
multiconfig:${MACHINE}-jailhouse:demo-image"
+ KAS_TARGET="${KAS_TARGET}
multiconfig:${MACHINE}-jailhouse:demo-image-${MACHINE}"
done < images.list
shift 1
;;
@@ -78,7 +78,7 @@ if [ -z "${KAS_TARGET}" ]; then
if [ ${IDX} -eq 0 ] 2>/dev/null; then
KAS_TARGET=
for MACHINE in ${MACHINES}; do
- KAS_TARGET="${KAS_TARGET}
multiconfig:${MACHINE}-jailhouse:demo-image"
+ KAS_TARGET="${KAS_TARGET}
multiconfig:${MACHINE}-jailhouse:demo-image-${MACHINE}"
done
break
fi
@@ -86,7 +86,7 @@ if [ -z "${KAS_TARGET}" ]; then
N=1
for MACHINE in ${MACHINES}; do
if [ ${N} -eq ${IDX} ] 2>/dev/null; then
- KAS_TARGET="${KAS_TARGET}
multiconfig:${MACHINE}-jailhouse:demo-image"
+ KAS_TARGET="${KAS_TARGET}
multiconfig:${MACHINE}-jailhouse:demo-image-${MACHINE}"
break
fi
N=$((N + 1))
diff --git a/kas.yml b/kas.yml
index d04b3b5..64e80c5 100644
--- a/kas.yml
+++ b/kas.yml
@@ -12,7 +12,7 @@
header:
version: 5
-target: multiconfig:qemuamd64-jailhouse:demo-image
+target: multiconfig:qemuamd64-jailhouse:demo-image-qemuamd64
repos:
jailhouse:
diff --git a/recipes-core/images/demo-image.bb
b/recipes-core/images/demo-image.bb
index 457bc97..f667ca0 100644
--- a/recipes-core/images/demo-image.bb
+++ b/recipes-core/images/demo-image.bb
@@ -9,6 +9,8 @@
# SPDX-License-Identifier: GPL-2.0
#
+PN = "demo-image-${MACHINE}"
+
ROOTFS_EXTRA = "1024"
require recipes-core/images/isar-image-base.bb
diff --git a/start-qemu.sh b/start-qemu.sh
index e60add0..909c47f 100755
--- a/start-qemu.sh
+++ b/start-qemu.sh
@@ -61,7 +61,7 @@ case "$1" in
esac
IMAGE_BUILD_DIR="$(dirname $0)/out/"
-IMAGE_FILE=$(ls
${IMAGE_BUILD_DIR}/build/tmp/deploy/images/demo-image-debian-stretch-qemu${DISTRO_ARCH}.*.img)
+IMAGE_FILE=$(ls
${IMAGE_BUILD_DIR}/build/tmp/deploy/images/demo-image-qemu${DISTRO_ARCH}-debian-stretch-qemu${DISTRO_ARCH}.*.img)
KERNEL_FILE=$(ls
${IMAGE_BUILD_DIR}/build/tmp/deploy/images/vmlinuz*_debian-stretch-qemu${DISTRO_ARCH}
| tail -1)
INITRD_FILE=$(ls
${IMAGE_BUILD_DIR}/build/tmp/deploy/images/initrd.img*_debian-stretch-qemu${DISTRO_ARCH}
| tail -1)
--
2.16.4
--
You received this message because you are subscribed to the Google Groups
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to jailhouse-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
