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) From patchwork Thu Mar 5 13:26:58 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhihang Wei X-Patchwork-Id: 4957 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-lj1-f186.google.com (mail-lj1-f186.google.com [209.85.208.186]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 625DRBOa019144 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 5 Mar 2026 14:27:11 +0100 Received: by mail-lj1-f186.google.com with SMTP id 38308e7fff4ca-389fc8b5e89sf73067141fa.3 for ; Thu, 05 Mar 2026 05:27:11 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1772717224; cv=pass; d=google.com; s=arc-20240605; b=jVd3Hpu5gkZbKD3Q5we3IanUbYkRPkhmH5hHcW886YV9xbJUDfUgw5qsCVb02IGhrD 7tuWwbNilMntU8bV62empRBb/bIHmoB0V4K8VcUn4spHvGJXOmM55cnc13PadJqey7bi NaF8qme0aniq1mfZLwacTOn4Q1E37thl5NsGa5r6EvBjavFg+aXCrdG1UTvbabmVZrsf eLC7oBpuy6Z5nq7O5Q92vUsJsxaQ2tHcXtW64qX1nSVd54YOXpcqObUTEnn7JAqxj3k9 qZz9i1vew/hXil6/QKLRZS5Vsi5NAv+cPeRm3TS2AOOR/JVmBNO8VHoxMNRujfxHhVig IowQ== 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=MEUvtBjAy151+ptdhWV1okJsZ4FBBGJOP8+3Fdq58kc=; fh=Gj4fKvxcjAXS1BJXGdKZxCsGekjKlDq68cBQXcMQiig=; b=b98A6hOaVviXEOJLLWxH1wvSj34f62eKinkbzaIrY2E3joeHGFrUATI+g6IeE9n2BQ zXC43BweCOvKItNT0zQVCvefR/xHj2tApNkeC0NZAwzi/YLWMLmD6cHiDDhAOjDtpRCZ o1NNN91/G9rEbGxD4DCpWDK+gDbXJn8YmUruxFKVO6ywMGwmDlG3jsAyL57a49ZOgUcK K9u8RZGo40UvkgPTkOpjW8XqHUUHWD2YSS5dJbyvYekY/YpVEePpdxZ38C5+qXga+wbA Cp5XCgqpwYIMseaLn3HSesYGinyGiFn4AEbWKGEi4OdWaPGLOfc7fzbpzJeieWOfwdJ1 KDiA==; 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=MEUvtBjAy151+ptdhWV1okJsZ4FBBGJOP8+3Fdq58kc=; b=P5p1cN75uk6+KJphg10F3mn02wC1F54x+aSz3yq0bNiwlxK6cNDBXu4bBZ3YZO66FD iSynIyuK3xCAExARTVNRQ8+q2y9qvteVzkfoqti+oaSxUWdYM0yYh9lmFddazsSyiDLX LokfAue7uC1VhH8O8LHdniUtmUhG1i2gndwmg8g9XJQ/vRf6Zt1HQmjFviETG7xIlq7X mcU9cosUxfdkDDb1LiFqZsMziWHwSVnl3h7XieuoujONz5AKI56T7dzcWGGxU8nv3Rkr MUT9kk/1MMlYmv7a8D5SBH840ohBJueOkCgLjp/V7kBbUfL4dCvnPMMTbPVHto7uW1NC VsXQ== 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=MEUvtBjAy151+ptdhWV1okJsZ4FBBGJOP8+3Fdq58kc=; b=nDMeBgK+JSovuiUMy06pql5IH3RDHMr7Q5HLC8ASJmYp0jjLCQjJGpXexuWACK8RJL j0I915icIelqRc5QYb8BGnztwddmpBblenPJNaGIYRziqDkHun8GA10oKh7FzJTbbvMZ hd2upSXOw6FK1FNmF/yPxSOXvF8DQ+Va/05P3LWKvcGeLzQFVTPNmp8iRHFr+ZP4MFJU uG34SmVhGrxRf6hFnsR/BH2Yt8X/wOpidMUPsOZJsn8Tt0gjf1+KxfrFrneYF5GhbKUX QBqhX9BX3HK0xwWBIqvae657l8z8/DbrxqCvr7NbikD9e2q1GbSDf3k97DBy9V3HVq2b T+ig== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVuDu0Gs0uB59bz8Ok/XjfrPRgP7Zs2SXxtZ5sx5pWfmDGd/ajOKXYwFWUIQ6o2CzCZ/AzB7gk=@isar-build.org X-Gm-Message-State: AOJu0YxWYlI1MBeXv9UV+Jxx7Ww4iyC8GloODV7TzQd5L0+92zl+ewE4 I7GtBbJvwHxyNl5xjhgTX4fRiP/sQTVH4iyQL9bm7X0Yb7AV27GLcl/e X-Received: by 2002:a05:651c:325b:b0:383:16e7:9c3 with SMTP id 38308e7fff4ca-38a2c565101mr35899551fa.3.1772717224117; Thu, 05 Mar 2026 05:27:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+EcZK+5cyKzjK8QVIX4f4CuvRzJobAOB2tUD78UZuVdtQ==" Received: by 2002:a2e:8758:0:b0:383:10b5:939e with SMTP id 38308e7fff4ca-38a338e6044ls1496861fa.1.-pod-prod-03-eu; Thu, 05 Mar 2026 05:27:01 -0800 (PST) X-Received: by 2002:a2e:8e81:0:b0:38a:5fb:46c7 with SMTP id 38308e7fff4ca-38a2c7b95fbmr26494281fa.32.1772717221540; 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=CCna3aR30jqfimTXejwYrqgHJYM8FuVjPSvl0R74h1OHgWaPQvYG2c776JKwev+skR lv5nStD0Ckw3TKxilDCB0WptjojitvTq9Lov8FUkv3q2ygNg/QznDaUDndhAip86iDyC Y663M29eg9Nl0dHkI28Ih9Y3d4eTaXFb37WiENh0hcE9S8EtnbmcrLbsmtSK6xN4tJ34 n+bxQdOMTaI5xbijQgxaLyiBQ/MTT/qifPb3nMRuyipb3AQPAalgWs58JWzB8tIu8dva g1MQw37YAJ1njbDtqOnFBSDLfzoOdYq5fcgqO/8JZdwAbg7u7hemOc3t9pfFK+LKUrMN rVNg== 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=gQOXwEP80X/wox/zrRB5hPheljtNTIgBpbq9tr73660=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=GIDvJZL2a7SrzwLwCDkVxV44OvorQgChjirkVMq3m2QjkdUR9r2okAhOHDKwL0AqaU 2MlMa/9pabCq3CdP4TOc0zMatVJT076JdqMTXXdLbG9FE2Ca4L43WUwdDP0AHdwWP8Lj 3H+w/Ex1LMHeDKM4pEk5NpGrcyXE2v/QUr9Mk1abtoHhk8A7aTGbNoR7kWvVEcjPl5bw Lvzx9nhbZNsMkMzswKYWhXeKMZfId5Ne8xMx4H4eWdwrKefcJdTIvjfwlVgFuTTflgF5 hJSgDINnavsUp1mpcsESSH5tu1Yhy9w2BHs17KSEcGGykBUA+6L30wLYCqNdNP6omV2J r5KA==; 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-389f2fab926si4227701fa.8.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 625DR0a7019085 for ; Thu, 5 Mar 2026 14:27:00 +0100 From: Zhihang Wei To: isar-users@googlegroups.com Subject: [PATCH v8 2/3] testsuite: Add testcases to check dtb deployment Date: Thu, 5 Mar 2026 14:26:58 +0100 Message-Id: <20260305132659.1356077-3-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 Build several images with dtbs deployed to the same path. - test_dtb_deploy_distros Same machine, different distros, same image, same kernel, same dtb name and contents. - test_dtb_deploy_images Same machine, same distro, different images, same kernel, same dtb name and contents. Both fail with: ERROR: mc:phyboard-mira-bookworm:isar-image-base-1.0-r0 do_copy_boot_files: The recipe isar-image-base is trying to install files into a shared area when those files already exist. Those files and their manifest location are: NOTE: recipe isar-image-base-1.0-r0: task do_copy_boot_files: Failed build/tmp/deploy/images/phyboard-mira/imx6q-phytec-mira-rdk-nand.dtb (not matched to any task) Please verify which recipe should provide the above files. Signed-off-by: Anton Mikanovich --- testsuite/citest.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/testsuite/citest.py b/testsuite/citest.py index ab28b68e..ca701422 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -677,6 +677,39 @@ class WicTest(CIBaseTest): ) +class DtbDeployTest(CIBaseTest): + + """ + Build some targets potentially causing DTB deploy issues. + + :avocado: tags=dtbdeploy,full + """ + + def test_dtb_deploy_distros(self): + """ + Cover case: Same machine, different distros + """ + targets = [ + 'mc:phyboard-mira-bullseye:isar-image-base', + 'mc:phyboard-mira-bookworm:isar-image-base', + ] + + self.init() + self.perform_build_test(targets) + + def test_dtb_deploy_images(self): + """ + Cover case: Same machine/distro, different images + """ + targets = [ + 'mc:phyboard-mira-bookworm:isar-image-base', + 'mc:phyboard-mira-bookworm:isar-image-ci', + ] + + self.init() + self.perform_build_test(targets) + + class NoCrossTest(CIBaseTest): """ From patchwork Thu Mar 5 13:26:59 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhihang Wei X-Patchwork-Id: 4955 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:12 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f57.google.com (mail-ed1-f57.google.com [209.85.208.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 625DR9nZ019117 (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-ed1-f57.google.com with SMTP id 4fb4d7f45d1cf-661565d30e8sf900445a12.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=O+sb7sHK815IgKTydr1GamZo5O8axnt/2rKpH1ciRoYcUZBe1Cyt/QQW0CKHmOLqhj /zbrQVCltesZdB4sxNLAvPeQOYxwtTqviXX2VfhXZ/yI/93C6QcaQOioNwSlaRr5NjGm eoNOjkospWHnlRlbeD9k99PwGBz7i6qI7905cAnv9IzmgtQkag1oc1w0X5H3JBaBrrbY oJEElWRRuylv9d0ezpQwK+ScD6bcdV68OuqA8Kw5XN4B0+KpvhNqFElR1GvH8gx052sM hZ9P/RaxZMABqBxjF9cz5G2+vTQVXd4VWkjmjRPOyvjJuf1AWTfnFikfh7G968w3EWdB yPeA== 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=8lyBLAjtrgcV8dbLwu33vsNO+oXB9wFm8tfSku+Tee8=; fh=NdS7qhy/XtS7awj+DgZxspP7vQd78Bpq3JX930lGg8g=; b=NJH63udrw2ibsT5n11xjsTyhpxOtNd6zaZTyqyG8RYgrhLETLcJ4vpgr88jsk82TT8 koM7PUF0+KUaiMl/wXSd4mII/rRMbZOh6HuswSebSczrZKwLoAJ90RBUouV9nmWk6cTI o7f+UoBMDcoGfDL2/iLo/i68H+9Gn6K8DNGiBLW8XSEvOfUg7vGNBn/VSGRlKOkWi2q/ XY/kwifVAv+vEyYMMjGnaWrKtyMU0jVb2eDheRxUFqhGwcccwHGvvO5bGj+y6lyGWE7y 0rN/P5wvgdBA6tHWnkzLc7jIBKbrbIiW8q5bLWABpCUmlQZzgZMFij/KLDPnkFCb5Yf+ rRpg==; 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=8lyBLAjtrgcV8dbLwu33vsNO+oXB9wFm8tfSku+Tee8=; b=vC5zIMV9czzljJD7XPrnKf+QunnuXPuM7ELMYnCWrnq4EEtEOeYjnbeM2l+exyGens bL3nt8tlGroIkSpPnprnuoxVKcbeSfmUnYHh0QJMuttJUPEfNoWBui2WYOG32R01mvgV 4O8T2YG8Awzb5TM8aurgqqfllrncirXpQ/9JrOCrBOw5BfBp2lYy2n7xgEz23Kxfcjwe epu+h7Mm++QUVEBmi8sU+BC/N/z2/zE1zyJdyejf4ebTxgYcE9ImtpbHfdvIxGOzp2L+ oRweOO6iCvVHfqbpBUszfe1vjVjZkuYcn1iJ/TFA2BQuIJIc0losUfbDJDLJCxcJaacC zywQ== 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=8lyBLAjtrgcV8dbLwu33vsNO+oXB9wFm8tfSku+Tee8=; b=A6npZc5Z/sMZ5ZZla1XkBJ7rAlOolR41Kl5iaQchPwJUGOgVzmHRZBHXwZ5iLpVUrx UbZ215ifZ9nBh13fNZ3qUrkkWCYOgU/EO6h0hqi7e8NJAZtegmDWPWG5cA92kL7nXwiO 2M7SiYF1zqcnIXWOuMADbvawhh+gShdqeX0F9OAfH8BS16kK6rZTtz8KL06dvIB77efC 7z8MeJhiigcVcAG3TjPVvznm8db6Tu106i9MntPwcwCePWk50MnHOmoAp0VqvHSKdmoB WJFKs6YJH7wezLb/hZzylE4K5xgaktJzT3gIEXFPPh/BD//5EZoe1z0yPmsQlqSqMUdo 3P2Q== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVnaroMSvIc5WB2O9xd/LY9uuWryO3jl9OoHLs/bxqfGe6rTtBPB11/REz0/ItUTb/TedYIU5o=@isar-build.org X-Gm-Message-State: AOJu0Yz0UhB48I62p6ZqK1+uWP+DZsoEqqgUA7AUy/fYUOU599s1H+Z8 FO3hbluERFq2oaVjYIvoTS0vi1hkw1K4cCYa1k+AzORPi3p5Rt7s9LuG X-Received: by 2002:a05:6402:40c6:b0:65f:ab99:2d4d with SMTP id 4fb4d7f45d1cf-660efeb46e9mr3269744a12.19.1772717223898; Thu, 05 Mar 2026 05:27:03 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+FK5KIYpSBJZ7d7yFfhT2ESAbwNgItVArnBr7nVzkb6zw==" Received: by 2002:a05:6402:3488:b0:660:b00e:296a with SMTP id 4fb4d7f45d1cf-66130077699ls1162238a12.2.-pod-prod-08-eu; Thu, 05 Mar 2026 05:27:01 -0800 (PST) X-Received: by 2002:a05:6402:3989:b0:64d:540e:c68e with SMTP id 4fb4d7f45d1cf-660effc657dmr2290296a12.26.1772717221769; 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=PdmPGSBTzuNxqWSVoWHIAHCM4v0YUVHDLFv9kem2rTcV1NGCPS3KH8IUK4cRXMj0TS Kr3/wFAR2lRt/FjrybeXHae5h5A8sZbhCDLp91DXzAi1dAoMetowYWpfIpcuR82RYytU ZnixRBziHlDVSZwafGVF/NejVEf5ID3N9WYWTDkJBq3a63bBvk4O15AhKN3jdEbSvV/Y NRJD8l8ABAKUFvikNXYMHaot5mVuFypM4MteXMRcWO/r/U8srXj5nqaZSRNhQrPXK4Ki cIxBSknANwlUpm+CLQ40Dv3UBaIR5vvzF/hgjyuGThZdjq/EQ0Ct1QNMFcjq03NpfM6Z shSg== 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=WnVmRmh2ADyLpRHLsv0Y7gLM7YylaQC5hLcK1Ga3mCw=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=W5MhoSH7brON7ilIaPVY7wuwtxkgS8jdYabdvG2LM6VtW8kE4wtOWy1drOLv/Iacho Ig/2XaTEQLyA1AfHbRWOqv11bop6bWeOzCPC51PfpzqbBu9Yq9FDjZU2CUoSNqUTC5v+ BGCJdayPqQ5QjFZw41Ll96RaBpkfEtCSGTbDkdflrbvHJNy8zPw2xbo51GUNgVqF23pQ /FfQRwpLyRJX6r0HpYY5NAnZiqqHt9IdZqhRvRnrAuYRvIETdCxWoaON1Tv0Ri/Ot4SY IWbZkEKCJuH8g7rjkhY1eoZ4kzYVNJQ5OQwW+u05dU82e7m471WkP7BtmzWU1WnndPdI 6Tvg==; 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 4fb4d7f45d1cf-660f3f32a41si89351a12.0.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 625DR0a8019085 for ; Thu, 5 Mar 2026 14:27:01 +0100 From: Zhihang Wei To: isar-users@googlegroups.com Subject: [PATCH v8 3/3] meta: Deploy image build artifacts into distro- and image-specific subdirs Date: Thu, 5 Mar 2026 14:26:59 +0100 Message-Id: <20260305132659.1356077-4-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?= When building different distros or images for the same machine (e.g. phyboard-mira-bullseye and phyboard-mira-bookworm, or isar-image-ci and isar-image-base), artifacts with identical names (e.g. DTB files) may be deployed to the same location, resulting file conflicts and build failures. Deploy image build artifacts into a subdirectory named ${DISTRO}-${IMAGE_PN} to avoid such collisions. Since the directory now encodes the distro and image name, remove the ${DISTRO} and ${IMAGE_PN} prefixes from artifact filenames to keep the names short and clear. Fixes test_dtb_deploy_distros testcase: ERROR: mc:phyboard-mira-bookworm:isar-image-base-1.0-r0 do_copy_boot_files: The recipe isar-image-base is trying to install files into a shared area when those files already exist. Those files and their manifest location are: NOTE: recipe isar-image-base-1.0-r0: task do_copy_boot_files: Failed build/tmp/deploy/images/phyboard-mira/imx6q-phytec-mira-rdk-nand.dtb (not matched to any task) Please verify which recipe should provide the above files. Signed-off-by: Zhihang Wei --- RECIPE-API-CHANGELOG.md | 63 +++++++++++++++++++ .../installer-add-rootfs.bbclass | 9 +-- meta/classes-recipe/image.bbclass | 11 ++-- .../imagetypes_container.bbclass | 2 +- meta/conf/bitbake.conf | 3 +- .../plugins/source/isoimage-isohybrid-isar.py | 2 +- testsuite/cibase.py | 2 +- testsuite/citest.py | 7 ++- testsuite/start_vm.py | 2 +- 9 files changed, 84 insertions(+), 17 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 0bad8a44..bc7abb37 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -962,3 +962,66 @@ INSTALLER_UNATTENDED_ABORT_ENABLE = "1" # Optional: set countdown timeout in seconds (default 5) INSTALLER_UNATTENDED_ABORT_TIMEOUT = "5" ``` + +### Change DEPLOY_DIR_IMAGE path and artifacts naming + +Change DEPLOY_DIR_IMAGE from ${DEPLOY_DIR}/images/${MACHINE} to +${DEPLOY_DIR}/images/${MACHINE}/${DISTRO}-${IMAGE_PN}. + +When building different distros with the same machine the following +error occurs: + +do_copy_boot_files: The recipe isar-image-base is trying to install +files into a shared area when those files already exists. It happens +when some files have the same names (e.g., dtb files) for different +distros. + +To prevent such collisions, image artifacts are now deployed into a +distro- and image-specific subdirectory. + +Additionally, artifact filenames have been shortened by removing the +${DISTRO} and ${IMAGE_PN} prefix, since this information is now +encoded in the directory path. + +Example 1: Build isar-image-base (phyboard-mira, debian-bookworm) +Under "build/tmp/deploy/images/": +Before: +phyboard-mira/imx6q-phytec-mira-rdk-nand.dtb +phyboard-mira/isar-image-base-debian-bookworm-phyboard-mira-initrd.img +phyboard-mira/isar-image-base-debian-bookworm-phyboard-mira-vmlinuz +phyboard-mira/isar-image-base-debian-bookworm-phyboard-mira.dpkg_status +phyboard-mira/isar-image-base-debian-bookworm-phyboard-mira.ubi + +After: +phyboard-mira/debian-bookworm-isar-image-base/imx6q-phytec-mira-rdk-nand.dtb +phyboard-mira/debian-bookworm-isar-image-base/initrd.img +phyboard-mira/debian-bookworm-isar-image-base/vmlinuz +phyboard-mira/debian-bookworm-isar-image-base/phyboard-mira.dpkg_status +phyboard-mira/debian-bookworm-isar-image-base/phyboard-mira.ubi + +Example 2: Build isar-image-ci (qemuamd64, debian-bookworm) +Under "build/tmp/deploy/images/": +Before: +qemuamd64/isar-image-ci-debian-bookworm-qemuamd64-initrd.img +qemuamd64/isar-image-ci-debian-bookworm-qemuamd64-vmlinuz +qemuamd64/isar-image-ci-debian-bookworm-qemuamd64.dpkg_status +qemuamd64/isar-image-ci-debian-bookworm-qemuamd64.manifest +qemuamd64/isar-image-ci-debian-bookworm-qemuamd64.wic +qemuamd64/isar-image-ci-debian-bookworm-qemuamd64.wic.bmap +qemuamd64/isar-image-ci-debian-bookworm-qemuamd64.wic.manifest + +After: +qemuamd64/debian-bookworm-isar-image-ci/initrd.img +qemuamd64/debian-bookworm-isar-image-ci/vmlinuz +qemuamd64/debian-bookworm-isar-image-ci/qemuamd64.dpkg_status +qemuamd64/debian-bookworm-isar-image-ci/qemuamd64.manifest +qemuamd64/debian-bookworm-isar-image-ci/qemuamd64.wic +qemuamd64/debian-bookworm-isar-image-ci/qemuamd64.wic.bmap +qemuamd64/debian-bookworm-isar-image-ci/qemuamd64.wic.manifest + +Artifacts that do not belong to a full image (e.g. isar-image-base, +isar-image-ci) remain unchanged. For example, a customized initramfs +built independently is not affected. + +This change affects the location and naming of build artifacts and must +be taken into account by downstream users. diff --git a/meta-isar/classes-recipe/installer-add-rootfs.bbclass b/meta-isar/classes-recipe/installer-add-rootfs.bbclass index 2fa551bd..edf93016 100644 --- a/meta-isar/classes-recipe/installer-add-rootfs.bbclass +++ b/meta-isar/classes-recipe/installer-add-rootfs.bbclass @@ -13,9 +13,10 @@ INSTALLER_TARGET_IMAGES ??= "${INSTALLER_TARGET_IMAGE}" INSTALLER_TARGET_MC ??= "installer-target" INSTALLER_TARGET_DISTRO ??= "${DISTRO}" INSTALLER_TARGET_MACHINE ??= "${MACHINE}" -INSTALLER_TARGET_DEPLOY_DIR_IMAGE ??= "${DEPLOY_DIR}/images/${INSTALLER_TARGET_MACHINE}" +INSTALLER_TARGET_IMAGE ??= "${IMAGE_PN}" +INSTALLER_TARGET_DEPLOY_DIR_IMAGE ??= "${DEPLOY_DIR}/images/${INSTALLER_TARGET_MACHINE}/${INSTALLER_TARGET_DISTRO}-${INSTALLER_TARGET_IMAGE}" -IMAGE_DATA_FILE ??= "${INSTALLER_TARGET_IMAGE}-${INSTALLER_TARGET_DISTRO}-${INSTALLER_TARGET_MACHINE}" +IMAGE_DATA_FILE ??= "${INSTALLER_TARGET_MACHINE}" IMAGE_DATA_POSTFIX ??= "wic.zst" IMAGE_DATA_POSTFIX:buster ??= "wic.xz" IMAGE_DATA_POSTFIX:bullseye ??= "wic.xz" @@ -29,7 +30,7 @@ def get_installer_sources(d, suffix): target_machine = d.getVar('INSTALLER_TARGET_MACHINE') sources = [] for image in installer_target_images: - image_data = f"{image}-{target_distro}-{target_machine}" + image_data = f"{target_machine}" sources.append(f"{target_deploy_dir}/{image_data}.{suffix}") return sources @@ -41,7 +42,7 @@ def get_installer_destinations(d, suffix): target_machine = d.getVar('INSTALLER_TARGET_MACHINE') dests = [] for image in installer_target_images: - image_data = f"{image}-{target_distro}-{target_machine}" + image_data = f"{target_machine}" dests.append(f"/install/{image_data}.{suffix}") return dests diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass index afe6906e..d4f9e2c0 100644 --- a/meta/classes-recipe/image.bbclass +++ b/meta/classes-recipe/image.bbclass @@ -18,8 +18,9 @@ IMAGE_ROOTFS ?= "${WORKDIR}/rootfs" KERNEL_IMAGE_PKG ??= "${@ ("linux-image-" + d.getVar("KERNEL_NAME")) if d.getVar("KERNEL_NAME") else ""}" IMAGE_INSTALL += "${KERNEL_IMAGE_PKG}" -# Name of the image including distro&machine names -IMAGE_FULLNAME = "${PN}-${DISTRO}-${MACHINE}" +# Name the image as the machine name only, since the path includes distro name now +IMAGE_FULLNAME = "${MACHINE}" +IMAGE_PN = "${PN}" # Deprecated; this would be set to e.g. "${INITRAMFS_RECIPE}-${DISTRO}-${MACHINE}-initrd.img" INITRD_IMAGE ?= "" @@ -29,7 +30,7 @@ INITRD_IMAGE ?= "" IMAGE_INITRD ?= "" # Name of the deployed initrd image -INITRD_DEPLOY_FILE = "${@ d.getVar('IMAGE_INITRD') or '${PN}' }-${DISTRO}-${MACHINE}-initrd.img" +INITRD_DEPLOY_FILE = "initrd.img" # Make sure dependent initramfs recipe is built do_image[depends] += "${@ '${IMAGE_INITRD}:do_build' if '${IMAGE_INITRD}' else '' }" @@ -52,7 +53,7 @@ python() { ROOTFS_FEATURES += "${@ 'generate-initrd' if (d.getVar('INITRD_IMAGE') == '' and d.getVar('IMAGE_INITRD') == '') else ''}" # This variable is used by wic and start_vm -KERNEL_IMAGE ?= "${IMAGE_FULLNAME}-${KERNEL_FILE}" +KERNEL_IMAGE ?= "${KERNEL_FILE}" # This defines the deployed dtbs for reuse by imagers DTB_FILES ?= "" @@ -108,7 +109,7 @@ ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${@isar_multiarch_packages('IMAGE_INSTAL ROOTFS_VARDEPS += "IMAGE_INSTALL" ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" ROOTFS_DPKGSTATUS_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" -ROOTFS_PACKAGE_SUFFIX ?= "${PN}-${DISTRO}-${MACHINE}" +ROOTFS_PACKAGE_SUFFIX ?= "${MACHINE}" CACHE_DEB_SRC = "${@bb.utils.contains('BASE_REPO_FEATURES', 'cache-deb-src', '1', '0', d)}" python () { diff --git a/meta/classes-recipe/imagetypes_container.bbclass b/meta/classes-recipe/imagetypes_container.bbclass index ea15decf..1c5386a8 100644 --- a/meta/classes-recipe/imagetypes_container.bbclass +++ b/meta/classes-recipe/imagetypes_container.bbclass @@ -9,7 +9,7 @@ CONTAINER_TYPES = "oci-archive docker-archive docker-daemon containers-storage" USING_CONTAINER = "${@bb.utils.contains_any('IMAGE_BASETYPES', d.getVar('CONTAINER_TYPES').split(), '1', '0', d)}" -CONTAINER_IMAGE_NAME ?= "${PN}-${DISTRO}-${DISTRO_ARCH}" +CONTAINER_IMAGE_NAME ?= "container-${DISTRO_ARCH}" CONTAINER_IMAGE_TAG ?= "${PV}-${PR}" CONTAINER_IMAGE_CMD ?= "/bin/dash" CONTAINER_IMAGE_ENTRYPOINT ?= "" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 0f84e715..7c544e5d 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -57,7 +57,8 @@ WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}/${PV}-${PR}" GIT_DL_LINK_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}" DEPLOY_DIR_BOOTSTRAP = "${DEPLOY_DIR}/bootstrap" DEPLOY_DIR_SDKCHROOT = "${DEPLOY_DIR}/sdkchroot" -DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" +IMAGE_PN ?= "" +DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}${@('/%s-%s' % (d.getVar('DISTRO'), d.getVar('IMAGE_PN'))) if d.getVar('IMAGE_PN') != '' else ''}" DL_DIR ?= "${TOPDIR}/downloads" SSTATE_DIR ?= "${TOPDIR}/sstate-cache" SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${DISTRO}-${DISTRO_ARCH}" 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 0ed61fff..eaef9c79 100644 --- a/meta/scripts/lib/wic/plugins/source/isoimage-isohybrid-isar.py +++ b/meta/scripts/lib/wic/plugins/source/isoimage-isohybrid-isar.py @@ -196,7 +196,7 @@ class IsoImagePlugin(SourcePlugin): 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) + pattern = '%s/initrd.%s' % (initrd_dir, image_type) files = glob.glob(pattern) if files: initrd = files[0] diff --git a/testsuite/cibase.py b/testsuite/cibase.py index fd6a3df9..fac2ab75 100755 --- a/testsuite/cibase.py +++ b/testsuite/cibase.py @@ -44,7 +44,7 @@ class CIBaseTest(CIBuilder): self.configure(wic_deploy_parts=wic_deploy_parts, **kwargs) self.bitbake(targets, **kwargs) - wic_path = f"{self.build_dir}/tmp/deploy/images/*/*.wic.p1" + wic_path = f"{self.build_dir}/tmp/deploy/images/*/*/*.wic.p1" partition_files = set(glob.glob(wic_path)) if wic_deploy_parts and len(partition_files) == 0: self.fail("Found raw wic partitions in DEPLOY_DIR") diff --git a/testsuite/citest.py b/testsuite/citest.py index ca701422..f36da786 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -496,8 +496,9 @@ class InitRdBaseTest(CIBaseTest): super().init() self.deploy_dir = os.path.join(self.build_dir, 'tmp', 'deploy') - def deploy_dir_image(self, machine): - return os.path.join(self.deploy_dir, 'images', machine) + def deploy_dir_image(self, mc, image): + multiconfig = f"{mc}:{image}" + return CIUtils.getVars('DEPLOY_DIR_IMAGE', target=multiconfig) def dracut_in_image(self, targets): machine = 'qemuamd64' @@ -526,7 +527,7 @@ class InitRdBaseTest(CIBaseTest): bb_should_fail=False): mc = f'mc:{machine}-{distro.removeprefix("debian-")}' initrd_image = f'{initrd}-{distro}-{machine}-initrd.img' - initrd_path = os.path.join(self.deploy_dir_image(machine), initrd_image) + initrd_path = os.path.join(self.deploy_dir_image(mc, initrd), initrd_image) # cleansstate if the initrd image was already built/deployed to verify # that a new build does result in the image being deployed diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py index 57d169df..a37ffe82 100755 --- a/testsuite/start_vm.py +++ b/testsuite/start_vm.py @@ -50,7 +50,7 @@ def format_qemu_cmdline( image_type = image_fstypes.split()[0] base = 'ubuntu' if distro in ['jammy', 'focal', 'noble'] else 'debian' - rootfs_image = f"{image}-{base}-{distro}-qemu{arch}.{image_type}" + rootfs_image = f"qemu{arch}.{image_type}" if image_type == 'ext4': kernel_image = deploy_dir_image + '/' + kernel_image