From patchwork Thu Mar 5 13:26:57 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhihang Wei X-Patchwork-Id: 4956 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 05 Mar 2026 14:27:13 +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 625DRA9D019138 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 5 Mar 2026 14:27:10 +0100 Received: by mail-lf1-f64.google.com with SMTP id 2adb3069b0e04-59f6a933cbdsf1006900e87.3 for ; Thu, 05 Mar 2026 05:27:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1772717224; cv=pass; d=google.com; s=arc-20240605; b=kf6zuPT//6iSGDuc6g0BqT1hIOgOBPwpm5hc1bpsX5BFbcFzFtthlMJ4aQQS3PaQe6 hwLMC1rME4mAeCMXJyDsRBoPw1Vkgw2Lv/GHUU/xLFMBaJg5mcMZTZGX1a0EzdcMINld syp2kkjVXeEezOQmwySSFg+Gf33xgrBRh098zuliHDb4kWoDVlEp0mOP+OsgMyMXZhW8 /ki4CuHSIGZWCrY1Umgg0IkWNmRihH57LnpZXXZxbtoIsLXztbaSeVNGE+bIK0Cx463R egMxEzf0oy156PoSXvBX+kAClqhucnrWl06w99YzEh9oh61dn7OnV4gzI1QBLeXzcxJ1 Oowg== 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=ecGRNQSgM4ZGTUyOQ9PrO2h8e1Ql9FortwpIsFPcVKA=; fh=H993CLWmmTMF5coRB0JSe89c4b1jSjTUPJfU4Rtz840=; b=LkYGloNtEmT/guw/vJftSYuAthXZoVY1H7OQ3BCXiaOOiWKSpS2PptiL5a2fKF9gjl I8vBGKRzQtqM5iDPArV23XaDm1QtDa16UIlCbKKxaRDHqj/bYu6qclbGqJXT3cTjcMpH 517/AZ5PJLwanwiBl8JF/2pCy7JS1KNNejKhTQEp2gsuJTBu5z0utajzqTKMuAqeSGHT 1PNWbIJRcQ6cxlUjw3HBfcs/6a7IpM/lQvLUERO6s6Ia+nbkadyXGm+pheyrMZXWVQ4T RKzaMN5dseKjVwkKQ7zuQy7vAyrcWl4bYJ+ibpXheaiEuEv8wk7mA51q6WJ30Bb1Pquw D8Hg==; darn=isar-build.org 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=1772717224; x=1773322024; 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:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=ecGRNQSgM4ZGTUyOQ9PrO2h8e1Ql9FortwpIsFPcVKA=; b=YjmEiIfmFXqB1y0JysJuGxkDpP9vCTnWt15GR1rSQOV15LweRJR3PMajE2M0TEmPaS ApIovIwwTK8gvI1gvvmNMyCTkhHmM3OxVeXfRIdWvAwDbjnPz8rAQdAHTIND8WzIyr/I EaB/18aIOjYYGVZ4a2BjizVUeTVI4m03VijBQ7s9F1zbAv01GajlD0jUDnfwbtoIBwGM cLaZOynaA5uwypE2Kb22TvsISjKH3mbchHhOX5vBZtfHF2Mj8OUKSBdedAKUVUB3Ar6s vSH8xLERSdaD5D+wGbeCJTSoqhoP87QFj+w51N67+At9YbBGzssoK/PiLmr0a0ya2dy/ L9sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772717224; x=1773322024; 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=ecGRNQSgM4ZGTUyOQ9PrO2h8e1Ql9FortwpIsFPcVKA=; b=aaREEwDBIB5XbWTFQ/k+c2B1u5zA/Dl0Qjvr2KkDUBekjDQL5XNQPL7tvEChcnJat3 mxnt0trHNwmXqhrOLrAPeI3ufX9SUIDTXi5a7ppKreAZ2TGWTj1svcdvQmL1EcwENd9I edv3lLnfP7cvRziPZ4xuK7bIu/d/M/+AKp9uQj5W5tKl58lVtIIkJFFb82+LXgerMQZO RC3eLhG+tOR4gGvSKsheQlscmmR6oGY3lf5bWthqIL4wDQze9VOvhKzf5SXN+waVLkTv G8CiCKnJMlguQuFDP7HXB4bNr4MhRbitgHg0AfAAc2NIWxOngRWqBb6dcPqTUC1DnBsA IIUw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUlZggsXWbpUdXYCdrsMj58mrqQ1fnEvm7MBj0dZ6nV8Fx3NarAqfADlB1ZyRdfYKoOrXx+6Wc=@isar-build.org X-Gm-Message-State: AOJu0YxzAywq6M/77xPLqVq7NdPJF4ABTi9iXagRHfM+/iLMqbODEM+U BmdWxFaLh35mIBXJEf7xZB1tipDUFzEIsnE0psSiwcrUTyDVRdwpMHYY X-Received: by 2002:a05:6512:3a94:b0:5a1:2a65:127f with SMTP id 2adb3069b0e04-5a12c36217bmr843686e87.49.1772717224254; Thu, 05 Mar 2026 05:27:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+EzVqFWZ36hD8ToV+UMlTemgbP6WD3JeCf9lVgky7QpUQ==" Received: by 2002:a05:6512:39c3:b0:5a1:2c19:aeac with SMTP id 2adb3069b0e04-5a12fc447dals118336e87.1.-pod-prod-06-eu; Thu, 05 Mar 2026 05:27:01 -0800 (PST) X-Received: by 2002:a05:6512:3a94:b0:5a1:2a65:127f with SMTP id 2adb3069b0e04-5a12c36217bmr843651e87.49.1772717221539; Thu, 05 Mar 2026 05:27:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1772717221; cv=none; d=google.com; s=arc-20240605; b=gy5VMdDJ3hFuFJ3qoywcrSjnbsDb+suyFiaTCp1r+h6hNY1eaqaBxuQ7exjJ8iIdl3 y4osQetcSBVyU/ZRZGDiGPMKn5xffBZayGHCsdypOtmKcTcORA74HGDz2w2MbvoDzJBS uDNHaV3BIuePF8cKLDpUcrT0lQEWveuzENLFrOhTacVtoD/gE8DsiyWrK/hQAD9tBJXc RbRR6L//mYa4oSXKohl/cXDKA+PhCGANIWJY2Ehj1yyaE71wrlAofiVvUq5t/rvFqvUy /4vRSd7ktJx9IyyWPdxGvxU/DLlPe0TbAk5EabAGTbN1tF2ICq3aqqpbU/6SQNnqM6+0 ueWA== 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=a5Cl3tQ1G3ZX7mufikhYM1kILvUwwZECbHqjJVXQJwmakAPZ5IgARlWopxxG++2Qa9 fyXWNjAxOMoDKskcH3ldEWqfei9zurdtA7lbQ+OBLi9LYju6rRJV/+yw3iVFajk980GK k5/weFz7WUSXnom7avNpCPOjqgVqt4HvCKRves5etOAM6kgh7TSiuBvy+wsC6wVFQO7P nhnQ1vCdR9bbiZE8fOIsDmJtLMN1r5bL36upkWe8EkvnEgo0rndHJd0tM+J9KdVgJ+2P wCFTaPIeM+q3at5OCRZs8/hZZsWBD588iF8CNjIexy/6SCN1PXjEq6lK5wabV50MH/xF bDTA==; 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 38308e7fff4ca-389f2f8caafsi5366351fa.4.2026.03.05.05.27.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Mar 2026 05:27:01 -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 debian-zwei.m.ilbers.de ([88.130.203.42]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPA id 625DR0a6019085 for ; Thu, 5 Mar 2026 14:27:00 +0100 From: Zhihang Wei To: isar-users@googlegroups.com Subject: [PATCH v8 1/3] wic: Obtain real machine name in isoimage source plugin Date: Thu, 5 Mar 2026 14:26:57 +0100 Message-Id: <20260305132659.1356077-2-wzh@ilbers.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260305132659.1356077-1-wzh@ilbers.de> References: <20260305132659.1356077-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 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?= 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)