[PATCH v2 1/2] add new machine qemuamd64-cip and corresponding mc

["srinuvasan.a via isar-users" <isar-users@googlegroups.com>]

From: srinuvasan <srinuvasan.a@siemens.com>

The newly added machine qemuamd64-cip provides to build the
kernel from cip git repository, this would be helpul to demonstrate
the kernel build from git repo rather than tarball.

Moreover this changes needed to demonstrate the support of CONFIG_LOCALVERSION_AUTO
in defconfig to automatically append the version in kernelrelease.

We chooses this git repo method becuase the repository should contain
the .git folder to get the latet HEAD revison to append into the kernelrelease.

Signed-off-by: srinuvasan <srinuvasan.a@siemens.com>
---
 meta-isar/conf/machine/qemuamd64-cip.conf     | 20 +++++++++++++++++++
 meta-isar/conf/mc.conf                        |  1 +
 .../multiconfig/qemuamd64-cip-bookworm.conf   |  4 ++++
 .../linux/linux-cip_4.4.166-cip29.bb          |  4 ++--
 testsuite/start_vm.py                         |  2 +-
 5 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 meta-isar/conf/machine/qemuamd64-cip.conf
 create mode 100644 meta-isar/conf/multiconfig/qemuamd64-cip-bookworm.conf

diff --git a/meta-isar/conf/machine/qemuamd64-cip.conf b/meta-isar/conf/machine/qemuamd64-cip.conf
new file mode 100644
index 00000000..e1a63fa4
--- /dev/null
+++ b/meta-isar/conf/machine/qemuamd64-cip.conf
@@ -0,0 +1,20 @@
+# This software is a part of ISAR.
+# Copyright (c) Siemens AG, 2024
+#
+# SPDX-License-Identifier: MIT
+
+DISTRO_ARCH ?= "amd64"
+
+KERNEL_NAME ?= "cip"
+
+IMAGE_FSTYPES ?= "wic"
+WKS_FILE ?= "sdimage-efi"
+IMAGER_INSTALL:wic += "${GRUB_BOOTLOADER_INSTALL}"
+
+QEMU_ARCH ?= "x86_64"
+QEMU_MACHINE ?= "q35"
+QEMU_CPU ?= ""
+QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE## -bios /usr/share/ovmf/OVMF.fd"
+
+MACHINE_SERIAL ?= "ttyS0"
+BAUDRATE_TTY ?= "115200"
diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf
index 212d3e4d..2a7b69f3 100644
--- a/meta-isar/conf/mc.conf
+++ b/meta-isar/conf/mc.conf
@@ -21,6 +21,7 @@ BBMULTICONFIG = " \
     qemuamd64-bullseye \
     qemuamd64-sb-bullseye \
     qemuamd64-bookworm \
+    qemuamd64-cip-bookworm \
     qemuamd64-trixie \
     container-amd64-buster \
     container-amd64-bullseye \
diff --git a/meta-isar/conf/multiconfig/qemuamd64-cip-bookworm.conf b/meta-isar/conf/multiconfig/qemuamd64-cip-bookworm.conf
new file mode 100644
index 00000000..a6eaedd0
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuamd64-cip-bookworm.conf
@@ -0,0 +1,4 @@
+# This software is a part of ISAR.
+
+MACHINE ?= "qemuamd64-cip"
+DISTRO ?= "debian-bookworm"
diff --git a/meta-isar/recipes-kernel/linux/linux-cip_4.4.166-cip29.bb b/meta-isar/recipes-kernel/linux/linux-cip_4.4.166-cip29.bb
index 4e8fc08a..873ca7b0 100644
--- a/meta-isar/recipes-kernel/linux/linux-cip_4.4.166-cip29.bb
+++ b/meta-isar/recipes-kernel/linux/linux-cip_4.4.166-cip29.bb
@@ -1,7 +1,7 @@
 # Example recipe for building the CIP 4.4 kernel
 #
 # This software is a part of ISAR.
-# Copyright (c) Siemens AG, 2018
+# Copyright (c) Siemens AG, 2024
 #
 # SPDX-License-Identifier: MIT
 
@@ -13,4 +13,4 @@ SRC_URI += " \
 
 SRCREV = "af3adf9f9c633ac0e1d68487d7fad22285dda8a3"
 
-KERNEL_DEFCONFIG:qemuamd64 = "x86_64_defconfig"
+KERNEL_DEFCONFIG:qemuamd64-cip = "x86_64_defconfig"
diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py
index 2c986344..76814ee3 100755
--- a/testsuite/start_vm.py
+++ b/testsuite/start_vm.py
@@ -148,7 +148,7 @@ def start_qemu(arch, build, distro, image, out, pid, enforce_pcbios):
 
 def parse_args():
     parser = argparse.ArgumentParser()
-    arch_names = ['arm', 'arm64', 'amd64', 'amd64-sb', 'i386', 'mipsel']
+    arch_names = ['arm', 'arm64', 'amd64', 'amd64-sb', 'amd64-cip', 'i386', 'mipsel']
     distro_names = [
         'buster',
         'bullseye',
-- 
2.39.5

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/20241023125307.1402533-1-srinuvasan.a%40siemens.com.