From patchwork Fri Feb 13 07:40:39 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4854 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 13 Feb 2026 08:41:00 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f60.google.com (mail-wm1-f60.google.com [209.85.128.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 61D7expu026922 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 Feb 2026 08:40:59 +0100 Received: by mail-wm1-f60.google.com with SMTP id 5b1f17b1804b1-47edf8ba319sf8685485e9.2 for ; Thu, 12 Feb 2026 23:40:59 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1770968454; cv=pass; d=google.com; s=arc-20240605; b=MTnm7adA29Lu+WCjmSysx2W/dtkE7MA8eA3/3SXVcQCq0TGrWQg79a82WZTV7RlCnp 1Dcz3S5XrGOxp0AjzTxeHBXZviVUZpK5I/PV05QAxHyX0ZXUQ52xNMS2U1tRisS3TRl3 U7f+XSGIvI4MgXc0JKijn5vAR2qCq1yeXWCtk5cshyfdmwcXBjW6r4/a2MPa52U4xEVv WtylDuDETQFNCnoN0WGSkvxqwUzJvz6arprMjNSI5xyDMp9i1yPtr86DQlWL408PjW6Q dBIeit/4v3vRFAGoi+roGvzHZyH9yk5hoKMsyQyT4UiS1slqyZfYFezQkAPMqPSlmHIZ tBmw== 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=ul0hDE6MIftpbX1idtr1y4nyZLC3aEBR/atUbpLP7mc=; fh=hssHs6IEqLCvGNHd96UbKc9l4sNvlzJUQaQcTvzuuto=; b=gF/vpt4tGmv94vphkYw8RotGJK+JIXI0UeWhY+fbPKUquMZ983zs3BI1CwYvT2WMg4 bzE/l7j1+SvicyP0qrlKw6lJ4F8/8pUMkymYcbrcpw8loV5UDHM7uJL9e/BgMvkUteTp /xe8AxhYo5hHvp6P5FkWK5WLAHL/1Wlb5WAQlEXZq6IqF4FeV/KYQgXRQKwlhLgD9FXm mCDUqWed9KJm1K2YG6ktxObCWu4R5DdF/pvdKvg40t2iaFaUj/EBn2bRx6zLCNN2cA6e Vm7IPmn5WitHgRvxH5rURZxln96Ld8sUFM3DmWwVL9JmpkVlbI2Mt1XjJ4wVGxAd5dyb nXmg==; 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=1770968454; x=1771573254; 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=ul0hDE6MIftpbX1idtr1y4nyZLC3aEBR/atUbpLP7mc=; b=u2kCXBkGqTdLLSsfH/HmohoOL1iz8aqweJUbuwlP82Qht6IqdRfYOYInhBABCDBg8x n6r/NAyqmUWCRvIaua4VE0XfOzrU+3LZ2kFLO7Usw+Pcc51GnKIcLxy3+HnYw2vxTbbL tWBATS7Xb+QTTd39F9MOhrSJov/rqBTZ8zkLNJD2yCRhfVtiYbqNA7+stpRU37mrz39M euGyDhb7NFCYLBlpsEOYUE1KkFH7dCNPgYVxymMQkXpwZFDaPiuvm6+JEzagCrN25dks 3gp4tkVvA4KaUW+lcSyDVIYCXCzMPyFvf155nTYXFmgb1iCI7hYrmPuERIT1/RXS75S0 t9vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770968454; x=1771573254; 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=ul0hDE6MIftpbX1idtr1y4nyZLC3aEBR/atUbpLP7mc=; b=vP3ypBmtTQBALLX0qXw3DUDtjLzqmvJtoC/p6tpgHvVYrTRoSZhlkWjGd3BZGrGxjH ErJIkwHaqj1x1ul2OuIGLPTZ2mSZkh0oaXF/iMG3RHp6T2ut/9slz4HC9QPu4W6IId0E l85mVMQLPaQeFIyZa4xabRKcy0G7uE8lIqi1E8AV3M1utFlNm205Ec/zHAMd/veKmMxR KM9rjOgQqA27rmvHiFqZu76EynB0GPQqay9LhJnR2zpJ3//D60hkIyxZ7ZBLW6LyO7SV zhax6Lv33+EsqOVS7Vbfcb/IPGPA0pa/k0VoQ5stjYUUo885N8v3L/o7vgCJ3UV+i+h9 K1bw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXLPKmIRljR4UrrlHxW6sOjAivRr/lQddZKXsoEI661IN6UoHo4Mv1LFsukvtrL3RGCIgzBhGA=@isar-build.org X-Gm-Message-State: AOJu0Yz3/JOztugx/dSgyscVIwWT5nUxdyvgnE8zyBixlVJqSncOO+uA R8DzfEt9TKcNyZbfUXA/XgmY3+ENbA/UpgfHD4dqir6qpe5DucRB1xvY X-Received: by 2002:a05:600c:314f:b0:483:498f:7953 with SMTP id 5b1f17b1804b1-48373a6de6dmr11472655e9.28.1770968453821; Thu, 12 Feb 2026 23:40:53 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+F43URcj8OeFRBE36ffSHV8olSOK0ZwHoydMmH8TthIgw==" Received: by 2002:a05:600c:35ca:b0:480:711f:49dc with SMTP id 5b1f17b1804b1-48367083336ls10344185e9.2.-pod-prod-07-eu; Thu, 12 Feb 2026 23:40:51 -0800 (PST) X-Received: by 2002:a05:600c:6206:b0:477:b642:9dc1 with SMTP id 5b1f17b1804b1-48373a5ba9cmr12160135e9.20.1770968451614; Thu, 12 Feb 2026 23:40:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1770968451; cv=none; d=google.com; s=arc-20240605; b=Dpan18ZOWAx+UhPisrE+I1VFpD0JF4sMcMyvZUfNnIK0kCk+d7EJBMBt88XfNIZsZD xZsN7WYYWqfmb6mq4GmgdeCtYPSGIXsYfLJOfGmprxHSWkam/kDtRvq7W6jzjrf2F6GS XDl9TsJkjZvlsmowUdMMAxfDfwpJUQlo/59RTuoDBNGHWVz0/6/8zNSTec4XealPA6Os QwOtx8xgYo8Y+IhZ/CUIcGeAkYeQaPJKEV3Q0TnFAssXueZt3nTAh4LniFLgeLhCTv4h EDeSVkpsnqKToOfPnH0R2EgvQq2XDmVqmEq2bPgT7WpnqnOr4Rq7kYoL9dcVVb8wiqeD huqQ== 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=WTP9zalsWzVRek2DkwCDNrPH8CZWcFchHSjss0Rqcfw=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=BpGX5GeTI48JweCNfk11c2FzcvthCwgp8r+vFpCiLfNl4ONXewW5olYT8zXnocSSja AzjuZCNhn7yUGgdmXJS/dYppUVtTFBm49QrfL6z9S4j0eufRVPrOT2GI3EeS7QYFpTht QtBL1QzScmNU1/tIJV5rZS/OhU2qLaqvuMWq3gPDcrGRVDHunA7GfHbT/PufjWvoifHi sUjXVpetNhc9+4c+lB+0q4M12pjquXg5hydGz9KGu5sgipkeN0HO1qI02/MIbZEogOQ3 AcW7nUs90iWBikZxkXwBBteju5dL9K8swWbu4UnTez9N3s4crbu7f3GDcVWDahaHSxGw rRNg==; 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-43796acd39esi35214f8f.6.2026.02.12.23.40.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Feb 2026 23:40:51 -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.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 61D7enLu026889 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 13 Feb 2026 08:40:50 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v6 1/4] wic: Obtain real machine name in isoimage source plugin Date: Fri, 13 Feb 2026 09:40:39 +0200 Message-Id: <20260213074042.76277-2-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260213074042.76277-1-amikan@ilbers.de> References: <20260213074042.76277-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?= The current implementation tries to obtain machine name from the deploy directory name, which relies on hardcoded path format. Add MACHINE to the WIC environment and read it in isoimage-isohybrid-isar.py to fix that. Signed-off-by: Anton Mikanovich --- meta/classes-recipe/imagetypes_wic.bbclass | 2 +- .../scripts/lib/wic/plugins/source/isoimage-isohybrid-isar.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes-recipe/imagetypes_wic.bbclass b/meta/classes-recipe/imagetypes_wic.bbclass index 6b82add3..d50022ce 100644 --- a/meta/classes-recipe/imagetypes_wic.bbclass +++ b/meta/classes-recipe/imagetypes_wic.bbclass @@ -107,7 +107,7 @@ WICVARS += "\ ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS TRANSLATED_TARGET_ARCH" # Isar specific vars used in our plugins -WICVARS += "DISTRO DISTRO_ARCH KERNEL_FILE" +WICVARS += "DISTRO DISTRO_ARCH KERNEL_FILE MACHINE" python do_rootfs_wicenv () { wicvars = d.getVar('WICVARS') diff --git a/meta/scripts/lib/wic/plugins/source/isoimage-isohybrid-isar.py b/meta/scripts/lib/wic/plugins/source/isoimage-isohybrid-isar.py index fb6c6b39..0ed61fff 100644 --- a/meta/scripts/lib/wic/plugins/source/isoimage-isohybrid-isar.py +++ b/meta/scripts/lib/wic/plugins/source/isoimage-isohybrid-isar.py @@ -191,7 +191,9 @@ class IsoImagePlugin(SourcePlugin): if not image_type: raise WicError("Couldn't find INITRAMFS_FSTYPES, exiting.") - machine = os.path.basename(initrd_dir) + machine = get_bitbake_var("MACHINE") + if not machine: + raise WicError("Couldn't find MACHINE, exiting.") pattern = '%s/%s*%s.%s' % (initrd_dir, image_name, machine, image_type) pattern = '%s/%s-%s-initrd.%s' % (initrd_dir, image_name, machine, image_type)