From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6780366809388285952 X-Received: by 2002:a5d:6390:: with SMTP id p16mr36167018wru.170.1580293808847; Wed, 29 Jan 2020 02:30:08 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:65d0:: with SMTP id e16ls11859674wrw.1.gmail; Wed, 29 Jan 2020 02:30:08 -0800 (PST) X-Google-Smtp-Source: APXvYqxiHoEmj1DlyxfzEF05njlQ3NlcoN1u28JpjPUZuI92AhLM9FXYlCn+VgsKEO6XShrWc9BX X-Received: by 2002:adf:ee88:: with SMTP id b8mr36650366wro.249.1580293807963; Wed, 29 Jan 2020 02:30:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580293807; cv=none; d=google.com; s=arc-20160816; b=OWwdgklKnBoCxqkAqOONR++x46nDbpYMo66xFK5QkXIndAH2g3K/qBpPbFLQp2yz7w 9wRnjR4xLRogu2BjQA+a/k6NCV1c71hxoac0g2AQiAva04PMwp8ofxdrIJ5kFV13Ktf4 i6d5eLkjAwb6myvCjcjNnlsuPiOUxzM71LKb7gDLhWNc1OjNFuUm6If9q7yBKlNoySNc lXkZ0SUUPghwzw21+NN+3kGD30iNtJvgEMb2fh9yPOENOye4JC6HlrIeB8oJ9w6Qwe0T EkFf9unEkx7FKEV/pUnK+y0AQh4NNyjNf5Jn4BIh5lE4FRRJlyl46lPsDEp69I70Rr2i 5dyA== 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=TFbU/a+GqYGAaHGJPEmRJ+sYtL4oLZQG+TchDW7OcCI=; b=KBtdbbcbiFxzzq4OM+mrf2R7HZoZCR0/BiZj9gl07PsMSLkziSHa9wPH0U2rFV5BBa im0HlpKDp/NKVyQnhN/4qUlA5pnJuGDwJZtOqKebP04cHK1Lck91gTgRYxLQxx38TFtH fuymipVpM1MH1ERNrtRfZtC73OC/3Zz1o7Kqx1OeFFnrcNGK3JkEAF97BUAeM4BXrVfa 3G8k50NXnMIon9LMdfmh8Ta+eDcD3SVhwwZyT64HSR/ZmMF2if+834bKvoWLw+I/iavk VJEn9MSXtvS+LezMydgEWt6MbAHNJtu/vG8aX+ND9LPMJFUmm3HIHsh6db2DoiaZobji 93qw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id m12si85184wrq.1.2020.01.29.02.30.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jan 2020 02:30:07 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 00TAU7eW011573 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 29 Jan 2020 11:30:07 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.47.1]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 00TAU6Do009574 for ; Wed, 29 Jan 2020 11:30:07 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH v3 01/14] meta-isar: Clean up qemu multiconfigs Date: Wed, 29 Jan 2020 11:29:53 +0100 Message-Id: <262dc68259cbe86c364a7e68935cc335d6e9cc03.1580293806.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: OmQuDeLhl4Fh From: Jan Kiszka Move all the needless duplications from the multiconfigs into the machine configs, reducing the multiconfigs to MACHINE and DISTRO settings - with the only exception of qemuamd64-buster-tgz.conf. Note that this also switches all qemui386 targets to the 686-pae kernel. So far, only the stretch target used it - for whatever reason. As the QEMU data is now in the machine config, start_vm also needs to be updated to pull from there, no longer from any multiconfig. Signed-off-by: Jan Kiszka --- meta-isar/conf/machine/qemuamd64.conf | 17 +++++++++++++++-- meta-isar/conf/machine/qemuarm.conf | 16 ++++++++++++++-- meta-isar/conf/machine/qemuarm64.conf | 16 ++++++++++++++-- meta-isar/conf/machine/qemui386.conf | 14 ++++++++++++-- meta-isar/conf/machine/qemumipsel.conf | 16 ++++++++++++++-- meta-isar/conf/multiconfig/qemuamd64-bullseye.conf | 16 ---------------- meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf | 6 ------ meta-isar/conf/multiconfig/qemuamd64-buster.conf | 16 ---------------- meta-isar/conf/multiconfig/qemuamd64-stretch.conf | 13 ------------- meta-isar/conf/multiconfig/qemuarm-bullseye.conf | 12 ------------ meta-isar/conf/multiconfig/qemuarm-buster.conf | 12 ------------ meta-isar/conf/multiconfig/qemuarm-stretch.conf | 12 ------------ meta-isar/conf/multiconfig/qemuarm64-bullseye.conf | 12 ------------ meta-isar/conf/multiconfig/qemuarm64-buster.conf | 12 ------------ meta-isar/conf/multiconfig/qemuarm64-stretch.conf | 12 ------------ meta-isar/conf/multiconfig/qemui386-bullseye.conf | 13 ------------- meta-isar/conf/multiconfig/qemui386-buster.conf | 13 ------------- meta-isar/conf/multiconfig/qemui386-stretch.conf | 13 ------------- meta-isar/conf/multiconfig/qemumipsel-bullseye.conf | 12 ------------ meta-isar/conf/multiconfig/qemumipsel-buster.conf | 12 ------------ meta-isar/conf/multiconfig/qemumipsel-stretch.conf | 12 ------------ scripts/start_vm | 5 +---- 22 files changed, 70 insertions(+), 212 deletions(-) diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf index 1eb85e6b..028b738d 100644 --- a/meta-isar/conf/machine/qemuamd64.conf +++ b/meta-isar/conf/machine/qemuamd64.conf @@ -1,7 +1,20 @@ # This software is a part of ISAR. # Copyright (C) 2017 ilbers GmbH +DISTRO_ARCH ?= "amd64" + +KERNEL_NAME ?= "amd64" + +IMAGE_TYPE ?= "wic-img" +WKS_FILE ?= "sdimage-efi" +IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" + +IMAGE_INSTALL += "sshd-regen-keys" + +QEMU_ARCH ?= "x86_64" +QEMU_MACHINE ?= "q35" +QEMU_CPU ?= "" +QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE## -bios /usr/local/share/ovmf/OVMF.fd" + MACHINE_SERIAL ?= "ttyS0" BAUDRATE_TTY ?= "115200" - -IMAGE_TYPE ?= "ext4-img" diff --git a/meta-isar/conf/machine/qemuarm.conf b/meta-isar/conf/machine/qemuarm.conf index 70dd9415..fbbdc233 100644 --- a/meta-isar/conf/machine/qemuarm.conf +++ b/meta-isar/conf/machine/qemuarm.conf @@ -1,7 +1,19 @@ # This software is a part of ISAR. # Copyright (C) 2015-2017 ilbers GmbH -MACHINE_SERIAL ?= "ttyAMA0" -BAUDRATE_TTY ?= "115200" +DISTRO_ARCH ?= "armhf" + +KERNEL_NAME ?= "armmp" IMAGE_TYPE ?= "ext4-img" + +QEMU_ROOTFS_DEV ?= "vda" + +QEMU_ARCH ?= "arm" +QEMU_MACHINE ?= "virt" +QEMU_CPU ?= "cortex-a15" +# TODO: start_vm doesn't support multiline vars +QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" + +MACHINE_SERIAL ?= "ttyAMA0" +BAUDRATE_TTY ?= "115200" diff --git a/meta-isar/conf/machine/qemuarm64.conf b/meta-isar/conf/machine/qemuarm64.conf index 70dd9415..246da5a5 100644 --- a/meta-isar/conf/machine/qemuarm64.conf +++ b/meta-isar/conf/machine/qemuarm64.conf @@ -1,7 +1,19 @@ # This software is a part of ISAR. # Copyright (C) 2015-2017 ilbers GmbH -MACHINE_SERIAL ?= "ttyAMA0" -BAUDRATE_TTY ?= "115200" +DISTRO_ARCH ?= "arm64" + +KERNEL_NAME ?= "arm64" IMAGE_TYPE ?= "ext4-img" + +QEMU_ROOTFS_DEV ?= "vda" + +QEMU_ARCH ?= "aarch64" +QEMU_MACHINE ?= "virt" +QEMU_CPU ?= "cortex-a57" +# TODO: start_vm doesn't support multiline vars +QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" + +MACHINE_SERIAL ?= "ttyAMA0" +BAUDRATE_TTY ?= "115200" diff --git a/meta-isar/conf/machine/qemui386.conf b/meta-isar/conf/machine/qemui386.conf index 1eb85e6b..e6afb06b 100644 --- a/meta-isar/conf/machine/qemui386.conf +++ b/meta-isar/conf/machine/qemui386.conf @@ -1,7 +1,17 @@ # This software is a part of ISAR. # Copyright (C) 2017 ilbers GmbH +DISTRO_ARCH ?= "i386" + +KERNEL_NAME ?= "686-pae" + +IMAGE_TYPE ?= "wic-img" +WKS_FILE ?= "directdisk-isar" +IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}" + +QEMU_ARCH ?= "i386" +QEMU_MACHINE ?= "pc" +QEMU_CPU ?= "" +QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE##" MACHINE_SERIAL ?= "ttyS0" BAUDRATE_TTY ?= "115200" - -IMAGE_TYPE ?= "ext4-img" diff --git a/meta-isar/conf/machine/qemumipsel.conf b/meta-isar/conf/machine/qemumipsel.conf index 18191fc9..85178ee9 100644 --- a/meta-isar/conf/machine/qemumipsel.conf +++ b/meta-isar/conf/machine/qemumipsel.conf @@ -1,7 +1,19 @@ # This software is a part of ISAR. # Copyright (C) 2019 Mentor Graphics, a Siemens business -MACHINE_SERIAL ?= "ttyS0" -BAUDRATE_TTY ?= "115200" +DISTRO_ARCH ?= "mipsel" + +KERNEL_NAME ?= "4kc-malta" IMAGE_TYPE ?= "ext4-img" + +QEMU_ROOTFS_DEV ?= "sda" + +QEMU_ARCH ?= "mipsel" +QEMU_MACHINE ?= "malta" +QEMU_CPU ?= "24Kc" +QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,format=raw" +QEMU_KARGS ?= "nokaslr" + +MACHINE_SERIAL ?= "ttyS0" +BAUDRATE_TTY ?= "115200" diff --git a/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf b/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf index d0b79f72..1badc889 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf @@ -1,20 +1,4 @@ # This software is a part of ISAR. MACHINE ?= "qemuamd64" - DISTRO ?= "debian-bullseye" -DISTRO_ARCH ?= "amd64" - -KERNEL_NAME ?= "amd64" - -IMAGE_TYPE ?= "wic-img" -WKS_FILE ?= "sdimage-efi" -IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" - -IMAGE_INSTALL += "sshd-regen-keys" - -QEMU_ARCH ?= "x86_64" -QEMU_MACHINE ?= "q35" -QEMU_CPU ?= "" -QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE## -bios /usr/local/share/ovmf/OVMF.fd" - diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf index 18944545..17de3384 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf @@ -4,12 +4,6 @@ # SPDX-License-Identifier: MIT MACHINE ?= "qemuamd64" - DISTRO ?= "debian-buster" -DISTRO_ARCH ?= "amd64" - -KERNEL_NAME ?= "amd64" IMAGE_TYPE ?= "targz-img" - -IMAGE_INSTALL += "sshd-regen-keys" diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf b/meta-isar/conf/multiconfig/qemuamd64-buster.conf index da909939..3fabd675 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-buster.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf @@ -1,20 +1,4 @@ # This software is a part of ISAR. MACHINE ?= "qemuamd64" - DISTRO ?= "debian-buster" -DISTRO_ARCH ?= "amd64" - -KERNEL_NAME ?= "amd64" - -IMAGE_TYPE ?= "wic-img" -WKS_FILE ?= "sdimage-efi" -IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" - -IMAGE_INSTALL += "sshd-regen-keys" - -QEMU_ARCH ?= "x86_64" -QEMU_MACHINE ?= "q35" -QEMU_CPU ?= "" -QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE## -bios /usr/local/share/ovmf/OVMF.fd" - diff --git a/meta-isar/conf/multiconfig/qemuamd64-stretch.conf b/meta-isar/conf/multiconfig/qemuamd64-stretch.conf index f9d283ca..f9592c71 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-stretch.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-stretch.conf @@ -2,17 +2,4 @@ # Copyright (C) 2017 ilbers GmbH MACHINE ?= "qemuamd64" - DISTRO ?= "debian-stretch" -DISTRO_ARCH ?= "amd64" - -KERNEL_NAME ?= "amd64" - -IMAGE_TYPE ?= "wic-img" -WKS_FILE ?= "sdimage-efi" -IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" - -QEMU_ARCH ?= "x86_64" -QEMU_MACHINE ?= "q35" -QEMU_CPU ?= "" -QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE## -bios /usr/local/share/ovmf/OVMF.fd" diff --git a/meta-isar/conf/multiconfig/qemuarm-bullseye.conf b/meta-isar/conf/multiconfig/qemuarm-bullseye.conf index 1989d90f..6924f405 100644 --- a/meta-isar/conf/multiconfig/qemuarm-bullseye.conf +++ b/meta-isar/conf/multiconfig/qemuarm-bullseye.conf @@ -1,16 +1,4 @@ # This software is a part of ISAR. MACHINE ?= "qemuarm" - DISTRO ?= "debian-bullseye" -DISTRO_ARCH ?= "armhf" - -KERNEL_NAME ?= "armmp" - -QEMU_ROOTFS_DEV ?= "vda" - -QEMU_ARCH ?= "arm" -QEMU_MACHINE ?= "virt" -QEMU_CPU ?= "cortex-a15" -# TODO: start_vm doesn't support multiline vars -QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" diff --git a/meta-isar/conf/multiconfig/qemuarm-buster.conf b/meta-isar/conf/multiconfig/qemuarm-buster.conf index bc84c8b0..96904388 100644 --- a/meta-isar/conf/multiconfig/qemuarm-buster.conf +++ b/meta-isar/conf/multiconfig/qemuarm-buster.conf @@ -1,16 +1,4 @@ # This software is a part of ISAR. MACHINE ?= "qemuarm" - DISTRO ?= "debian-buster" -DISTRO_ARCH ?= "armhf" - -KERNEL_NAME ?= "armmp" - -QEMU_ROOTFS_DEV ?= "vda" - -QEMU_ARCH ?= "arm" -QEMU_MACHINE ?= "virt" -QEMU_CPU ?= "cortex-a15" -# TODO: start_vm doesn't support multiline vars -QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" diff --git a/meta-isar/conf/multiconfig/qemuarm-stretch.conf b/meta-isar/conf/multiconfig/qemuarm-stretch.conf index a2e3df16..f3af9fc3 100644 --- a/meta-isar/conf/multiconfig/qemuarm-stretch.conf +++ b/meta-isar/conf/multiconfig/qemuarm-stretch.conf @@ -2,16 +2,4 @@ # Copyright (C) 2017 ilbers GmbH MACHINE ?= "qemuarm" - DISTRO ?= "debian-stretch" -DISTRO_ARCH ?= "armhf" - -KERNEL_NAME ?= "armmp" - -QEMU_ROOTFS_DEV ?= "vda" - -QEMU_ARCH ?= "arm" -QEMU_MACHINE ?= "virt" -QEMU_CPU ?= "cortex-a15" -# TODO: start_vm doesn't support multiline vars -QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" diff --git a/meta-isar/conf/multiconfig/qemuarm64-bullseye.conf b/meta-isar/conf/multiconfig/qemuarm64-bullseye.conf index e8dabac1..4b3a8462 100644 --- a/meta-isar/conf/multiconfig/qemuarm64-bullseye.conf +++ b/meta-isar/conf/multiconfig/qemuarm64-bullseye.conf @@ -3,16 +3,4 @@ # Copyright (c) Siemens AG, 2019 MACHINE ?= "qemuarm64" - DISTRO ?= "debian-bullseye" -DISTRO_ARCH ?= "arm64" - -KERNEL_NAME ?= "arm64" - -QEMU_ROOTFS_DEV ?= "vda" - -QEMU_ARCH ?= "aarch64" -QEMU_MACHINE ?= "virt" -QEMU_CPU ?= "cortex-a57" -# TODO: start_vm doesn't support multiline vars -QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" diff --git a/meta-isar/conf/multiconfig/qemuarm64-buster.conf b/meta-isar/conf/multiconfig/qemuarm64-buster.conf index 40f1d414..60c370ba 100644 --- a/meta-isar/conf/multiconfig/qemuarm64-buster.conf +++ b/meta-isar/conf/multiconfig/qemuarm64-buster.conf @@ -3,16 +3,4 @@ # Copyright (c) Siemens AG, 2018 MACHINE ?= "qemuarm64" - DISTRO ?= "debian-buster" -DISTRO_ARCH ?= "arm64" - -KERNEL_NAME ?= "arm64" - -QEMU_ROOTFS_DEV ?= "vda" - -QEMU_ARCH ?= "aarch64" -QEMU_MACHINE ?= "virt" -QEMU_CPU ?= "cortex-a57" -# TODO: start_vm doesn't support multiline vars -QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" diff --git a/meta-isar/conf/multiconfig/qemuarm64-stretch.conf b/meta-isar/conf/multiconfig/qemuarm64-stretch.conf index dcef3702..0fd39fca 100644 --- a/meta-isar/conf/multiconfig/qemuarm64-stretch.conf +++ b/meta-isar/conf/multiconfig/qemuarm64-stretch.conf @@ -3,16 +3,4 @@ # Copyright (c) Siemens AG, 2018 MACHINE ?= "qemuarm64" - DISTRO ?= "debian-stretch" -DISTRO_ARCH ?= "arm64" - -KERNEL_NAME ?= "arm64" - -QEMU_ROOTFS_DEV ?= "vda" - -QEMU_ARCH ?= "aarch64" -QEMU_MACHINE ?= "virt" -QEMU_CPU ?= "cortex-a57" -# TODO: start_vm doesn't support multiline vars -QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0" diff --git a/meta-isar/conf/multiconfig/qemui386-bullseye.conf b/meta-isar/conf/multiconfig/qemui386-bullseye.conf index 0a16d105..bc81136d 100644 --- a/meta-isar/conf/multiconfig/qemui386-bullseye.conf +++ b/meta-isar/conf/multiconfig/qemui386-bullseye.conf @@ -1,17 +1,4 @@ # This software is a part of ISAR. MACHINE ?= "qemui386" - DISTRO ?= "debian-bullseye" -DISTRO_ARCH ?= "i386" - -KERNEL_NAME ?= "686" - -IMAGE_TYPE ?= "wic-img" -WKS_FILE ?= "directdisk-isar" -IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}" - -QEMU_ARCH ?= "i386" -QEMU_MACHINE ?= "pc" -QEMU_CPU ?= "" -QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE##" diff --git a/meta-isar/conf/multiconfig/qemui386-buster.conf b/meta-isar/conf/multiconfig/qemui386-buster.conf index 6b5a18e5..d9350c04 100644 --- a/meta-isar/conf/multiconfig/qemui386-buster.conf +++ b/meta-isar/conf/multiconfig/qemui386-buster.conf @@ -1,17 +1,4 @@ # This software is a part of ISAR. MACHINE ?= "qemui386" - DISTRO ?= "debian-buster" -DISTRO_ARCH ?= "i386" - -KERNEL_NAME ?= "686" - -IMAGE_TYPE ?= "wic-img" -WKS_FILE ?= "directdisk-isar" -IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}" - -QEMU_ARCH ?= "i386" -QEMU_MACHINE ?= "pc" -QEMU_CPU ?= "" -QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE##" diff --git a/meta-isar/conf/multiconfig/qemui386-stretch.conf b/meta-isar/conf/multiconfig/qemui386-stretch.conf index 037ba23f..007e82b9 100644 --- a/meta-isar/conf/multiconfig/qemui386-stretch.conf +++ b/meta-isar/conf/multiconfig/qemui386-stretch.conf @@ -2,17 +2,4 @@ # Copyright (C) 2017 ilbers GmbH MACHINE ?= "qemui386" - DISTRO ?= "debian-stretch" -DISTRO_ARCH ?= "i386" - -KERNEL_NAME ?= "686-pae" - -IMAGE_TYPE ?= "wic-img" -WKS_FILE ?= "directdisk-isar" -IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}" - -QEMU_ARCH ?= "i386" -QEMU_MACHINE ?= "pc" -QEMU_CPU ?= "" -QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE##" diff --git a/meta-isar/conf/multiconfig/qemumipsel-bullseye.conf b/meta-isar/conf/multiconfig/qemumipsel-bullseye.conf index aa3a6f82..6f24c59b 100644 --- a/meta-isar/conf/multiconfig/qemumipsel-bullseye.conf +++ b/meta-isar/conf/multiconfig/qemumipsel-bullseye.conf @@ -2,16 +2,4 @@ # Copyright (C) 2019 Mentor Graphics, a Siemens busines MACHINE ?= "qemumipsel" - DISTRO ?= "debian-bullseye" -DISTRO_ARCH ?= "mipsel" - -KERNEL_NAME ?= "4kc-malta" - -QEMU_ROOTFS_DEV ?= "sda" - -QEMU_ARCH ?= "mipsel" -QEMU_MACHINE ?= "malta" -QEMU_CPU ?= "24Kc" -QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,format=raw" -QEMU_KARGS ?= "nokaslr" diff --git a/meta-isar/conf/multiconfig/qemumipsel-buster.conf b/meta-isar/conf/multiconfig/qemumipsel-buster.conf index ac9058ce..1d369fd5 100644 --- a/meta-isar/conf/multiconfig/qemumipsel-buster.conf +++ b/meta-isar/conf/multiconfig/qemumipsel-buster.conf @@ -2,16 +2,4 @@ # Copyright (C) 2019 Mentor Graphics, a Siemens busines MACHINE ?= "qemumipsel" - DISTRO ?= "debian-buster" -DISTRO_ARCH ?= "mipsel" - -KERNEL_NAME ?= "4kc-malta" - -QEMU_ROOTFS_DEV ?= "sda" - -QEMU_ARCH ?= "mipsel" -QEMU_MACHINE ?= "malta" -QEMU_CPU ?= "24Kc" -QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,format=raw" -QEMU_KARGS ?= "nokaslr" diff --git a/meta-isar/conf/multiconfig/qemumipsel-stretch.conf b/meta-isar/conf/multiconfig/qemumipsel-stretch.conf index 1fe20042..53009be6 100644 --- a/meta-isar/conf/multiconfig/qemumipsel-stretch.conf +++ b/meta-isar/conf/multiconfig/qemumipsel-stretch.conf @@ -2,16 +2,4 @@ # Copyright (C) 2019 Mentor Graphics, a Siemens busines MACHINE ?= "qemumipsel" - DISTRO ?= "debian-stretch" -DISTRO_ARCH ?= "mipsel" - -KERNEL_NAME ?= "4kc-malta" - -QEMU_ROOTFS_DEV ?= "sda" - -QEMU_ARCH ?= "mipsel" -QEMU_MACHINE ?= "malta" -QEMU_CPU ?= "24Kc" -QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,format=raw" -QEMU_KARGS ?= "nokaslr" diff --git a/scripts/start_vm b/scripts/start_vm index 71b55f25..321a8c0c 100755 --- a/scripts/start_vm +++ b/scripts/start_vm @@ -107,10 +107,7 @@ readonly IMAGE_DIR=$DEPLOY_DIR_IMAGE readonly ISARROOT="$(dirname "$0")"/.. 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 'QEMU_' $CONFIG_CONF |bb2sh)" +eval "$(egrep 'MACHINE_SERIAL|QEMU_' $MACHINE_CONF |bb2sh)" eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^IMAGE_TYPE=") case "$IMAGE_TYPE" in -- 2.16.4