From patchwork Thu Nov 14 13:48:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3926 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 14 Nov 2024 14:48:47 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f55.google.com (mail-wm1-f55.google.com [209.85.128.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4AEDmlIM001990 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 14 Nov 2024 14:48:47 +0100 Received: by mail-wm1-f55.google.com with SMTP id 5b1f17b1804b1-4315af466d9sf4764555e9.3 for ; Thu, 14 Nov 2024 05:48:47 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1731592122; cv=pass; d=google.com; s=arc-20240605; b=k+JOr70itc4IdjEdlXVsrENhCkp+eaH+g4TqTCG36Mgcr6EdpkLifCvc9CDy/WyiB0 JG7t/XjsI/UbeKrlFPrW+UgMXujVyVltdKcDmCo5jz8PMOqYriFG9V8sll9Rii3uU241 MnhO9Nls16PP0gd7sB+VMuyhchfazCqlpV9HdoFSdyMjhGHB74oxEEwriUAixZL/oxM1 g43VXjLkLxSWkDq8+9EH2vFr5BhUtvzFwLD7NuOCsC/wasbLZHGKBZ8OyDAxEYMOPHaD AfpvtAaOd7c4sLo2oxpDYLDrAWKdUwi4dUGH0AuEOzVVJ5bWXsH1X30+tS8jtA+VMR7J lE4A== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=9ZjxrdXhXYg4Fla5vGRNgLsOE5+DPfkNynhoaANz+2Y=; fh=m2wqs115cTA25kl9615+TH09V67ELhwBxBLAkYzcM68=; b=DLboKGDixpkj+87z4xlLxIMfZp9M6hswX8zFh8P9+YGdm8BlZEwYdcZGxA9ZUslGFb SG+xxwIMHLX1HTeW8l9UL5X82kYnYdluMxgOH8g5+u8hyjpuZM8HFHvXYiiloy8u/VoM 3MtGQpBl0r+RxIP0iEoL1myE8zLr3xGZbISVR/h+lpvulMJkQj+Ac21HACA6Fk7a1zaM iokMqQ2j4VZ647L/SFqSRSWG76QUbA1/JUqMnuI3LfpW0IkCI4E4kGAC/Yw9AOvwCFOH es722ssZEfiBscw/mDaZR3BkrZKHzOcdMnhtxXweGoN6Tk6ZMajhyy30LIiAmcG7md/k z0qA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1731592122; x=1732196922; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=9ZjxrdXhXYg4Fla5vGRNgLsOE5+DPfkNynhoaANz+2Y=; b=VXNvT7iGkMGdhC0MBZRdrlZjausHCSYcI8e3OAtImB1mnnmiJ6nrKvI5koSoPBPRp+ rqA5mb6haNVqGKp9btPpX5KpD8mlTKs9R9fTdxIMc3/F1YNQyiV6RdulvwbBwjIbISxI 1G/1EhPBkXa3l1nkWpaMETmFO5Hep70I76e6KKTVlzY30HkECNMbv4tZKiIJ6DhCj76X yzJNkvpLfG69XEnmS3L2yHbJsQVg1TMs7I0NnA2B9DhqT25NFMqq1arxw7yCtQ9Nqvvd z82n17Us1POvRRcSL1M61p5jngUfeaXIComn6KDqWcSppmoleMHsMqn8gVNagPD8cVmf JI0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731592122; x=1732196922; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=9ZjxrdXhXYg4Fla5vGRNgLsOE5+DPfkNynhoaANz+2Y=; b=MSGgOhBLi9V/CjrPBrYdV46G1BFUfkeX9/bhKnCmEXD+1u/hH7rGqu6lfSMYlP76LF fUEpZO1Odmy4BSY46hFlpjEHDLo8JB30VKH9Iqv0lGbDKTu6hGPsvwWfcMZv0tZ7yxm1 HnDV4pIPgr9fT+DvhEqnT5itDdFsUXmraXHti0XRyhMNuzABwTNxcd3iUIQKV+sp/NKA qFaCmSUnc+BU6yoF9xmNKrSmvYGjeZGZ0077uN6DScaoaSpQQbm6K0/4QUe/dpmulE4v Ij55lHAqEeQCJOurK1ou+MI/COQjdH83GFvyp8X7jILYVGOc0RO9nrE20zpVTn1JSFsy wiJw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVKZrcIzHBZ+5hioBBQq3otNWTZwZZNXZ0akVG1nkpSXEq3FHqnyeVnN2XFbyhoaw5dH4XCEu0=@isar-build.org X-Gm-Message-State: AOJu0YxXMVAk3aE4PXEpJuPiAKfQZFkKB+RpYwJbuwiah1da3KmYIHU3 CoP+KNP7k57jKp7u9lpP/qfCH9URESn1Rwuyf6pWYyazfEs1FagZ X-Google-Smtp-Source: AGHT+IE2WkRMnLbtfLTBC/KoXeAkjbkFFx2buffDr2myPZLepl+a2bGcwBf4DHDUxheeMvF4WxzFdw== X-Received: by 2002:a05:6000:1865:b0:37d:5232:a963 with SMTP id ffacd0b85a97d-38218503565mr1564804f8f.14.1731592120944; Thu, 14 Nov 2024 05:48:40 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:9793:0:b0:382:2282:2241 with SMTP id ffacd0b85a97d-382228222fbls26464f8f.1.-pod-prod-06-eu; Thu, 14 Nov 2024 05:48:39 -0800 (PST) X-Received: by 2002:a5d:6c6b:0:b0:37d:4eeb:7375 with SMTP id ffacd0b85a97d-38218502cd3mr1945174f8f.16.1731592118519; Thu, 14 Nov 2024 05:48:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731592118; cv=none; d=google.com; s=arc-20240605; b=Sq2gTV50haDsnZrPh5ZarW8FV4uma7jFPwCFQMyRYvTxSlAoFBbbRGjhdPtwmHEk6v hxKqt9FFHVgM4tuiRfnsUpNhvj1dN++r5i/6N47dR3fLECKuFAoUfUWnVH0ypXj0/fde k5F+R0+8NXbLX7GcF+UuLmfNSy9AT5IoaGclcWMh65xl25//hB6Z3BxyqgJBy1EivfpL SbrmgHYLnyuIpXI17PwoaeDL3+80bw015d29+DWVxzrFM2Hk61CcjmM+gLKJyC3SrmUv CQn3HHpUrS/Y6nUcoaor6WOZZjAGQkwKb/rGUYPS5tN6Y2eOkTv63V2M9yy+iTpCupSY iOQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=hDUXVngmJm1Xrr0pzLv9lsRyz+b00seTh7YfRa+9WKw=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=Q2LG5+BFdfrOzRj3326O71JNex6BmuqE+AfAg9OMD7mPgvIpZqoJsHUp47d2Z3y/fA iFZDFTgGCuHZkAIVCAUqtnBg3Sv1gGbOOiMkpL818xt2IKyHs0DtzVIXumlFNcAUkARF gXEfsIw5KbC6h6r9GSUKpjaJihYkmLxR9kBt3GqiExxlkZCz3Z7qeoT6e2gFbzeOogxe uhfCHVX16rirNV6RfR/DH5dXIEMXS2WS6d7HFWvCbslUiDCeqO0AGl+6CJAOJ1X/J/ok v8yZbPx3tADlP8p+PI6HVV3ATqPWvxGVNWk+l8OrdSvW7rLwzlDGfM6Zg3XNfOkNutkC SRmA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id ffacd0b85a97d-38222b5862csi316f8f.6.2024.11.14.05.48.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Nov 2024 05:48:38 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.promwad.corp ([159.148.83.114]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 4AEDmZRX001949 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 14 Nov 2024 14:48:37 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 2/2] wic: Set default WKS_FILE for non efi targets Date: Thu, 14 Nov 2024 15:48:29 +0200 Message-Id: <20241114134829.1466035-3-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241114134829.1466035-1-amikan@ilbers.de> References: <20241114134829.1466035-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, 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-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= As riscv64 and mipsel are not supported by grub-efi set other default WKS_FILE values for them. Signed-off-by: Anton Mikanovich --- meta-isar/scripts/lib/wic/canned-wks/qemudefault.wks | 5 +++++ meta/classes/imagetypes_wic.bbclass | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 meta-isar/scripts/lib/wic/canned-wks/qemudefault.wks diff --git a/meta-isar/scripts/lib/wic/canned-wks/qemudefault.wks b/meta-isar/scripts/lib/wic/canned-wks/qemudefault.wks new file mode 100644 index 00000000..02a9fdf2 --- /dev/null +++ b/meta-isar/scripts/lib/wic/canned-wks/qemudefault.wks @@ -0,0 +1,5 @@ +# short-description: Create qcow2 image for QEMU machines + +part / --source rootfs --fstype=ext4 --label root --align 4096 --size 4G + +bootloader diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetypes_wic.bbclass index 3b697cdd..0a8d4b4d 100644 --- a/meta/classes/imagetypes_wic.bbclass +++ b/meta/classes/imagetypes_wic.bbclass @@ -8,6 +8,9 @@ USING_WIC = "${@bb.utils.contains('IMAGE_BASETYPES', 'wic', '1', '0', d)}" WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if bb.utils.to_boolean(d.getVar('USING_WIC')) else ''}" WKS_FILE ??= "sdimage-efi" +# grub-efi is incompatible with targets riscv64 and mipsel +WKS_FILE:riscv64 ??= "qemuriscv" +WKS_FILE:mipsel ??= "qemudefault" do_copy_wks_template[file-checksums] += "${WKS_FILE_CHECKSUM}" do_copy_wks_template[vardepsexclude] += "WKS_TEMPLATE_PATH"