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; Thu, 26 Feb 2026 17:26:26 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f64.google.com (mail-lf1-f64.google.com [209.85.167.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 61QGQOJ8009016 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 26 Feb 2026 17:26:24 +0100 Received: by mail-lf1-f64.google.com with SMTP id 2adb3069b0e04-5a1007530e4sf79296e87.0 for ; Thu, 26 Feb 2026 08:26:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1772123179; cv=pass; d=google.com; s=arc-20240605; b=e37ZKgP1b5QF0P1r/dyXhEwXJH4tbhCbhQ/FW+XKyBCPqxFUCES34UZtniMzKcySJ/ BHBQJu7PjNGvPIgtyctOUvwoF4SWoTBlEiJDdk3jox4YgVcWOJtoRrPPX67oEtZNFFxY jlZ/eqrkozpdaWYJOdVl3UUdxLUMaTAPQRvyQSrTh0BUavODf+DPlXD4EXbUBwv7uIHj Ar5G+yWhAwgD7bm2shxC9XveTT2basHJ4kRX1SYimg7nqB3mNzMFelAIVbBNEYBqGhoY /unRQnUiVay9iTUGAvchZtK9hHk3dPptxczbwlQ50+nWNNqDnsQcBkqSrLpPdZk3gp3q lSyQ== 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:to:from:sender:dkim-signature; bh=7cOGiDT27HcpTApqM+MgaTf2hll1vuGVg//SW3oTwco=; fh=n/yBcmlU5+RIJpNh8dJv9zpbWMWU+VpiGcTselo0abA=; b=Cq11ySsaPfJ6kNL9vDodcv6GGEm8aVYjiGfHeJeVPYhJa1U44UByxvrpJHrMdbHRdC PjgnS+LmqwZOtIacfiJOlkdG7Vhph66N2sFyyUshLR1XdYZAa+m17sjuBzr5i90N5qjW 3mmtjNS4GTzVbrrWPW2fMW9OKr1SWjtBAR1Ev0hzNjz1J+x6nHSphqu3lWuYjkj+cGCn +u41fkQprFPQMAXUaQDPM+N5ylSR/C94fsoSVGqFmxMR7rtqRq+Mkw6FLGifVA6vY8Kt ADhj353/sCzKAc7ZL5kDoQ+Y4bp/0yIXH0r0Mk6ZFopd4KaR6eZjxny620LOCfGc/rnR C47A==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1772123179; x=1772727979; 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:mime-version:references:in-reply-to:message-id :date:subject:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=7cOGiDT27HcpTApqM+MgaTf2hll1vuGVg//SW3oTwco=; b=wqzpjJSccmEH9gUFUibcDddsnwZgMPWw+In5MLrCrY3i7oGDLwEmMDqx2ubqmHo8Sh J6oszrG50ZroLFtLc6ZV7hnH3Fz+ZDjadlL623AdMRzdy7AcabRKhsXbP7JOxrJSSqUl mOrwqLUjt5KHBxzJKj0k+wrKnWWAuOcPYRmsFq5+bRZcByppIIzeralTbHElElwi30xZ bFfhAMuMjqVPm8nVKduH6QdwQvXQaytVVVaVKpO1H4u/GtGejuVsAJTpsOpmAXgyXBvX 3t9pgygXZjEuuneE9/EUzGHOAXNE9UMSxqQmF0YbrsAGJxA8l4LDkiOtSpBp/5yneJR1 RDXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772123179; x=1772727979; 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:to:from:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=7cOGiDT27HcpTApqM+MgaTf2hll1vuGVg//SW3oTwco=; b=i4BXD+5vMF6UPv3i75tpzWlzs5JYMbwc0u1R9PWl3O2oJZLqbkrFNeviOFNULAJ888 AokmmrzhrqD2aVbwNXFOyZiJPxnNn9pGnQrIAVZttTcmbwzq11qT1p2NjpdqHc5HHy25 9/tzeTenB1a18eQVBeAHPNgz5ndp+K9FvCL0A6YgehGh4Rm+t7YEkCBUhm8gX0gWqss0 AGGY33YUwJgiRYub+EUixembzcnSmjsVaM8GZQHB3qV5dp79M7LF8wSFFBr8+cpwjcs5 7XNR/ZFm88IOHUQ3jNrnCXK0Qwlcc9M6zo8dRHdgqes5QB+8CxE7F36GHM/8XlNMZK4X wNww== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUQROGeQZAEcXaXa+840ysDGAX2wBeX6C3SYCqsmBswXQGNXz5HcSDOEJf7bFoUXje6Zeto@ilbers.de X-Gm-Message-State: AOJu0YxiNN+7H0LYegi0F4kuACOQsycbZL/GtDgS4u6cIF6iXABUK8yj DiC+TbmAadsTUhr/Xm+mmp1kuR3Z6ctwUDg6CPGvZzIdtOSqIvU+bJw0 X-Received: by 2002:a05:651c:992:b0:37b:be38:76ab with SMTP id 38308e7fff4ca-389a5bfad04mr37935351fa.8.1772123178801; Thu, 26 Feb 2026 08:26:18 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+HiiYL6Dh0eE/X6vRJXlsi/x6Tp05gbITAp4pBfV7Ku7Q==" Received: by 2002:a05:651c:4384:10b0:386:fb8f:73a7 with SMTP id 38308e7fff4ca-389e3a88e8als3064291fa.2.-pod-prod-04-eu; Thu, 26 Feb 2026 08:26:16 -0800 (PST) X-Received: by 2002:a05:6512:234e:b0:5a0:efe2:e8f7 with SMTP id 2adb3069b0e04-5a105d85002mr1661145e87.5.1772123176014; Thu, 26 Feb 2026 08:26:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1772123176; cv=none; d=google.com; s=arc-20240605; b=em3IUh9n9GqI0EnGk1U31xKfk66r471XhQ1G6Ma+vq7pFJDWYArkpyJ5ERAmsMa6JD a4jGCY6zdihIsmDB3qURTlkjX34zjpB4lR7hjoOVxjI0AFkTUcEYe0bwCOPrqHyxAtXY 4exJO7fOFB2M6I/nBtjYl8IF7z2/U0tBz5p50OPQL+bnMx760fkc7+HsLA6gxGuubjmS DDFfOSy5VQ5IWG2aAM3xfgm5IgZjypyQSLZDX4FxKlfhnSMEYKypOaErPomJ7DmGI7yB Lo8XSAF71xGbQSNwpBFlj9Ln6haaW9utEgmeNATgUysboE0ZRRwoSf/TT/HjXoY3+H2k NVxg== 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:to:from; bh=6Xq9uHq8Kt/S/40jMtP75obBJjVgzPvzmiNSvp8JChw=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=c5hOV8YiFh2jhj9V//fruR4rs/ybPvqH7FQwyVYSDzfGxC6JoZ/Ec4DOFqq8PN37Tc CA4jaIw02tU5LlFB8ccxb9VyweAbh/wbI/gbKCuEFyxMVFI2MADVRAXB7cqrcSNuYDet HSiT3jleSFFG6KJInHDH72UkccJukqvpy0N9PEaJD3t02LyhWwsau/Rg0pIdYjfq+0/k 4pOYu4GxPyCNOvg6V1O+BCiybK76/U3nb/2AzNvm4RW5yBV69z5QDqrAlgsvIN/tQzUL VExHf4GwzHBz7QrHSseP+dVchYveOxHMEtUuizLYIMDEk0lj4SHCM8TzdpRslmRnqv+C RSkA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-5a109225eb5si56546e87.0.2026.02.26.08.26.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Feb 2026 08:26:16 -0800 (PST) Received-SPF: pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from localhost.localdomain (dslb-088-074-195-234.088.074.pools.vodafone-ip.de [88.74.195.234]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPA id 61QGQEXV008973 for ; Thu, 26 Feb 2026 17:26:15 +0100 From: Zhihang Wei To: isar-users@googlegroups.com Subject: [PATCH v7 1/3] wic: Obtain real machine name in isoimage source plugin Date: Thu, 26 Feb 2026 17:26:11 +0100 Message-Id: <20260226162613.1954014-2-wzh@ilbers.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260226162613.1954014-1-wzh@ilbers.de> References: <20260226162613.1954014-1-wzh@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: wzh@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de 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-TUID: 1g4YfBLYbjh3 From: Anton Mikanovich 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) -- 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/20260226162613.1954014-2-wzh%40ilbers.de.