Re: [PATCH 5/8] Add qemuarm64-stretch multiconfig

[Alexander Smirnov <asmirnov@ilbers.de>]

On 02/16/2018 11:52 AM, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Extend the image build script as needed and add a multiconfig that
> allows to build a qemuarm64 target using stretch. Also add a machine
> config for QEMU.

This patch makes the documentation out-dated:

https://github.com/ilbers/isar/blob/master/doc/user_manual.md#getting-started

Should I expect updated for user_manual?

Alex

> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>   meta-isar/conf/local.conf.sample                  |  1 +
>   meta-isar/conf/machine/qemuarm64.conf             |  7 +++++++
>   meta-isar/conf/multiconfig/qemuarm64-stretch.conf | 20 ++++++++++++++++++++
>   meta-isar/recipes-core/images/files/setup.sh      | 18 ++++++++++++++----
>   4 files changed, 42 insertions(+), 4 deletions(-)
>   create mode 100644 meta-isar/conf/machine/qemuarm64.conf
>   create mode 100644 meta-isar/conf/multiconfig/qemuarm64-stretch.conf
> 
> diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
> index 09c0e25..46bfae0 100644
> --- a/meta-isar/conf/local.conf.sample
> +++ b/meta-isar/conf/local.conf.sample
> @@ -41,6 +41,7 @@ BBMULTICONFIG = " \
>       qemuarm-wheezy \
>       qemuarm-jessie \
>       qemuarm-stretch \
> +    qemuarm64-stretch \
>       qemui386-jessie \
>       qemui386-stretch \
>       qemuamd64-jessie \
> diff --git a/meta-isar/conf/machine/qemuarm64.conf b/meta-isar/conf/machine/qemuarm64.conf
> new file mode 100644
> index 0000000..70dd941
> --- /dev/null
> +++ b/meta-isar/conf/machine/qemuarm64.conf
> @@ -0,0 +1,7 @@
> +# This software is a part of ISAR.
> +# Copyright (C) 2015-2017 ilbers GmbH
> +
> +MACHINE_SERIAL ?= "ttyAMA0"
> +BAUDRATE_TTY ?= "115200"
> +
> +IMAGE_TYPE ?= "ext4-img"
> diff --git a/meta-isar/conf/multiconfig/qemuarm64-stretch.conf b/meta-isar/conf/multiconfig/qemuarm64-stretch.conf
> new file mode 100644
> index 0000000..cffdcdb
> --- /dev/null
> +++ b/meta-isar/conf/multiconfig/qemuarm64-stretch.conf
> @@ -0,0 +1,20 @@
> +# This software is a part of ISAR.
> +# Copyright (C) 2017 ilbers GmbH
> +# Copyright (c) Siemens AG, 2018
> +
> +MACHINE ?= "qemuarm64"
> +
> +DISTRO ?= "debian-stretch"
> +DISTRO_ARCH ?= "arm64"
> +
> +KERNEL_NAME ?= "arm64"
> +
> +IMAGE_PREINSTALL += "init"
> +
> +ROOTFS_DEV ?= "vda"
> +
> +QEMU_ARCH ?= "aarch64"
> +QEMU_MACHINE ?= "virt"
> +QEMU_CPU ?= "cortex-a57"
> +# TODO: start_vm doesn't support multiline vars
> +QEMU_ROOTFS_DEV ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
> diff --git a/meta-isar/recipes-core/images/files/setup.sh b/meta-isar/recipes-core/images/files/setup.sh
> index 39b828c..86c065c 100755
> --- a/meta-isar/recipes-core/images/files/setup.sh
> +++ b/meta-isar/recipes-core/images/files/setup.sh
> @@ -14,6 +14,7 @@ set -e
>   # setup.sh needs to be executable.
>   
>   TARGET=$1
> +ARCH=$2
>   
>   # Prevent daemons from starting in postinstall during the initial "dpkg
>   # --configure -a" under QEMU on the build host
> @@ -56,11 +57,20 @@ EOF
>       chmod a+x $TARGET/usr/sbin/policy-rc.d
>   fi
>   
> -# Install QEMU emulator to execute ARM binaries
> -if [ ! -x /usr/bin/qemu-arm-static ]; then
> -    echo "qemu-arm-static binary not present, unable to execute ARM binaries"
> +case $ARCH in
> +    armel|armhf)
> +        qemu_arch=arm
> +        ;;
> +    arm64)
> +        qemu_arch=aarch64
> +        ;;
> +esac
> +
> +# Install QEMU emulator to execute foreign binaries
> +if [ ! -x /usr/bin/qemu-${qemu_arch}-static ]; then
> +    echo "qemu-${qemu_arch}-static binary not present, unable to execute target binaries"
>   else
> -    sudo cp /usr/bin/qemu-arm-static ${TARGET}/usr/bin
> +    sudo cp /usr/bin/qemu-${qemu_arch}-static ${TARGET}/usr/bin
>   fi
>   
>   # Set hostname
> 

-- 
With best regards,
Alexander Smirnov

ilbers GmbH
Baierbrunner Str. 28c
D-81379 Munich
+49 (89) 122 67 24-0
http://ilbers.de/
Commercial register Munich, HRB 214197
General manager: Baurzhan Ismagulov