From patchwork Wed Apr 1 10:49:05 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhihang Wei X-Patchwork-Id: 5000 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 01 Apr 2026 12:49:19 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f63.google.com (mail-wm1-f63.google.com [209.85.128.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 631AnIGq017446 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 1 Apr 2026 12:49:18 +0200 Received: by mail-wm1-f63.google.com with SMTP id 5b1f17b1804b1-48542d5aa9esf60255525e9.0 for ; Wed, 01 Apr 2026 03:49:18 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1775040553; cv=pass; d=google.com; s=arc-20240605; b=gkNPHWJKGVYSEsA68Phf9OcK/CkdSZmnVgtMrpb7GDfNM49Pk2MEUmOAFlRZsKlbb9 6B+NT4aPOEg1GU0PhZny/yGoq6/dmg23kQ/u7vehD3Rd48HYX8RRF6ICEKOp1buKRS6V 2GsviA9BY1aQOOkI91eDHQE2T4sMyLDk0nAbHmce9sd/pPPELTjmpLEnSLByDMDg+r+6 Qkuqynqd9WMExaBUF2Lng22u6HU4OuDtKPEXVIqjYUJUVtNKaM+YQAKYWROypxSAdO7t IRdmArrgsJDDGY3ho8ixuBNd7k0HihodVKNnXA8JbGx30Kp9PHkXSfg0PmY1NFFRyJns hu6A== 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=OxYER6XPO2HoaLjgj29GZD+GFkRtfxwQSUc9AMIAZkQ=; fh=Udc6f+1v+NyO1POrYp8O4nM1yjlRlB/ANruaPZQDd2U=; b=jb5SZL8qq0SKaudoKKA0DpOpIB4hsG1It8Up43x8INB0FDNM+Cb+/y90zhxAgoWfVu t6u8KcBOduwsbvMO7ZOLkXNDg0/8pyMrDkrHHThmQeUrb5LFCJA+UC546UI+kXnruC23 r4Wg1tnH6JxT5CTb/vcKAMuADOQz1TjFjSQGlKzN66ilJ0M1p0qF65yLPk0CGzXWEuVI E3NqUTMoLBjYHK0ZcLOPZ/+Fw+QSLgZWoBZv8yeZw2vZTb/7NBIuQVfOklGonX9Dpicm xI+26tJcMKbj+mhkd4+VHsasdyw23xGiRyqfOuZxRTSQvu3OzCo9dU7FZ+YyHv8w1mTt ZIyw==; 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=20251104; t=1775040553; x=1775645353; 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=OxYER6XPO2HoaLjgj29GZD+GFkRtfxwQSUc9AMIAZkQ=; b=iCm1ZvCFUHJkMuEWIj7QFiDeg2F/bgcFL0CHemyGY14N56olRSXZF49bWhDtuiq/DQ mqL6hjlbbBkgBlRkIKrEdL5pVkbGPwaqAEWte3K9Kyx3f2ZW9xGcBIPYFALGQjj7kt2V iFcxUymBGCb6JuZDNHLiqzOAMdxQBo/hYW+IjntIsHmGu7MYgdAeaYYg5kTePWOl/3rS ITVCr2W7lom0tRPUT7XyXfOolRDotVhPBohkm49QlKabf1eNjDa849WCpcxHVIzUkEf0 6E/x4HPa+9PW55SdaN/xcGaX2W9N+2gek3NVMAcUuoxLwyKuBdwMGYlEBda5lCWEDDbO 5SMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775040553; x=1775645353; 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=OxYER6XPO2HoaLjgj29GZD+GFkRtfxwQSUc9AMIAZkQ=; b=jab6AWSACmXHoDXPpoJyMLAklP1T4V5ThKy0rBzmkyHCaBX2Fnj8lRgj9rzCIfB1uq My92E8iEjJxLlnX7a+hBgCzIoLFXsjxlRhzXlHeuFQwEOghr3WPkjj+iROaJzW8smyYP XpmhxBMiD1mRxkZ/3Y8/HyJmLyzzCN+o4w5H31jahRIjmiKDvJVLhsbBBHBisJ9ZWV57 eEn2oXKi38hmftbzgNBtuIhPlxmBhr16PMEwWXgYuDIflEd8TDxsg/JrhtONBqdEcjUH rxHiizLUn7Tnv3sprzQAtjPLPnbgAetnTK0mj7zPn1EjUYRtK8WC8Ij4/qk9Jy70LtQ6 j1WQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXCiF4N5vL46G6K118m6pMT7bMBenvB3i89JJuvO9Fm3ulBZbOz93rz1BK99UursPU54YPlc30=@isar-build.org X-Gm-Message-State: AOJu0YyEUd/d/es7gRC5YKSsYCbi6J/yLpuiOkqJVgNVUCURZRMO52MK jOaSsLj4x6Hv9TdSBAgoJhCj3CkDX9ph1tA2rApgUOP1oPE5HTY6Kgw6 X-Received: by 2002:a05:600c:34d5:b0:487:20ee:bef6 with SMTP id 5b1f17b1804b1-48883566134mr58060465e9.11.1775040552517; Wed, 01 Apr 2026 03:49:12 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AYAyTiLExWLUy2s/KRoM5EPRPSxRSqb1jfR/eftGar8rroWOLg==" Received: by 2002:a05:600c:3317:b0:488:8478:de3f with SMTP id 5b1f17b1804b1-4888478dfafls3476415e9.2.-pod-prod-06-eu; Wed, 01 Apr 2026 03:49:09 -0700 (PDT) X-Received: by 2002:a05:600c:3e1a:b0:488:7784:d06 with SMTP id 5b1f17b1804b1-488835abf84mr47439335e9.31.1775040548925; Wed, 01 Apr 2026 03:49:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1775040548; cv=none; d=google.com; s=arc-20240605; b=PIoi1vN5rDggN6ddIDKtfqwyzcVTh0ZxvwBUZbzJwAoVylp+ykroDBzsUuUI8oSXaM YOOxfcIw4zuexnnjK0zMQW1emXGg/FNNAqFSknLjGfroTuTuNMdt78j11lsMmnya94kG Hra/7bWzbCAvNGuxWS7ur+/k8ACkINiqewJrBtWiu0mMuhp5S4fZuqrgz9/AUIFOX52q 9a2/DMyB3LJL0jn6ahGk22htlMyEEPfHHRV/a/t0hzVzDrzbPmYVIq3uOEWn+HyrGka8 tNYx6mNj0U9ujL9sQjuu3F+IQ/3mbQ7D62vgURPq9JXLtmZqJhKyGe9H3vg0MPuhBdZo r5KA== 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=6khaSku3zsIiBX4maYtG88NudILbNDXfKej/ypWHyis=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=RpnPLksaI3TgrhvwxSUBiLjPRM/cNGqQIYMhLoj5v2nQ5/gMAbDRslDT1fPtMoa4JI 8XNGiJZqDBbma26LrC8wSoVjXjGaH/gOhEp5Ky/ooPRXYiMX8DfpcVnK88cyB87p9/x7 Vq49HKAH/buvyi1Un7KLX0co3B3KKTTrJqnLuhEijJ6lB+ZV1hRi5w8ttqC0F6gaAi+R 6xX3RwtJd8uJyDTPXwK06Bd3S9c7+5RPC7EyMlvsdnVXJHgBTm3AKpwQpBBpAkHaWDF0 Mj63pWzD1jWqE2qKn/BYLTAcZ77FO2Rz36NpYhUjB/j+9tzcfINSs1gBHROl5PXFSE/R S1hQ==; 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 5b1f17b1804b1-4887e741255si709985e9.0.2026.04.01.03.49.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Apr 2026 03:49:08 -0700 (PDT) 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 631An76h017421 for ; Wed, 1 Apr 2026 12:49:08 +0200 From: Zhihang Wei To: isar-users@googlegroups.com Subject: [PATCH v9 1/3] wic: Obtain real machine name in isoimage source plugin Date: Wed, 1 Apr 2026 12:49:05 +0200 Message-Id: <20260401104907.3365696-2-wzh@ilbers.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260401104907.3365696-1-wzh@ilbers.de> References: <20260401104907.3365696-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 f31ea61f..a2687ef0 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)