From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6523072403514327040 X-Received: by 10.25.215.217 with SMTP id q86mr377432lfi.10.1518771147945; Fri, 16 Feb 2018 00:52:27 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.25.207.203 with SMTP id f194ls187589lfg.2.gmail; Fri, 16 Feb 2018 00:52:27 -0800 (PST) X-Google-Smtp-Source: AH8x2274Jd8gXDTtbJjH084iOBP9X8dhoZZ//x1G7EDTTvRHz4cvFqtTKfZID77VrrATOl92UHMV X-Received: by 10.25.19.24 with SMTP id j24mr385203lfi.12.1518771147277; Fri, 16 Feb 2018 00:52:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518771147; cv=none; d=google.com; s=arc-20160816; b=EY8Xq8rEpe3CGf5DEPSZ25C7N8aCYMFlwT31vFtKId4Lg7w/F9gCoUOz6TCSqJYQT/ +3mKDARrmd4ANfEhDkD2CUkLgOq+wrj7HxDuTnOOqsfVDaKltI+edLf8VIawNCgHAZJt TqLUAl5zQZSNOAKz3XEip55GWhd1bCYCVEJuKiA2hn1Ni/s3VUq1T4rULihcmk3hH9Oi BxFRoYmuOmwCEH39VKvA3qbXK3/Kp4Vyv58N0atqyMGic4BKjfm4XZnPP9FMPaJpmlpP sAofU/hTPLerFRZPrGfl8otw+e0ri9UQ2rcUQFOC54kxxFkRVO0mypq5upT4kjyZEcW6 7R3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from:arc-authentication-results; bh=kX3JIM5ko0wC1ts/1CZnvpFkmIrSNYMsYKWHeg334CQ=; b=LoVWJNEXRh8YWLIGr1NNGKn2DF/dVq+2GVErJ7TShvhYtNil4m7PPR7+nYs99TsdZY 6uCsJkapWViwE9w/lLJEKjlA1UP5FP8db+aLGEfrG79Z/flnAEhzIoUltiaRcoTzu9Ui OoZcvceFRucMuSfjTHJt4X34Uc87jB3FFAlS91bvDC11RrUHiTCtqAzn8Nk9Ke/mT3Rc Fj5MjCKXg1ZFp2awTjBKGnh5J+lk8+x+FT1fQsHMFNBYpggaH5mc6fd5ZWCOBSkvuyzx pClyN86iRSyb0n0GLVCxuMbp/Oa0iNMOU6DPwbbzIrl3A+U+GLn8lnf9CJGTGQpd4Rkg B+Fw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id l30si22858ljb.3.2018.02.16.00.52.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Feb 2018 00:52:27 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w1G8qQJt020020 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 16 Feb 2018 09:52:26 +0100 Received: from md1f2u6c.ww002.siemens.net ([167.87.7.207]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w1G8qPVS025341 for ; Fri, 16 Feb 2018 09:52:26 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH 5/8] Add qemuarm64-stretch multiconfig Date: Fri, 16 Feb 2018 09:52:21 +0100 Message-Id: X-Mailer: git-send-email 2.13.6 In-Reply-To: References: In-Reply-To: References: X-TUID: kn0ksi/QZ9dX From: Jan Kiszka 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. Signed-off-by: Jan Kiszka --- 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 -- 2.13.6