From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6780366809388285952 X-Received: by 2002:a7b:ce84:: with SMTP id q4mr3376599wmj.57.1580248315930; Tue, 28 Jan 2020 13:51:55 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:ebc5:: with SMTP id v5ls10399211wrn.8.gmail; Tue, 28 Jan 2020 13:51:54 -0800 (PST) X-Google-Smtp-Source: APXvYqw/sVSQRwg3o4w4ycQLqL7QwjGHF5LUtbMoROk/z+Cuf92sURiu03tTI7NLrLtMXj75tfuH X-Received: by 2002:a5d:5704:: with SMTP id a4mr32965180wrv.198.1580248314618; Tue, 28 Jan 2020 13:51:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580248314; cv=none; d=google.com; s=arc-20160816; b=so+6mSMZdhLhRoCOBLCFujAbfXqbuzH/eF3WNkltztrZ1PMNkV47bsoM4cvwlLWSpE VjSCFFReeSNwn2V4FMqCauRMCmD+Cqw3sSU3NY/Gdm2AFZn4sO4wncq18hYDlk8MMRvW v9jeLRyLsrjaiEp/w4YICaMGaMo4k9wuJ9X+aKvDtiiiixGikn9I364fwmjua2+VLvXz Ja5kbseEE5MmMt8GHcL75CqCyraZ5cBrFIrp7Ce7xSvyPmpl6cNTk0txOnFFPK0vh20A G7iYyftX4warnHNR5ATGNtRa+vaRmZgrx3hKnwq83gDmnMl+YnSNBr/tqGjD2dIE71y9 mSdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=5jo6RGa4a+ZPl4+Fqtu5Yr2FqWp6kxjQzrDBXtw0sqw=; b=Xm8yXYTgix69ORQZ2v2x6Nqo8OQiCg0ds8/t+BxLdDIQwaKSyIAFOMS0VJtw6zod/w kUuejI6KZBBTJa7D/9USar0gnOGwswlItxeFmR2dtFwfJx7TauOzmoKq+M3G8+CgT1nF tUz5hWe0wwz+mRNXKcg0e8nlWYL/Z8ZZMTvdh4XwzBW7DqZUjGPmEqltZzTAQITEpxib TF9GykTpBbCyNWEHukO0TKITjRnqggKLNz/I5nLqcuGAhQIHQmNlXiaVWBevIkzwv3wF Keulw3DGnixK51u8BrRh9GXYuBcnST+mjUzp02iqd3oC0SuSAcWt2KBP3RJmMXtpfMq2 Xsfw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id u9si1392wri.3.2020.01.28.13.51.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jan 2020 13:51:54 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 00SLps2W028343 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 28 Jan 2020 22:51:54 +0100 Received: from md1za8fc.ad001.siemens.net ([167.87.4.201]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 00SLprtC008478; Tue, 28 Jan 2020 22:51:53 +0100 Date: Tue, 28 Jan 2020 22:51:52 +0100 From: Henning Schild To: "[ext] Jan Kiszka" Cc: isar-users Subject: Re: [PATCH v2 06/13] meta-isar: Clean up qemu multiconfigs Message-ID: <20200128225152.76cefe74@md1za8fc.ad001.siemens.net> In-Reply-To: <9121cb5ca6c0601fb1722315f30a80b93dbffe42.1578904098.git.jan.kiszka@siemens.com> References: <9121cb5ca6c0601fb1722315f30a80b93dbffe42.1578904098.git.jan.kiszka@siemens.com> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: fr3p5/kOfYwu 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. 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"