From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Sat, 26 Oct 2024 03:55:09 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qt1-f188.google.com (mail-qt1-f188.google.com [209.85.160.188]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 49Q1sq7P026520 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sat, 26 Oct 2024 03:54:58 +0200 Received: by mail-qt1-f188.google.com with SMTP id d75a77b69052e-460b07774a7sf44329131cf.2 for ; Fri, 25 Oct 2024 18:54:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1729907687; cv=pass; d=google.com; s=arc-20240605; b=XiLZMdXWacD4qIYZoHI2F3TkFzIA66m90UL7p7qk8Z9veaGYV+Nu9NRF2hgSTk7jQS u2aynD7nf7FRQ1+KOv9Q4Fhm4PvPXuWL56GZ4k2HVtULNPuEn6kQugmx8pfrH48SnWqE O6K5W4un4fhKkWU/If2qIKgWHP1p2aMoAkPepRJje0gX3KY5C/ZrvUMPyIUDA7SEYnHF q8qPnzsZcfCMZlZfOsG2YbHUUVpmyDdFi8lTO3YUKTE/mE1+I5sHapgc5PprQTJY+xX4 D5ro31yCdUWL3x2J/7xGxKZGT5dIV+kRCN3sGIfNio+ikuXV9Nv+pG1TFUYysPL0iXEG 7v+w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=0gROy81uIswtAKjkmMfoetGp9guDSLKPVco3l7eMWNM=; fh=6vwPxmOyjP3ny0nv7OE7gpulYbNMlvOS0EiIvmbkVxk=; b=GYZTOyAoUQDXKWBtp2OS0HC6zxWaHGmGG/HykstsAyp8YBuPOHC7Ol3DZoV3/fZGhg niGWXNHJyLWR2cd22uDo5YqPYMIlveO1a12uZlA27Ucj/whTaxaCzuPy/1LctCN+LWEw eqpUY6V6AgmuGvsuJjZzHuATojpSHszultHnK863FMtegkD6SkWY/tHDpTTfJb/h+J4d L+bFkc3s+wJtqBmExyUO0q+F02LxtDk63pcHH3I+9eb5IJ98b54ilUppUfJcUq0qKtAv +uKZ8Wx+XT3J9RwIYXBOrv3WDlHX4Qv5Yxbrx6ua3+okQGj4Uoj03VmXYQztfPusnjvd GNxg==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=DiV6Bmq1; spf=pass (google.com: domain of fm-1324425-20241026015444429919ba7c30ca682e-qukvsq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1324425-20241026015444429919ba7c30ca682e-QUkVSq@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1729907687; x=1730512487; darn=ilbers.de; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=0gROy81uIswtAKjkmMfoetGp9guDSLKPVco3l7eMWNM=; b=NuiNXW1zhMfk8tLK03r1FaUnpfY91C/QlppcnzEIKWPWfG5xbTmEAMnkkLaQgrnHms qDuAv8CI9LmucjC19WyPalxbJnieUfB25T3BMdU+izjRN8njuryWQln4Y6EO9Fv3uGy4 wcKXyqib64oALt4YVVxzfN6SItYjKpWTJykslG88TLAav3GWeqnHvcXEgFlm0SqX+/kQ 0b5TV7plv2X5FfJXph8BGyEe9q3cMJrZvM7MAvGw++JkaNjEzRC3Va+4I994L6bTzQ3Z cXY/Cesc50aRqxnF5kysnPvcrvn9FBxZpo5lsNLvUw9yTtIvOVhSRrgnsxPbaPRIXd/v 7cOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729907687; x=1730512487; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=0gROy81uIswtAKjkmMfoetGp9guDSLKPVco3l7eMWNM=; b=Ip4r/vGhvUKTnwSTcmwf8RLSbUcmtZhwTRhDy+Yzu2bfflVUpPMgEM57ADrigfzA8c VC5hOPVDK27uUoYw4Pexmlq2ZuJD63tg15hwefSUsgs/fBsiv0ARRSENu+FZehht/5iR r67ZwLUvrTf38v9Wu2qmABchOFk9ZoIlCb/JN4vLRPtc5PBuZ37+HibBAChBZGpceLQL CycO0Y1+JZqZlsdnGJwd/6ZfHsFMDDCPSfCwybcHNiopn6S3NgXIgGqHV7z3WUHklI9W sO59sY95GkH5ICMXkpfUmkz8Bkc3ev8dJt9VDXS4Y/40tqxVYMFh/fTUyxSA4enDLAt/ eQ7w== X-Forwarded-Encrypted: i=2; AJvYcCXpwYAC02ycgODfJ0XwIRqRYU38qPTSO86h45B0ep9R/bKH+hPyTxZqgN/9qrPsC8PdqNfh@ilbers.de X-Gm-Message-State: AOJu0YzncQ43DcsBADTh0YC6yQ8m2XcTRxwCZ/HDh4nPb4FEclj4NPyu /OXznF34hq+spnfrniIzKf//VeVKaGvxi4UDXp/gb+O+YVqyul3q X-Google-Smtp-Source: AGHT+IEFq8hZKp0HkLpZYNx9a28Bq0xVpueFpruxBqUQd0u8Q49WdwMJJmOpCojqRj1rUVFBmrwTow== X-Received: by 2002:ac8:5790:0:b0:460:ff33:9141 with SMTP id d75a77b69052e-4613bffcaf3mr17853731cf.15.1729907687360; Fri, 25 Oct 2024 18:54:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:622a:1928:b0:461:2c82:a2ae with SMTP id d75a77b69052e-4612c82b29als30506071cf.0.-pod-prod-01-us; Fri, 25 Oct 2024 18:54:46 -0700 (PDT) X-Received: by 2002:a05:620a:2a0d:b0:7b1:52a0:48eb with SMTP id af79cd13be357-7b193ef403dmr238732685a.22.1729907686291; Fri, 25 Oct 2024 18:54:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729907686; cv=none; d=google.com; s=arc-20240605; b=ZefXH4i2R8vr9a6VoeBMw2paOo6vB2bSDx+kEElY5AuiDo1BwMB8uWPa64Jy4fWtkr 22+Slaoart2mnWJwLea3xGEKNPM4NKvCgnXT3/vsENcM1s4INJH1WR5vc+NIjiVTLk7U 8/aePBgF0KPQWeQFRauV5yQZif92s5N3C8YEYbUhavjnNcYdWU2bfM2OEgqAaEWEyK7Q S5Lx2AYG8D6gEpG0k2hB9AZT861XM+vjrJLGKujfp8WN27OQR9BP7TF1O/4ArRjL22+x vP6cqh+7YuxCSt4RFPmfY2cAu7Hs1eOt8gExyBDfoJe4TtR/5lcJpbSNoGaA4mhGpwZb d5zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=bJOxi3GGeUowQAb5/ztKQg9xOQea5Lc9n8thfI0vsyg=; fh=qEmUv7UYYyWiUby6ri6URwndIAhlHli3YTKYU6E217s=; b=jtcHNVW7/uwbRMIYsq4He0tjXNKKs2Fuha0SSVzIm9bHQGXKLHpaUHbRZqjsT+0Qxe pTf3u9xch1NqqNWd6rhK9oJu1B/9DlcS1UaPxIjmEq6YP0xrdII5W4CoQnyRAova3rqt vVHC994mSqrm0B5n5I0+KgHHdK1d3UQ0vIjWFdZz9ycIZ8jBLBkm8w2ORJo4S/hA8M6M lliq0N8L3csx+E8LklRDHDfEUtL4ehjC7N6Vd44Qs+9s1W/69QL/HKXwWUUVRQw8Yrsk IZlwnGrajnbUwdrr4YoB6QFAWwYGdyUXeqxeNWFGymFJ7mDJhoBwY3KdeHazRz3F9juF ckSw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=DiV6Bmq1; spf=pass (google.com: domain of fm-1324425-20241026015444429919ba7c30ca682e-qukvsq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1324425-20241026015444429919ba7c30ca682e-QUkVSq@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id af79cd13be357-7b18d282dadsi10329085a.2.2024.10.25.18.54.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Oct 2024 18:54:46 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1324425-20241026015444429919ba7c30ca682e-qukvsq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20241026015444429919ba7c30ca682e for ; Sat, 26 Oct 2024 03:54:44 +0200 From: "srinuvasan.a via isar-users" To: isar-users@googlegroups.com Cc: cedric.hombourger@siemens.com, jan.kiszka@siemens.com, ubely@ilbers.de, srinuvasan Subject: [PATCH v4 1/2] add new machine qemuamd64-cip and corresponding mc Date: Sat, 26 Oct 2024 07:25:49 +0530 Message-Id: <20241026015550.1419162-1-srinuvasan.a@siemens.com> In-Reply-To: <19e24d8e7b06465b0553cb95f2985b91466b220d.camel@ilbers.de> References: <19e24d8e7b06465b0553cb95f2985b91466b220d.camel@ilbers.de> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1324425:519-21489:flowmailer X-Original-Sender: srinuvasan.a@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=DiV6Bmq1; spf=pass (google.com: domain of fm-1324425-20241026015444429919ba7c30ca682e-qukvsq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1324425-20241026015444429919ba7c30ca682e-QUkVSq@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: srinuvasan.a@siemens.com Reply-To: srinuvasan.a@siemens.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: oHCwEO4yyVgs From: srinuvasan The newly added machine qemuamd64-cip provides to build the kernel from the cip git repository, this would be helpful to demonstrate the kernel built from git repo rather than tarball. Moreover, these changes needed to demonstrate the support of CONFIG_LOCALVERSION_AUTO. in defconfig to automatically append the version in kernelrelease. We chose this git repo method because the repository should contain the.git folder to get the latet HEAD revision to append into the kernel release. Note: The qemuamd64 machine no longer depends on the cip kernel, use qemuamd64-cip machine to build the images with cip-kernel and updated the KERNEL_DEFCONFIG accordingly. Signed-off-by: srinuvasan --- kas/machine/Kconfig | 5 +++++ kas/machine/qemuamd64-cip.yaml | 9 +++++++++ meta-isar/conf/machine/qemuamd64-cip.conf | 8 ++++++++ meta-isar/conf/mc.conf | 1 + meta-isar/conf/multiconfig/qemuamd64-cip-bookworm.conf | 4 ++++ .../recipes-kernel/linux/linux-cip_4.4.166-cip29.bb | 4 ++-- testsuite/start_vm.py | 2 +- 7 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 kas/machine/qemuamd64-cip.yaml create mode 100644 meta-isar/conf/machine/qemuamd64-cip.conf create mode 100644 meta-isar/conf/multiconfig/qemuamd64-cip-bookworm.conf diff --git a/kas/machine/Kconfig b/kas/machine/Kconfig index 4c3866a2..c3b568df 100644 --- a/kas/machine/Kconfig +++ b/kas/machine/Kconfig @@ -46,6 +46,10 @@ config MACHINE_PHYBOARD_MIRA bool "phyboard-mira" depends on DEBIAN_BULLSEYE || DEBIAN_BOOKWORM +config MACHINE_QEMU_AMD64_CIP + bool "qemuamd64-cip" + depends on DEBIAN_BOOKWORM + config MACHINE_QEMU_AMD64_SB bool "qemuamd64-sb" depends on DEBIAN_BULLSEYE @@ -126,6 +130,7 @@ config KAS_INCLUDE_MACHINE default "kas/machine/nanopi-neo.yaml" if MACHINE_NANOPI_NEO default "kas/machine/nanopi-neo-efi.yaml" if MACHINE_NANOPI_NEO_EFI default "kas/machine/phyboard-mira.yaml" if MACHINE_PHYBOARD_MIRA + default "kas/machine/qemuamd64-cip.yaml" if MACHINE_QEMU_AMD64_CIP default "kas/machine/qemuamd64-sb.yaml" if MACHINE_QEMU_AMD64_SB default "kas/machine/qemuamd64.yaml" if MACHINE_QEMU_AMD64 default "kas/machine/qemuarm.yaml" if MACHINE_QEMU_ARM diff --git a/kas/machine/qemuamd64-cip.yaml b/kas/machine/qemuamd64-cip.yaml new file mode 100644 index 00000000..d99cb4a6 --- /dev/null +++ b/kas/machine/qemuamd64-cip.yaml @@ -0,0 +1,9 @@ +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2024 +# +# SPDX-License-Identifier: MIT + +header: + version: 14 + +machine: qemuamd64-cip diff --git a/meta-isar/conf/machine/qemuamd64-cip.conf b/meta-isar/conf/machine/qemuamd64-cip.conf new file mode 100644 index 00000000..50897ddc --- /dev/null +++ b/meta-isar/conf/machine/qemuamd64-cip.conf @@ -0,0 +1,8 @@ +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2024 +# +# SPDX-License-Identifier: MIT + +include conf/machine/qemuamd64.conf + +KERNEL_NAME = "cip" 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 visit https://groups.google.com/d/msgid/isar-users/20241026015550.1419162-1-srinuvasan.a%40siemens.com.