From patchwork Thu Jan 23 09:52:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 4026 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 23 Jan 2025 10:53:10 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f63.google.com (mail-lf1-f63.google.com [209.85.167.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 50N9r9ke006501 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 23 Jan 2025 10:53:09 +0100 Received: by mail-lf1-f63.google.com with SMTP id 2adb3069b0e04-5401af85378sf352259e87.2 for ; Thu, 23 Jan 2025 01:53:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1737625984; cv=pass; d=google.com; s=arc-20240605; b=bFhk08yDIGxlCaSfEw/3F1lr8p+lLLLQJ09/eiCWzzmfsa5MPRu/KcSUlEGvqbt81b VlqzeA++4xFMjiTR6Jj03SLCC/41O+Ui50EMqHaNqnasDPXKkaO/HmkH0xYynizHP/cv P/D/+IXqbHZXRWoLUJX12wB8I7FqsNThFf/iTkh9Ch2vJoUlospnGKQQYloKmnG6SY8O 1nw8SSD8D53GhMywtwRW2bm9Qkr9gKV4G05jYgnXpiRHweiOpS5QzMFqA+G8L18wr0SU 6UESSZz85Bpy4407gPrZoAE2UOBxyq3Z/yOP+fUbAn0xw3+H7f+qXZpI5c5+c3QdAUZu AQcw== 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=fY1WL1y8M52Dsx/vKROPiowcPjRzdoHB/mxP1JIgsEs=; fh=IMzMp6AQkM37DD87oGtVXJSm5uQBFt0Ojj1eYqPC45k=; b=DubVKkFD+1r4SR/FS+hnZ0bpgtZNsm14mj+ahTh2BjcprAUJJsQiMLM1ANhjDjVOrl kPrDCgs2achPRz+2Mc/72oA+odl4CAZS4imk1awZ3QM3U1f4qfGHhEeMKg8tyXccwjbb AjmsgHJTm7+bAAV2d5bbSKi1etsmKMsk+EvNthxSDwEvlZ5tnX5Fxj5T0b7I+hYZXrVC g2wfgC9IbqV+diWtq0tj/vsj9arpKfr3k0AAITeW/b5Zm9TiR56e0Y1aC3gS/TK8n2Wa tL2pbg0Y/LU7zhCV4M3HLAhjUHvcB02XilFArgLf0JWjuIlK0qJmss/zYjGqXxyREL4N uvwA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=AInjv8DA; spf=pass (google.com: domain of fm-1321639-20250123095300de95cb9b0d2313aef1-atzwx5@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1321639-20250123095300de95cb9b0d2313aef1-AtzWx5@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=1737625984; x=1738230784; darn=isar-build.org; 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=fY1WL1y8M52Dsx/vKROPiowcPjRzdoHB/mxP1JIgsEs=; b=FEnOrlh8XSk2a7ulE1PCxE3N911mLkWKuvwOUdvATfQCilMVCL3vOxnJLptNuNQD1r gcXrGg/lp/HMMcBrp95uVSd2mNfSfl8wFJywrcyTWf+z6VKFF2T93kK55RxI1w4GGr8n RaVqr5P+KsfT2UwjwJ++DZ5uJfknoi5yTF9ijoaIm1r9Ap6NFijJa8J5snO03Iy+ZLu6 bWihQBriFPFHnMH5k/UeSFz3EFaGj8cc/IrVtxKK4JQATn211vwK6nCMiiu5XGuFBR51 zKDWIB8a16bXxRMH9Rj0ZaDvYw4H7cN/nL42jTPHcqk1/Jw8uYCR6TwQso+S+s1wTn7p ZQjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737625984; x=1738230784; 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=fY1WL1y8M52Dsx/vKROPiowcPjRzdoHB/mxP1JIgsEs=; b=LnUSCtRpHGfX+Rkf+0mhIEqhHlmZ0DclOf6R0wIXyewd9whO45ymlFEBDND/Q1a/Td 89xh2GG7OXqt9sZjbU/OLy1BbUFPKrd0UToqKxXEeXBYOsoEtN+Sul85IUYoxUX/FwAI 5i/4sq7H93uuFwfAwWL1jUXIQLJPlDoAHHbJcxqcWZZLp7CpWnqwU88wdS+oz7VWaVDN iKduL9rYePlTKj/PLrjErOEfcPrFirl7OfKT48/nysHC6lCG+X5VkN4k9x6rxU9W5OIu e2kjdxCOKzWPhtF3mgJkXTGixs5rf6FAqmny5yt1OLlNa+KjcaYvjSDn7XYiEOhJJfZN dO7Q== X-Forwarded-Encrypted: i=2; AJvYcCXlQm0o4tGyD1OSfn+K4moz9UK6MspM8CaEzfIwE3jn0silG1QvFRBu1mg3GqKUTB51h/0t/y0=@isar-build.org X-Gm-Message-State: AOJu0YykshcnWppzPm0MvIgGrRtwWc5HZV1RyCVB7A5Hwb3pT0UOjGvk F2TDDLzvHU9/XJJY6jzDTbkZuH9NbNyEV6P6ESLjydSVMtkIp4el X-Google-Smtp-Source: AGHT+IG4cSl7eKU77HRMba6YcfZSdIBK3Vqm3QrSouq9JjT/RthKsX16HMDGUUTMd7T1oHRfcaTX5g== X-Received: by 2002:a05:6512:1183:b0:543:c3d9:418d with SMTP id 2adb3069b0e04-543c3d944damr545175e87.22.1737625983423; Thu, 23 Jan 2025 01:53:03 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:5e5a:0:b0:540:c34b:91f6 with SMTP id 2adb3069b0e04-543c24906bdls47279e87.1.-pod-prod-05-eu; Thu, 23 Jan 2025 01:53:01 -0800 (PST) X-Received: by 2002:a05:6512:3d0:b0:542:6d01:f548 with SMTP id 2adb3069b0e04-5439c22d6bamr7493380e87.5.1737625980715; Thu, 23 Jan 2025 01:53:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1737625980; cv=none; d=google.com; s=arc-20240605; b=G/3yaT6DJ/GDc5bBhNcuhoAnp2fI1ZDG7vS4aXPdbnnAzjc335FK8yU/3D7RmOmIXr 37xMFRyhKFyTZg4w85oB16n31Bo0C/uE/BI/86eqaJIpr+YySbXUrzmzWm5AKC9k6fMV koiuFm+CTjNrR3nuwJWNJ4UAiutQQIt56m4arSr9MMy55Ejkw3yxjhT6HIaQpTkN3CM0 LQPLsy8fSkJA8oVDRxuGVUKfqCYbGD+67chkYR/dmHa6pp5bMt00fBWothQPTqp/hmVK AappiD4VIu6k+0A7yvSETwvUhB1G9TPM5ggEDF8MmbzbR1a+nc2H0sC3hzD9XvItasXV NtvA== 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=5+mRsQ30tArOta7g1abganrPaHw3ykKskv9WoL3h55s=; fh=Bo8ZbdhPy/JbmTSxHxcgeG9JPAXIanSEMBVfErZw+70=; b=Sr47sZd0vnK38LM5h9Yw4tKQeFdK1atPDmrk40ASTM/aROLGVXwi1z3qi9ew27MGSn 4uEk2YxH0hNd/j94SjYB1KSGZELKQslVhE/j1yHGrOBIV14sNBgIY6PNLe3wbRTHILuK ppN/sckKkSuaKam7UDBGf4L1Ggs2qBiJk+sHm5pssXk1JYnC3s0AnHN9Bl1ai577o2ia uRY4xETFSxFtIlcL6sWfkRmsj/HeqnHRUiVRyHY+j7U8OiWPszsFvgGDkMxCyvWm7GG5 jx6KQbnGSXTloShvQ3WnH+Kvwl99d4srLtvKTWi1eD1GVKqmAkEZOTA0kWtn+MUIMSgh +Avg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=AInjv8DA; spf=pass (google.com: domain of fm-1321639-20250123095300de95cb9b0d2313aef1-atzwx5@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1321639-20250123095300de95cb9b0d2313aef1-AtzWx5@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-5439af0e771si110435e87.4.2025.01.23.01.53.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Jan 2025 01:53:00 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1321639-20250123095300de95cb9b0d2313aef1-atzwx5@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20250123095300de95cb9b0d2313aef1 for ; Thu, 23 Jan 2025 10:53:00 +0100 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: Felix Moessbauer To: isar-users@googlegroups.com Cc: clara.kowalsky@siemens.com, florian.bezdeka@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH v2 4/7] add qemuamd64 target for hybrid iso9660 image Date: Thu, 23 Jan 2025 10:52:20 +0100 Message-Id: <20250123095223.2928575-5-felix.moessbauer@siemens.com> In-Reply-To: <20250123095223.2928575-1-felix.moessbauer@siemens.com> References: <20250123095223.2928575-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1321639:519-21489:flowmailer X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=AInjv8DA; spf=pass (google.com: domain of fm-1321639-20250123095300de95cb9b0d2313aef1-atzwx5@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1321639-20250123095300de95cb9b0d2313aef1-AtzWx5@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Felix Moessbauer Reply-To: Felix Moessbauer 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_H2,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Signed-off-by: Felix Moessbauer --- meta-isar/conf/machine/qemuamd64-iso.conf | 29 +++++++++++++++++++ meta-isar/conf/mc.conf | 1 + .../multiconfig/qemuamd64-iso-bookworm.conf | 4 +++ .../lib/wic/canned-wks/isohybrid-efi.wks.in | 2 ++ 4 files changed, 36 insertions(+) create mode 100644 meta-isar/conf/machine/qemuamd64-iso.conf create mode 100644 meta-isar/conf/multiconfig/qemuamd64-iso-bookworm.conf create mode 100644 meta-isar/scripts/lib/wic/canned-wks/isohybrid-efi.wks.in diff --git a/meta-isar/conf/machine/qemuamd64-iso.conf b/meta-isar/conf/machine/qemuamd64-iso.conf new file mode 100644 index 00000000..36cbdf54 --- /dev/null +++ b/meta-isar/conf/machine/qemuamd64-iso.conf @@ -0,0 +1,29 @@ +# This software is a part of ISAR. +# Copyright (C) 2025 Siemens AG + +DISTRO_ARCH ?= "amd64" + +KERNEL_NAME ?= "amd64" + +IMAGE_FSTYPES ?= "wic" +WKS_FILE ?= "isohybrid-efi.wks.in" +IMAGER_INSTALL:wic += " \ + ${GRUB_BOOTLOADER_INSTALL} \ + ${SYSLINUX_BOOTLOADER_INSTALL} \ + syslinux-utils \ + isolinux \ + xorriso \ +" + +IMAGE_PREINSTALL += "live-boot" +IMAGE_INSTALL:remove = "expand-on-first-boot" +IMAGE_TYPEDEP:wic += "squashfs" +SQUASHFS_EXCLUDE_DIRS = "boot" + +QEMU_ARCH ?= "x86_64" +QEMU_MACHINE ?= "q35" +QEMU_CPU ?= "" +QEMU_DISK_ARGS ?= "-cdrom ##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 2a7b69f3..7c190b67 100644 --- a/meta-isar/conf/mc.conf +++ b/meta-isar/conf/mc.conf @@ -22,6 +22,7 @@ BBMULTICONFIG = " \ qemuamd64-sb-bullseye \ qemuamd64-bookworm \ qemuamd64-cip-bookworm \ + qemuamd64-iso-bookworm \ qemuamd64-trixie \ container-amd64-buster \ container-amd64-bullseye \ diff --git a/meta-isar/conf/multiconfig/qemuamd64-iso-bookworm.conf b/meta-isar/conf/multiconfig/qemuamd64-iso-bookworm.conf new file mode 100644 index 00000000..a2597131 --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuamd64-iso-bookworm.conf @@ -0,0 +1,4 @@ +# This software is a part of ISAR. + +MACHINE ?= "qemuamd64-iso" +DISTRO ?= "debian-bookworm" diff --git a/meta-isar/scripts/lib/wic/canned-wks/isohybrid-efi.wks.in b/meta-isar/scripts/lib/wic/canned-wks/isohybrid-efi.wks.in new file mode 100644 index 00000000..514f756c --- /dev/null +++ b/meta-isar/scripts/lib/wic/canned-wks/isohybrid-efi.wks.in @@ -0,0 +1,2 @@ +part /boot --source isoimage-isohybrid-isar --sourceparams="loader=grub-efi,payload=${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.squashfs" --ondisk cd --label LIVECD +bootloader --timeout=10 --append "console=ttyS0,115200 console=tty0 boot=live toram=${IMAGE_FULLNAME}.squashfs"