From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Subject: [PATCH 10/16] start_vm: Rename ROOTFS_DEV to QEMU_ROOTFS_DEV
Date: Tue, 11 Sep 2018 14:05:50 +0200 [thread overview]
Message-ID: <54eb96e638f039cf7d1d11a3c94eba04383c9235.1536667556.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1536667556.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1536667556.git.jan.kiszka@siemens.com>
From: Jan Kiszka <jan.kiszka@siemens.com>
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 <jan.kiszka@siemens.com>
---
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
next prev parent reply other threads:[~2018-09-11 12:05 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-11 12:05 [PATCH 00/16] Cleanups, linux-custom fix, auto-expansion helper Jan Kiszka
2018-09-11 12:05 ` [PATCH 01/16] meta-isar: Adjust kernel params in sdimage-efi.wks Jan Kiszka
2018-09-11 12:05 ` [PATCH 02/16] meta-isar: Reduce grub timeout to 3 seconds Jan Kiszka
2018-09-11 12:05 ` [PATCH 03/16] meta-isar: Fix bananapi root disk specification Jan Kiszka
2018-09-12 8:57 ` Henning Schild
2018-09-12 8:59 ` Henning Schild
2018-09-11 12:05 ` [PATCH 04/16] meta-isar: Remove "=" after wic parameters Jan Kiszka
2018-09-11 12:05 ` [PATCH 05/16] u-boot-script: Become independent of target /etc/fstab Jan Kiszka
2018-09-11 12:05 ` [PATCH 06/16] isar-image-base: Disable rootfs check by default Jan Kiszka
2018-09-11 12:05 ` [PATCH 07/16] isar-image-base: Use generic parameters for rootfs entry in fstab Jan Kiszka
2018-09-11 12:05 ` [PATCH 08/16] meta: Remove ROOTFS_TYPE Jan Kiszka
2018-09-11 12:05 ` [PATCH 09/16] start_vm: Rename QEMU_ROOTFS_DEV to QEMU_DISK_ARGS Jan Kiszka
2018-09-11 12:05 ` Jan Kiszka [this message]
2018-09-11 12:05 ` [PATCH 11/16] RECIPE-API-CHANGELOG: Add ROOTFS_DEV/TYPE removal Jan Kiszka
2018-09-11 12:05 ` [PATCH 12/16] meta: Add expand-on-first-boot support package Jan Kiszka
2018-09-12 13:46 ` Henning Schild
2018-09-13 8:33 ` Jan Kiszka
2018-09-13 9:30 ` Henning Schild
2018-09-13 13:17 ` Jan Kiszka
2018-09-11 12:05 ` [PATCH 13/16] image: Limit ROOTFS_EXTRA to non-wic image type Jan Kiszka
2018-09-11 12:05 ` [PATCH 14/16] linux-custom: Simplify and clarify KERNEL_NAME-to-recipe matching Jan Kiszka
2018-09-11 12:05 ` [PATCH 15/16] meta-isar: Move init preinstallation into distro conf Jan Kiszka
2018-09-11 12:05 ` [PATCH 16/16] meta: Add enable-fsck helper recipe Jan Kiszka
2018-09-25 11:27 ` [PATCH 00/16] Cleanups, linux-custom fix, auto-expansion helper Maxim Yu. Osipov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54eb96e638f039cf7d1d11a3c94eba04383c9235.1536667556.git.jan.kiszka@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox