From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6780366809388285952 X-Received: by 2002:a05:6000:160d:: with SMTP id u13mr17511019wrb.22.1578904101488; Mon, 13 Jan 2020 00:28:21 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:3c43:: with SMTP id j64ls5758411wma.5.gmail; Mon, 13 Jan 2020 00:28:20 -0800 (PST) X-Google-Smtp-Source: APXvYqziH+2JB8r6GJR/CrFKLA796dJueVYsaM2X63YBNyD7JAVhhNSs590AIsZJqvn/O8z5s6ni X-Received: by 2002:a05:600c:20f:: with SMTP id 15mr18782094wmi.128.1578904100804; Mon, 13 Jan 2020 00:28:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1578904100; cv=none; d=google.com; s=arc-20160816; b=LKIhoUk6TTnnSOGWfMPXXM/ula0QcU5VmEPaJ1NsqZH9+Nh60se6HSzGns2XU9KIdj xnNselpls6ORoUD7Xx2mQmgFq06lDF85yfFJ4LhzLoJVvtNQFuTOXeqWE747b2idBXYz rrxoMza3ifR4B2597NrYkFq0KpEUSFVHcvtBQ5NO622r6CeEfQ/J9Tj+rKE1tUTLVcAG SJgaqELAcW4YELddUqjtZLf8kKBeQtuxk4dWcvqUViZttnGjbcSXy55AmxRHnSzQlY8Z iPUYAzmCuVBG/vaQ6g85rIAfbEF6wSYA16+zU9l5KYweb+RdoT4ApadvBaFbKA6irIzb Hj2g== 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=WKwLZDAYF+TdY5pZx/FAjIJgcOD0N6arjwaCQdbsWyk=; b=YgFHHG5yJQCVpXprXDEN6/sQV/MvtHrhrDIm04rv30CTgTN7EPycFm5tP4iAmhSiav 7mAl8lmtkScDnWinX/Fa7//kRMwO+XAOd3qUHg2dUES9EkkdGEJ89jlPTRQC5dRT6LeU p7BK++rLfdv0COBNytfFf5FBSj/dw9gQaSeQl84cGDL2OeqXV8QHEFEOPEJ4LhCgHiBD rNGVwYwm70LDIXYhAh+X9EP6yuTIuzPqezUGPexcRE0/JHTr4e/FFHjxPLTEqcj4h4HS 3OLhUJwPbUlrIbq1ADqTZyTN5gTjnLtUoWhJD1eD503ElA6VLsnEKz+IjuJUsQFrznNf Zfcw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id b9si523298wrw.2.2020.01.13.00.28.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Jan 2020 00:28:20 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 00D8SKJg023792 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 13 Jan 2020 09:28:20 +0100 Received: from md1f2u6c.ad001.siemens.net ([139.23.72.137]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 00D8SKJg000789 for ; Mon, 13 Jan 2020 09:28:20 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH v2 06/13] meta-isar: Clean up qemu multiconfigs Date: Mon, 13 Jan 2020 09:28:11 +0100 Message-Id: <9121cb5ca6c0601fb1722315f30a80b93dbffe42.1578904098.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: bgQaxicxQRW3 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" -- 2.16.4