From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6780366809388285952 X-Received: by 2002:aa7:cf07:: with SMTP id a7mr5261229edy.381.1580249175068; Tue, 28 Jan 2020 14:06:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:1d30:: with SMTP id dh16ls4824802edb.10.gmail; Tue, 28 Jan 2020 14:06:14 -0800 (PST) X-Google-Smtp-Source: APXvYqxj9FlSVkLm1aHmUm7FGjYNM9AnIi8+Wq7FgGoEOTI8d3cufRx52APQZ4eyH2IJhOkFvhsT X-Received: by 2002:a50:f70d:: with SMTP id g13mr5456545edn.80.1580249174347; Tue, 28 Jan 2020 14:06:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580249174; cv=none; d=google.com; s=arc-20160816; b=e2kPnTG2ZCO/VrL6wVSuVyOTUlkRj9kQrJNcehS6lcgwA0LimQexRuTIt25576v0Ef ROsH6nDsnQbPMXWrCkV3rbdp5kYvK+eru55iERQ6YZdU4zqb2GW/sGdYHZuPqYoehfnI gEn/TnleQhPmOR9tPvqToH8YmtMNR2tctE3Vklyl1f12xMF/TAnPD9eGeaEI8UmAKWGq Yfdnafk2thcIACcnVXy5FM1xb6PlU+NDGMbyXoAiqLRacbdh9LgMLE/BxdbjTyPhWTO8 FmTTARDb4PZL4VlkPQFJedr7/OQPgQDoaZ7lvx2F1DYzltWNbv+O/GkJ4l8ZfAtUuml9 BqoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject; bh=9EnsuQwS/WSFWzPqOhkvUEXMeZtWYG+u0olEoe7HKew=; b=wIBtqvD6hQkh7OHYckRnuqyNrVe4gurSE2rAkRS8k9/90I3RjujWbI93yanp5aJAcl dP9bZfiwKwMAAHgEr7zn0Rj+ZyGMhKmtY6uOraJsUYiJwdeHK9mLflX0FMSVpa2SL0PZ X7SF8PKwlRxDr/fx0t8xFT5yElq+bx0InscGrJMVIBx9z4Lq5d2519JXrOuCyvhzJZfx r3uV7MHqu9vhAfoThQQu4E3YMntW5zlNaaRrfQn+qkWa6nQMjuvt4EZveInXEbY/NC9u za0Mf/xXBZIKDK0WQD/NY7TlcV1YiGijFmtgOfFmqVRfI0BqdCpXCdNmcfPiSVb8aYjL pTow== 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id df10si8018edb.1.2020.01.28.14.06.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jan 2020 14:06:14 -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; 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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id 00SM6DI2016176 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 28 Jan 2020 23:06:14 +0100 Received: from [167.87.0.234] ([167.87.0.234]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 00SM6Dj0021325; Tue, 28 Jan 2020 23:06:13 +0100 Subject: Re: [PATCH v2 06/13] meta-isar: Clean up qemu multiconfigs To: Henning Schild Cc: isar-users References: <9121cb5ca6c0601fb1722315f30a80b93dbffe42.1578904098.git.jan.kiszka@siemens.com> <20200128225152.76cefe74@md1za8fc.ad001.siemens.net> From: Jan Kiszka Message-ID: Date: Tue, 28 Jan 2020 23:06:12 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <20200128225152.76cefe74@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: KzWn3weoixno On 28.01.20 22:51, Henning Schild wrote: > Not sure i fully get it but this one seems almost independent of the > risc-v stuff. More like a generic cleanup to be applied before adding > risc-v. Might be worth factoring out for early merge. I think this can be freely moved to an earlier position in the queue. I can try this when sending v3. But it does belong in this context as the later part of series depends on the cleanup. Jan > > Henning > > On Mon, 13 Jan 2020 09:28:11 +0100 > "[ext] Jan Kiszka" wrote: > >> 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. >> >> 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 ------------ 21 files changed, 69 insertions(+), 208 >> 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" > -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux