From: Jan Kiszka <[email protected]> Aligns jailhouse-images with other projects and allows to use kas-docker eventually.
Signed-off-by: Jan Kiszka <[email protected]> --- .gitignore | 3 ++- README.md | 2 +- build-images.sh | 7 ++----- start-qemu.sh | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 1fcb152..fd87a39 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -out +build/ +isar/ diff --git a/README.md b/README.md index 0833494..2e6df6f 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Quickstart for Physical Targets Call `build-images.sh` and select the desired target. Afterwards, flash the image on an empty SD card, e.g.: - dd if=out/build/tmp/deploy/images/orangepi-zero/demo-image-orangepi-zero-jailhouse-demo-orangepi-zero.wic.img \ + dd if=build/tmp/deploy/images/orangepi-zero/demo-image-orangepi-zero-jailhouse-demo-orangepi-zero.wic.img \ of=/dev/mmcblk0 bs=4M status=progress ### Orange Pi Zero diff --git a/build-images.sh b/build-images.sh index 44e6bf2..b41cb5f 100755 --- a/build-images.sh +++ b/build-images.sh @@ -106,8 +106,7 @@ if [ -t 1 ]; then INTERACTIVE="-t -i" fi -mkdir -p out -docker run -v $(pwd):/jailhouse-images:ro -v $(pwd)/out:/out:rw \ +docker run -v $(pwd):/jailhouse-images:ro -v $(pwd):/work:rw --workdir=/work \ -e USER_ID=$(id -u) -e SHELL=${SHELL} \ -e KAS_TARGET="${KAS_TARGET}" -e KAS_TASK="${KAS_TASK}" \ --rm ${INTERACTIVE} \ @@ -115,6 +114,4 @@ docker run -v $(pwd):/jailhouse-images:ro -v $(pwd)/out:/out:rw \ --device $(/sbin/losetup -f) \ -e http_proxy=$http_proxy -e https_proxy=$https_proxy \ -e ftp_proxy=$ftp_proxy -e no_proxy=$no_proxy ${DOCKER_ARGS} \ - kasproject/kas-isar sh -c " - cd /out; - kas ${CMD} ${KAS_FILES}" + kasproject/kas-isar ${CMD} ${KAS_FILES} diff --git a/start-qemu.sh b/start-qemu.sh index c9d13ea..379981c 100755 --- a/start-qemu.sh +++ b/start-qemu.sh @@ -62,7 +62,7 @@ case "$1" in ;; esac -IMAGE_PREFIX="$(dirname $0)/out/build/tmp/deploy/images/qemu-${DISTRO_ARCH}/demo-image-qemu-${DISTRO_ARCH}-jailhouse-demo-qemu-${DISTRO_ARCH}" +IMAGE_PREFIX="$(dirname $0)/build/tmp/deploy/images/qemu-${DISTRO_ARCH}/demo-image-qemu-${DISTRO_ARCH}-jailhouse-demo-qemu-${DISTRO_ARCH}" IMAGE_FILE=$(ls ${IMAGE_PREFIX}.ext4.img) KERNEL_FILE=$(ls ${IMAGE_PREFIX}.vmlinuz* | 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 [email protected]. For more options, visit https://groups.google.com/d/optout.
