From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6599936908158042112 X-Received: by 2002:a50:9eee:: with SMTP id a101-v6mr5267859edf.9.1536667559836; Tue, 11 Sep 2018 05:05:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:b364:: with SMTP id r33-v6ls1446229edd.3.gmail; Tue, 11 Sep 2018 05:05:59 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdb4cTKeRfyCZKOAaN1wsHOgRiOR6kfMO8wamEQ6ulvYgxwxKV0x+2kYs7hiHFTG+hLb356a X-Received: by 2002:aa7:c415:: with SMTP id j21-v6mr5289443edq.3.1536667559375; Tue, 11 Sep 2018 05:05:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536667559; cv=none; d=google.com; s=arc-20160816; b=nC0ds/HyYt+3O05ViGDVYHk1TtRLbOPa5NRiJj0ahJvSs22ZO1gy6bX8e8ReK3i5hJ qpe08J5J1oElN1U/n8NemilmZgES+BOAsQyBt9j1VL8kbAsGkm1SDxaFwvrqzl5AEUW4 Bhu78be7kdzlka38TmSqV5CkO6Wl7ezLkcyOMPMpQt5npJWgcJH0Sd6TsRCVgFSDqRPu K2ZZtqG92np49WxXKjPSMfhP03Yc61SVki7c0oFTcDq1pd7h50aHGLoCABDHjhM5JEK/ oWsG9l/Ran+ZQr4shvchyD/iefLOLHTCXTUE0aDF5O5lhrtwvJAJ1/GEfZYSENF2mvpK JLhw== 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; bh=43UI+79xi7JrVeU5NKx34Z0GgEvRiEIXXKPR+heU2FU=; b=s0sjp7J4b4wr0h9/f2zjq217gjbBwmd/mkdC+5AtKWLwBuf/sjIhkbQ39oPxooApwt 7g3fMM8WC4nO51Qcy16oU6ej+ZznZ8k+uzlRQ1ukn91X7vfaLjCo1IQlie09zpIyBwGe Usj89Rel8jh0udZ0090f2FCTpgYgSE2K5yGefxvHbFyPB3xYagpdBq8Qkby35USlq3vv qKrDHW5kgT5ADY8gQ7Ujtma4nmzlXsNtptPbi7KW5ncveEegAy3dInfI8vHQDXkm4GWl /aF0AsUd5E6sYDq8pOPOWwm/qWexwBCGzO86mZHoGaFFkV/xkWLuO5bnpnOn0RVRV5Ky X5Dw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id l37-v6si739900edb.5.2018.09.11.05.05.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Sep 2018 05:05:59 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id w8BC5wUQ004603 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 11 Sep 2018 14:05:58 +0200 Received: from md1f2u6c.ad001.siemens.net (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id w8BC5vIU000884 for ; Tue, 11 Sep 2018 14:05:58 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 10/16] start_vm: Rename ROOTFS_DEV to QEMU_ROOTFS_DEV Date: Tue, 11 Sep 2018 14:05:50 +0200 Message-Id: <54eb96e638f039cf7d1d11a3c94eba04383c9235.1536667556.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: A3WKgZWXokDS From: Jan Kiszka The old ROOTFS_DEV variable is now only used for start_vm. Rename it to clarify the scope. Drop it from configs that use wic images or do not support QEMU anyway. Signed-off-by: Jan Kiszka --- meta-isar/conf/multiconfig/bananapi-stretch.conf | 2 -- meta-isar/conf/multiconfig/qemuamd64-buster.conf | 2 -- meta-isar/conf/multiconfig/qemuamd64-jessie.conf | 2 +- meta-isar/conf/multiconfig/qemuamd64-stretch.conf | 2 -- meta-isar/conf/multiconfig/qemuarm-buster.conf | 2 +- meta-isar/conf/multiconfig/qemuarm-jessie.conf | 2 +- meta-isar/conf/multiconfig/qemuarm-stretch.conf | 2 +- meta-isar/conf/multiconfig/qemuarm-wheezy.conf | 2 +- meta-isar/conf/multiconfig/qemuarm64-buster.conf | 2 +- meta-isar/conf/multiconfig/qemuarm64-stretch.conf | 2 +- meta-isar/conf/multiconfig/qemui386-buster.conf | 2 -- meta-isar/conf/multiconfig/qemui386-jessie.conf | 2 +- meta-isar/conf/multiconfig/qemui386-stretch.conf | 2 -- meta-isar/conf/multiconfig/rpi-jessie.conf | 2 -- scripts/start_vm | 4 ++-- 15 files changed, 10 insertions(+), 22 deletions(-) diff --git a/meta-isar/conf/multiconfig/bananapi-stretch.conf b/meta-isar/conf/multiconfig/bananapi-stretch.conf index b884b44..96cfffd 100644 --- a/meta-isar/conf/multiconfig/bananapi-stretch.conf +++ b/meta-isar/conf/multiconfig/bananapi-stretch.conf @@ -20,5 +20,3 @@ IMAGE_INSTALL += "u-boot-script" IMAGE_TYPE ?= "wic-img" WKS_FILE ?= "bananapi" IMAGER_INSTALL += "u-boot-sunxi" - -ROOTFS_DEV ?= "mmcblk0p1" diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf b/meta-isar/conf/multiconfig/qemuamd64-buster.conf index 90bb0d1..a6fc40e 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-buster.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf @@ -13,8 +13,6 @@ IMAGE_TYPE ?= "wic-img" WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" -ROOTFS_DEV ?= "sda2" - QEMU_ARCH ?= "x86_64" QEMU_MACHINE ?= "q35" QEMU_CPU ?= "" diff --git a/meta-isar/conf/multiconfig/qemuamd64-jessie.conf b/meta-isar/conf/multiconfig/qemuamd64-jessie.conf index 65167a9..ca00e15 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-jessie.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-jessie.conf @@ -8,7 +8,7 @@ DISTRO_ARCH ?= "amd64" KERNEL_NAME ?= "amd64" -ROOTFS_DEV ?= "sda" +QEMU_ROOTFS_DEV ?= "sda" QEMU_ARCH ?= "x86_64" QEMU_MACHINE ?= "pc" diff --git a/meta-isar/conf/multiconfig/qemuamd64-stretch.conf b/meta-isar/conf/multiconfig/qemuamd64-stretch.conf index 3592cdc..632f3b5 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-stretch.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-stretch.conf @@ -14,8 +14,6 @@ IMAGE_TYPE ?= "wic-img" WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" -ROOTFS_DEV ?= "sda2" - QEMU_ARCH ?= "x86_64" QEMU_MACHINE ?= "q35" QEMU_CPU ?= "" diff --git a/meta-isar/conf/multiconfig/qemuarm-buster.conf b/meta-isar/conf/multiconfig/qemuarm-buster.conf index aa80ad6..f9c97ec 100644 --- a/meta-isar/conf/multiconfig/qemuarm-buster.conf +++ b/meta-isar/conf/multiconfig/qemuarm-buster.conf @@ -9,7 +9,7 @@ KERNEL_NAME ?= "armmp" IMAGE_PREINSTALL += "init" -ROOTFS_DEV ?= "vda" +QEMU_ROOTFS_DEV ?= "vda" QEMU_ARCH ?= "arm" QEMU_MACHINE ?= "virt" diff --git a/meta-isar/conf/multiconfig/qemuarm-jessie.conf b/meta-isar/conf/multiconfig/qemuarm-jessie.conf index 0735d95..7001b05 100644 --- a/meta-isar/conf/multiconfig/qemuarm-jessie.conf +++ b/meta-isar/conf/multiconfig/qemuarm-jessie.conf @@ -15,7 +15,7 @@ DISTRO_ARCH ?= "armhf" KERNEL_NAME ?= "armmp" -ROOTFS_DEV ?= "vda" +QEMU_ROOTFS_DEV ?= "vda" QEMU_ARCH ?= "arm" QEMU_MACHINE ?= "virt" diff --git a/meta-isar/conf/multiconfig/qemuarm-stretch.conf b/meta-isar/conf/multiconfig/qemuarm-stretch.conf index db74cb6..3094d5b 100644 --- a/meta-isar/conf/multiconfig/qemuarm-stretch.conf +++ b/meta-isar/conf/multiconfig/qemuarm-stretch.conf @@ -10,7 +10,7 @@ KERNEL_NAME ?= "armmp" IMAGE_PREINSTALL += "init" -ROOTFS_DEV ?= "vda" +QEMU_ROOTFS_DEV ?= "vda" QEMU_ARCH ?= "arm" QEMU_MACHINE ?= "virt" diff --git a/meta-isar/conf/multiconfig/qemuarm-wheezy.conf b/meta-isar/conf/multiconfig/qemuarm-wheezy.conf index 5498652..19b9daa 100644 --- a/meta-isar/conf/multiconfig/qemuarm-wheezy.conf +++ b/meta-isar/conf/multiconfig/qemuarm-wheezy.conf @@ -15,7 +15,7 @@ DISTRO_ARCH ?= "armhf" KERNEL_NAME ?= "vexpress" -ROOTFS_DEV ?= "mmcblk0" +QEMU_ROOTFS_DEV ?= "mmcblk0" QEMU_ARCH ?= "arm" QEMU_MACHINE ?= "vexpress-a9" diff --git a/meta-isar/conf/multiconfig/qemuarm64-buster.conf b/meta-isar/conf/multiconfig/qemuarm64-buster.conf index 6e037ed..77141d1 100644 --- a/meta-isar/conf/multiconfig/qemuarm64-buster.conf +++ b/meta-isar/conf/multiconfig/qemuarm64-buster.conf @@ -11,7 +11,7 @@ KERNEL_NAME ?= "arm64" IMAGE_PREINSTALL += "init" -ROOTFS_DEV ?= "vda" +QEMU_ROOTFS_DEV ?= "vda" QEMU_ARCH ?= "aarch64" QEMU_MACHINE ?= "virt" diff --git a/meta-isar/conf/multiconfig/qemuarm64-stretch.conf b/meta-isar/conf/multiconfig/qemuarm64-stretch.conf index ee8f35e..90b5a84 100644 --- a/meta-isar/conf/multiconfig/qemuarm64-stretch.conf +++ b/meta-isar/conf/multiconfig/qemuarm64-stretch.conf @@ -11,7 +11,7 @@ KERNEL_NAME ?= "arm64" IMAGE_PREINSTALL += "init" -ROOTFS_DEV ?= "vda" +QEMU_ROOTFS_DEV ?= "vda" QEMU_ARCH ?= "aarch64" QEMU_MACHINE ?= "virt" diff --git a/meta-isar/conf/multiconfig/qemui386-buster.conf b/meta-isar/conf/multiconfig/qemui386-buster.conf index be89001..000769a 100644 --- a/meta-isar/conf/multiconfig/qemui386-buster.conf +++ b/meta-isar/conf/multiconfig/qemui386-buster.conf @@ -13,8 +13,6 @@ IMAGE_TYPE ?= "wic-img" WKS_FILE ?= "directdisk-isar" IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}" -ROOTFS_DEV ?= "sda2" - QEMU_ARCH ?= "i386" QEMU_MACHINE ?= "pc" QEMU_CPU ?= "" diff --git a/meta-isar/conf/multiconfig/qemui386-jessie.conf b/meta-isar/conf/multiconfig/qemui386-jessie.conf index 33d515c..9db9f8c 100644 --- a/meta-isar/conf/multiconfig/qemui386-jessie.conf +++ b/meta-isar/conf/multiconfig/qemui386-jessie.conf @@ -8,7 +8,7 @@ DISTRO_ARCH ?= "i386" KERNEL_NAME ?= "686-pae" -ROOTFS_DEV ?= "sda" +QEMU_ROOTFS_DEV ?= "sda" QEMU_ARCH ?= "i386" QEMU_MACHINE ?= "pc" diff --git a/meta-isar/conf/multiconfig/qemui386-stretch.conf b/meta-isar/conf/multiconfig/qemui386-stretch.conf index 7df80f5..6586947 100644 --- a/meta-isar/conf/multiconfig/qemui386-stretch.conf +++ b/meta-isar/conf/multiconfig/qemui386-stretch.conf @@ -14,8 +14,6 @@ IMAGE_TYPE ?= "wic-img" WKS_FILE ?= "directdisk-isar" IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}" -ROOTFS_DEV ?= "sda2" - QEMU_ARCH ?= "i386" QEMU_MACHINE ?= "pc" QEMU_CPU ?= "" diff --git a/meta-isar/conf/multiconfig/rpi-jessie.conf b/meta-isar/conf/multiconfig/rpi-jessie.conf index fcc10d9..03c32e2 100644 --- a/meta-isar/conf/multiconfig/rpi-jessie.conf +++ b/meta-isar/conf/multiconfig/rpi-jessie.conf @@ -31,5 +31,3 @@ IMAGE_PREINSTALL += " \ traceroute \ vim \ " - -ROOTFS_DEV ?= "mmcblk0p2" diff --git a/scripts/start_vm b/scripts/start_vm index 5be348a..6492c54 100755 --- a/scripts/start_vm +++ b/scripts/start_vm @@ -109,7 +109,7 @@ readonly MACHINE_CONF=$ISARROOT/meta-isar/conf/machine/qemu$ARCH.conf 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 "$(egrep 'QEMU_' $CONFIG_CONF |bb2sh)" eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | grep "^IMAGE_TYPE=") case "$IMAGE_TYPE" in @@ -124,7 +124,7 @@ case "$IMAGE_TYPE" in EXTRA_ARGS="$EXTRA_ARGS \ -kernel $QKERNEL \ -initrd $QINITRD" - KARGS="console=$MACHINE_SERIAL root=/dev/$ROOTFS_DEV rw" + KARGS="console=$MACHINE_SERIAL root=/dev/$QEMU_ROOTFS_DEV rw" ;; wic-img) readonly ROOTFS_IMAGE=isar-image-base-debian-$DISTRO-qemu$ARCH.wic.img -- 2.16.4