From: Jan Kiszka <[email protected]> Include our distro conf implicitly by initializing DISTRO properly so that bitbake can do the rest.
Signed-off-by: Jan Kiszka <[email protected]> --- conf/distro/jailhouse-demo.conf | 2 ++ conf/multiconfig/orangepi-zero-jailhouse.conf | 3 ++- conf/multiconfig/qemuamd64-jailhouse.conf | 3 ++- conf/multiconfig/qemuarm64-jailhouse.conf | 3 ++- start-qemu.sh | 6 +++--- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/conf/distro/jailhouse-demo.conf b/conf/distro/jailhouse-demo.conf index b4891f6..dc5148e 100644 --- a/conf/distro/jailhouse-demo.conf +++ b/conf/distro/jailhouse-demo.conf @@ -9,4 +9,6 @@ # SPDX-License-Identifier: GPL-2.0 # +require conf/distro/debian-stretch.conf + PREFERRED_VERSION_jailhouse ?= "0.9.1" diff --git a/conf/multiconfig/orangepi-zero-jailhouse.conf b/conf/multiconfig/orangepi-zero-jailhouse.conf index 93c886b..231cc2c 100644 --- a/conf/multiconfig/orangepi-zero-jailhouse.conf +++ b/conf/multiconfig/orangepi-zero-jailhouse.conf @@ -14,7 +14,8 @@ MACHINE ?= "orangepi-zero" ROOTFS_DEV ?= "mmcblk0p1" require conf/multiconfig/qemuarm-stretch.conf -require conf/distro/jailhouse-demo.conf + +DISTRO = "jailhouse-demo" KERNEL_NAME = "jailhouse-armhf" diff --git a/conf/multiconfig/qemuamd64-jailhouse.conf b/conf/multiconfig/qemuamd64-jailhouse.conf index 34eb943..05de4f0 100644 --- a/conf/multiconfig/qemuamd64-jailhouse.conf +++ b/conf/multiconfig/qemuamd64-jailhouse.conf @@ -10,6 +10,7 @@ # require conf/multiconfig/qemuamd64-stretch.conf -require conf/distro/jailhouse-demo.conf + +DISTRO = "jailhouse-demo" KERNEL_NAME = "jailhouse-amd64" diff --git a/conf/multiconfig/qemuarm64-jailhouse.conf b/conf/multiconfig/qemuarm64-jailhouse.conf index 792d538..2c841fb 100644 --- a/conf/multiconfig/qemuarm64-jailhouse.conf +++ b/conf/multiconfig/qemuarm64-jailhouse.conf @@ -10,6 +10,7 @@ # require conf/multiconfig/qemuarm64-stretch.conf -require conf/distro/jailhouse-demo.conf + +DISTRO = "jailhouse-demo" KERNEL_NAME = "jailhouse-arm64" diff --git a/start-qemu.sh b/start-qemu.sh index 909c47f..48d9a38 100755 --- a/start-qemu.sh +++ b/start-qemu.sh @@ -61,10 +61,10 @@ case "$1" in esac IMAGE_BUILD_DIR="$(dirname $0)/out/" -IMAGE_FILE=$(ls ${IMAGE_BUILD_DIR}/build/tmp/deploy/images/demo-image-qemu${DISTRO_ARCH}-debian-stretch-qemu${DISTRO_ARCH}.*.img) +IMAGE_FILE=$(ls ${IMAGE_BUILD_DIR}/build/tmp/deploy/images/demo-image-qemu${DISTRO_ARCH}-jailhouse-demo-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) +KERNEL_FILE=$(ls ${IMAGE_BUILD_DIR}/build/tmp/deploy/images/vmlinuz*_jailhouse-demo-qemu${DISTRO_ARCH} | tail -1) +INITRD_FILE=$(ls ${IMAGE_BUILD_DIR}/build/tmp/deploy/images/initrd.img*_jailhouse-demo-qemu${DISTRO_ARCH} | tail -1) shift 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 [email protected]. For more options, visit https://groups.google.com/d/optout.
