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; Fri, 17 Jan 2025 14:47:40 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ej1-f63.google.com (mail-ej1-f63.google.com [209.85.218.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 50HDldL3006224 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 17 Jan 2025 14:47:40 +0100 Received: by mail-ej1-f63.google.com with SMTP id a640c23a62f3a-aa67f03ca86sf198600066b.2 for ; Fri, 17 Jan 2025 05:47:40 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1737121654; cv=pass; d=google.com; s=arc-20240605; b=Q8BFRMT6+aUnFaTEy0/icSuNHYGWLdZwMYDRP0/uJORcvhpC+s69uD2t2wQ0xxwlUv kAfFveP0h8PlLTISZE4PJo0YFFmxJFS5YZ1sHBSRB67EqGp57XjaO2GxfQOD6P/W9aU0 z3OJnr2oKDKzPfuljDCWK1Sm5idQ5f11SQvgcG8GM9Jkzk2kMJi8gcpdMc0VayNFiTwy 3/bGvsmqOpoFWHTWc9GX+fyKGY3m43bHFjNOEvpjr3zucLT3YPuFVqsGuEYxnsAjT7ZJ 0IfBC+jJ3yePkCgKgN0VERH272q3rnBNgA15CU9+J+2Luajh742PtBtRaFQXcZbqKFcw 0IcQ== 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:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :sender:dkim-signature; bh=6NbtRYFE+Prn2ISgmco+TNEWtWJ9ECXjj5tH+PKUn8k=; fh=F4DMV2c6MB4O3L2PXxCGfs9iZ8i6vFaNF6N9CD1/Jag=; b=gYgQAwfnq8P2frpXSsb+RubTwexPFHn6M6knvgoF4ICcDXy9PBQHL8Y/ZmheS4OGQw SUPiN8csREWVM01QRzDzL1ogVs+JOK15JpEUAUFvCJZqcaYJUBOKMi9hiCC2aDCJW0xv AToYtLxRuMNSPAxI3E9osrG1pXEz7oxI69lox+f49ikRNwWYZ/kXiUyG7W0A3NoTtazC L1uFpY7FqBij6FEf0i+O1fdNORdVElbxZUtjdr45hvPqXppsDNFArtPO3ohjx3/pBXvC LM+RkDqXkYPUFcgFy+BlnzZBKjn7zCZklvSvTnnP17UcipLAS37V7U1S6usKM2aoQc20 7wBg==; darn=ilbers.de 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=1737121654; x=1737726454; darn=ilbers.de; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:in-reply-to:from:content-language:references:cc :to:subject:user-agent:mime-version:date:message-id:sender:from:to :cc:subject:date:message-id:reply-to; bh=6NbtRYFE+Prn2ISgmco+TNEWtWJ9ECXjj5tH+PKUn8k=; b=WylVuk1KYjGgENvi/p1WzpdgJ1Wnuy8BOw5UQlVShn250EUCsuXRVxHNGWgzU1sR0A GSdPcomIcF9DUQiWcyn/YYP7XgRp71+mdtLraMeprrcla6AolOtj+9YxvQ9jqKbjS9O+ gSvKFSd/uVtoJzyyD2wL3dCN2Iv3SlWy7gI+J4Eo/wBWxDU3JT7HxD25k+3hTiCm5MM/ 1hHIFmkVFD6Ks5AAKB8rBhf0HvyRI3SiGTJK+UbBHnuWmCPTF7HBkHIEqCJuOIV4RRyw Rom51RdoeNAtSgYmrFRHeC6j3vAqZwzeRf9Hy/xz3d8cdCWOAJM1k0rCUrixhPSLTDcq LrEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737121654; x=1737726454; 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:in-reply-to :from:content-language:references:cc:to:subject:user-agent :mime-version:date:message-id:x-beenthere:x-gm-message-state:sender :from:to:cc:subject:date:message-id:reply-to; bh=6NbtRYFE+Prn2ISgmco+TNEWtWJ9ECXjj5tH+PKUn8k=; b=AnxPTS1kKy6XHenjbuxx1Z8hWffGpr4pqc8bMIMxNaro9Km7skh914adflchTXKfgz hECa8Dy+s2YfAT8zOIfn1W0SEYLv/4t+K8f/wnUx25MKo/pOR0brCFEAYtnvN25rwUuj 4zTfk1got8ApfOsuatbeNTUt9y4fOQ8AcpSlgRhp4IC2oZtYhmsNVn4A4SwI8Vp+WpW9 y4qNAMPcpydhLiRf4RayDjIlTwq6YfN+TSD4L7X61Lp7EOht1dRdthIT7sWgzfonWDDp u1zU/vQxeT+gNBuVkeR16Vcq7e19680VmYb2Yu41NWr4wheyy10PhlhjQNBwgZM2194w +Eow== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXuVlZVqWk/Sd1zp0ifJhTrEVvQszD/o5lljTVovRNsLsgYPhww90+QKWu2tnn5CFXOcxK8@ilbers.de X-Gm-Message-State: AOJu0Yw/7Cf80OyUrF9ac3eflfnvyPtBH30gw2Df4IE6HTDWR0utOWTH XwjVceBwKvRHIVRwuOfHyMTUNKU8Osz5tmhX8/2v+UQB0qDj/SAw X-Google-Smtp-Source: AGHT+IH33uepYqtoURAnbKy03vnEQ3Vb6jdJ5HV5+/BFGOFOy4Qj729fEOs84ffbGtomLxU7zSEpoA== X-Received: by 2002:a05:6402:84c:b0:5d0:d818:559d with SMTP id 4fb4d7f45d1cf-5db7d2f5e2amr6693219a12.11.1737121654007; Fri, 17 Jan 2025 05:47:34 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:9e67:0:b0:5d0:e7a4:9762 with SMTP id 4fb4d7f45d1cf-5db622f58f2ls70589a12.2.-pod-prod-05-eu; Fri, 17 Jan 2025 05:47:32 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU6CWseoV2/dGRHWrRerjZF1FWQv9Hm1vXuwTL8fGrv0OoEZ/t+y5gT9tRCabSwsHw1cf9CWV4YA1Jm@googlegroups.com X-Received: by 2002:a05:6402:2706:b0:5d4:2ef7:1c with SMTP id 4fb4d7f45d1cf-5db7db078c2mr5884656a12.24.1737121651647; Fri, 17 Jan 2025 05:47:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1737121651; cv=none; d=google.com; s=arc-20240605; b=gNNOf4JaXFMi4F0+h3yVEmzpOYbG5Vng3sYGkASFcYDQzNFCME/a+oYV/nFTvoUjYc cXy16cQGJuoD885ouy/tWpOzsb/L9Ym5sE8qt9z6Ig56MoeFLPM5Drs31q7mX0zx4K7H X9VdHF99yiOUoDH9PlydJaUDPExLJY5ipIXDAYWEsuD8B5MnHqbgP5riG361WkzVrBmV Dzp0jH4Cxh+sXdus5+kleyClNgcydRcPwreeLemNaZJOvPRNSfYfk7JUnptPaY23vzHw 799OCPwOgrwtOvSaL3D1eEIvFdW6ZdKaaheCm+L6JkOPjwwgssgh0KsPFmfE8SXNF6b2 kMTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id; bh=VaEdQfVg9P2F3qQEZW+lUMakUUuPtIeZd8XoNUyDCe8=; fh=OY0pZIsXiOmihsEzTt2PBrB2+hwGoy2qleQga3yk59w=; b=d74dvGuOQRIGCndlJqNfDCtgTdJ0qWdyoc74n5Yp7oHf2CLqaiKzYJ9CsAH7gzW5pj 7NXFgRnjtOUmpsKYR1oQnTZpMXSM+jgrsrxkRW+N/rgRfJ05itz2VHW2b96JchYYi3Ry a+hwqWkx6CcbSONTRgX4kX05Wgr4LY9l3lJmLewEwh/HWr00OfyTa0N/AqRrJQfQXtCc V59cEITsyjmJSddaUdy3/pnJUezAxe0OD53BnzM3zh5CRLq8c06VUobuR+9HQYygVeA3 3OxkkhsyIC1Xp4MoB9Ekd21YR4geOw9t/4jZCFoKCr8mjN0+qS727NOX1PCe0nNtAKUU 93yA==; 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 a640c23a62f3a-ab384cf95c0si5925766b.1.2025.01.17.05.47.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Jan 2025 05:47:31 -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 [127.0.0.1] (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 50HDlT71006215 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Jan 2025 14:47:30 +0100 Message-ID: Date: Fri, 17 Jan 2025 15:47:29 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] imagetypes_wic: Fix riscv64 and mipsel usage To: Jan Kiszka , isar-users Cc: Quirin Gylstorff References: <97ad9368-43f1-435a-b5fb-d496fba86741@siemens.com> Content-Language: en-US, ru-RU From: Anton Mikanovich In-Reply-To: <97ad9368-43f1-435a-b5fb-d496fba86741@siemens.com> Content-Type: text/plain; charset="UTF-8"; format=flowed 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-TUID: k6ePZXAY9Ht5 17/01/2025 15:20, Jan Kiszka wrote: > From: Jan Kiszka > > We must no set WKS_FILE via overrides in a central file as it will take > precedence over regular assignments that users rightfully expect to > work. > > Fixes: 0a7f631f06b6 ("wic: Set default WKS_FILE for non efi targets") > Reported-by: Quirin Gylstorff > Signed-off-by: Jan Kiszka > --- > > Finally noticed in isar-cip-core where we are unfortunately not yet > runtime testing the isar riscv64 image. > > meta-isar/conf/machine/qemumipsel.conf | 3 +++ > meta-isar/conf/machine/qemuriscv64.conf | 3 +++ > meta/classes/imagetypes_wic.bbclass | 3 --- > 3 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/meta-isar/conf/machine/qemumipsel.conf b/meta-isar/conf/machine/qemumipsel.conf > index 4c27ff2f..ceac81b8 100644 > --- a/meta-isar/conf/machine/qemumipsel.conf > +++ b/meta-isar/conf/machine/qemumipsel.conf > @@ -8,6 +8,9 @@ KERNEL_NAME ?= "4kc-malta" > IMAGE_FSTYPES ?= "ext4" > ROOTFS_EXTRA ?= "128" > > +# grub-efi is incompatible with targets riscv64, thus no sdimage-efi default There is a typo: riscv64 -> mipsel. > +WKS_FILE ?= "qemudefault" > + > QEMU_ROOTFS_DEV ?= "sda" > > QEMU_ARCH ?= "mipsel" > diff --git a/meta-isar/conf/machine/qemuriscv64.conf b/meta-isar/conf/machine/qemuriscv64.conf > index 15711054..b9656090 100644 > --- a/meta-isar/conf/machine/qemuriscv64.conf > +++ b/meta-isar/conf/machine/qemuriscv64.conf > @@ -11,6 +11,9 @@ KERNEL_NAME ?= "riscv64" > IMAGE_FSTYPES ?= "ext4" > ROOTFS_EXTRA ?= "128" > > +# grub-efi is incompatible with targets riscv64, thus no sdimage-efi default > +WKS_FILE ?= "qemuriscv" > + > QEMU_ROOTFS_DEV ?= "vda" > > QEMU_ARCH ?= "riscv64" > diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetypes_wic.bbclass > index 980856ac..38b5f0e1 100644 > --- a/meta/classes/imagetypes_wic.bbclass > +++ b/meta/classes/imagetypes_wic.bbclass > @@ -8,9 +8,6 @@ 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" -- 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/d5c34eda-9fc5-4abe-b5ba-f8fe7e4d7ed0%40ilbers.de.