From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6543937367387930624 X-Received: by 10.80.245.249 with SMTP id x54mr5200785edm.3.1523629150155; Fri, 13 Apr 2018 07:19:10 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.204.68 with SMTP id n4ls4409744edi.5.gmail; Fri, 13 Apr 2018 07:19:09 -0700 (PDT) X-Google-Smtp-Source: AIpwx49NAWUnCYJT3sGy/gx8V4GoInYIHCg3OJSG+QV9UjP9Uu3wwOsGJ+f/5RMJm0UOFCB8MefL X-Received: by 10.80.214.21 with SMTP id x21mr5195971edi.6.1523629149867; Fri, 13 Apr 2018 07:19:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523629149; cv=none; d=google.com; s=arc-20160816; b=K+JVWFKFNl0p8KahBgxYnt+F5hi8XKHlUnerIz+SP+VrBwPSgpFPHdfCyS1KagVCjj jiq5kP4MHxWPHHydvOVU4HHlbybuDqa+VWUnjoiF5x4dY7Cg43qO/asfa5hBTdpQorDD PAIZ/dl9amEcz96z0Bbs1ViI8K3+usspdiMr+l02iLdT/UGp01KNQy39dho2G+8Z0GVf 4pCh5T+XW27vj2XJsCeVhi2TJ9YOqn2RjYnPPK0ssMQiI85wKkaZzLpmB9Jt1dBr8Dnm eWNXtFCXA1YdX/MmJgzTSs7QhswvwXhA5ZEO1gh47SuG4G0wJFDz1BCGcu2eGUoww50T At5A== 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:cc:to:from:arc-authentication-results; bh=fAlAYOyypw2/aL89if3E0KZjt9oO9yDAgOT4wXX5GGA=; b=VIQ+0adIYp9URVm3tgIBKB9ns4jIa2hs6YjWBGItPSSjCNW4bO1lMFgWFIrymsYiXR 9pLV58zGFNg6bvgz2n5U1X3y2ikU1R/3DHBtJrykJHZzCylqYuhxpLmu+0dyFHdpLMsK kPPQtn61KqJnwNVkP1DPz23nyAT7iifT9EJnjt+Otct2kX6I56NCtAlCQNIO8N7444Rl dHDCKo1mnZCC0ixxMpKZ/i3rSQN7Mw804BzO3w9yyksZI043um5uByXHlRO/tVX1QpoV 92oXLUEbfFvXozHCb/9aBfS0VyF5jNh5oDVd0nGNenn+sslgkjVObenUwvXM82D7BK8f TXlg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id r7si260845edc.5.2018.04.13.07.19.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Apr 2018 07:19:09 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@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 henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@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 w3DEJ9La005540 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 Apr 2018 16:19:09 +0200 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w3DEJ8W5011006; Fri, 13 Apr 2018 16:19:09 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Cedric Hombourger , Andreas Reichel , Henning Schild Subject: [PATCH v2 13/17] scripts/start_vm: Enable booting of full disk images Date: Fri, 13 Apr 2018 16:19:02 +0200 Message-Id: <4916b6b42d3801db30346985396c4ca9fadf2c9b.1523628814.git.henning.schild@siemens.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: References: In-Reply-To: References: X-TUID: zDNb5f8I1OOm The scripts used to support booting with kernel, initrd and rootfs. Enable it to support the IMAGE_TYPE 'wic-img' as well. Signed-off-by: Henning Schild --- scripts/start_vm | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/scripts/start_vm b/scripts/start_vm index 6c89ce9..cfb2bea 100755 --- a/scripts/start_vm +++ b/scripts/start_vm @@ -27,9 +27,6 @@ start_qemu() { -M $QEMU_MACHINE \ $QCPU \ -nographic \ - -kernel $QKERNEL \ - -initrd $QINITRD \ - -append "console=$MACHINE_SERIAL root=/dev/$ROOTFS_DEV rw" \ $EXTRA_ARGS \ $root [ $had_x -eq 0 ] && set +x @@ -104,13 +101,6 @@ do done readonly IMAGE_DIR=$BUILD_DIR/tmp/deploy/images -readonly ROOTFS_IMAGE=isar-image-base-debian-$DISTRO-qemu$ARCH.ext4.img - -eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | grep "^KERNEL_IMAGE=") -eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | grep "^INITRD_IMAGE=") -QKERNEL=$IMAGE_DIR/${KERNEL_IMAGE} -QINITRD=/dev/null -[ -n "$INITRD_IMAGE" ] && QINITRD=$IMAGE_DIR/${INITRD_IMAGE} readonly ISARROOT="$(dirname "$0")"/.. @@ -120,6 +110,31 @@ eval "$(egrep 'MACHINE_SERIAL' $MACHINE_CONF |bb2sh)" readonly CONFIG_CONF=$ISARROOT/meta-isar/conf/multiconfig/qemu$ARCH-$DISTRO.conf eval "$(egrep 'ROOTFS_DEV|QEMU_' $CONFIG_CONF |bb2sh)" +eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | grep "^IMAGE_TYPE=") +case "$IMAGE_TYPE" in + ext4-img) + readonly ROOTFS_IMAGE=isar-image-base-debian-$DISTRO-qemu$ARCH.ext4.img + + eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | grep "^KERNEL_IMAGE=") + eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | grep "^INITRD_IMAGE=") + QKERNEL=$IMAGE_DIR/${KERNEL_IMAGE} + QINITRD=/dev/null + [ -n "$INITRD_IMAGE" ] && QINITRD=$IMAGE_DIR/${INITRD_IMAGE} + EXTRA_ARGS="$EXTRA_ARGS \ + -kernel $QKERNEL \ + -initrd $QINITRD \ + -append \"console=$MACHINE_SERIAL root=/dev/$ROOTFS_DEV rw\"" + ;; + wic-img) + readonly ROOTFS_IMAGE=isar-image-base-debian-$DISTRO-qemu$ARCH.wic.img + EXTRA_ARGS="$EXTRA_ARGS -snapshot" + ;; + *) + echo "IMAGE_TYPE \"$IMAGE_TYPE\" not supported" + exit 1 + ;; +esac + QCPU= [ -n "$QEMU_CPU" ] && QCPU="-cpu $QEMU_CPU" -- 2.16.1