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) From patchwork Fri Feb 13 07:40:40 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4855 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:01 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f59.google.com (mail-wm1-f59.google.com [209.85.128.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 61D7f01U026941 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 Feb 2026 08:41:00 +0100 Received: by mail-wm1-f59.google.com with SMTP id 5b1f17b1804b1-48372facfedsf2649175e9.0 for ; Thu, 12 Feb 2026 23:41:00 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1770968455; cv=pass; d=google.com; s=arc-20240605; b=WFYEWuoQp/lY6++RF2xl126qPYRq4ohmowAux54Jt/dsB3ez5n+FtUTcsLyBMmf+ER YITEi+j2nOJbpU7zOTlraWhHmbaYvnKQvp9YlcbCGCJjhgXwJyyYmmOJ7Jm6CckI0MQy Jvmsl45DKRMwe98aN25g5CrNmg6LVsXNkXhXLLoL5ud0r2FndJwe/ardNeslVQFYM7/b QWFoYFik9PwOtC8wyV7RgitZc8OArPW9GkNDRlv2FcQMa8fedtsRQwXL//RG5RFxQ5NE 83cjaaWeGBNFggaRC6Q+gDOJ3MHKkYhtxv2vxcVc3qZrXwguI6+yDkVlEk9qU8xr8Cvr m/QQ== 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=YlvzC2q/c7SOm9F+ka1PRsgxmsSmcnBvCbiSbT1TUUs=; fh=HZlu2AwXUpaUxzcvEmVsQsN4gtCYavRKZP4jEzV2lJ0=; b=kHNvUsQzncKUInUq2aSJXjhdqR/TuPYIii3IV9QgQjgwYOdQaKMHTbjIPBlVB4lS/P OIGahubSD+GMGhPLf8cUo1ENtZW5Qf8M3D2Qe3BnsR0TnvhZbIKyYN7mcdgGEYzfn/o7 wXGKYWSoulsHI35xqJ41VH2+j/eds+GkvQ2lvqTtMU3eLs/0e/U4KoHPXrWqZM4Vk3Sf +MoizrpWM2ZnnShj8KVzAfsh0Eg4EINwXcItQ0WEF/eGOZ4aCmE5E+v0WdlHoFUBuJiH rP1n8rQUMnrfIBsP/9wzAJPOqCi3rjXbNvAcv7xuTksTh45Pc9BkZLN80t5foTErKp0p RD+Q==; 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=1770968455; x=1771573255; 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=YlvzC2q/c7SOm9F+ka1PRsgxmsSmcnBvCbiSbT1TUUs=; b=sdmcIgf+4wmJCk3/u0WmCjWBZl+IovGQVeQsKaSIZonSz7XoccsG9w3Icwxl+ikE2L BfPriDm57M8VubH2ESG9ldTlGPIjmO8hFCaKpSZ8kFxYJx2lxAeuV/QiMz7cejAC0RWl g7GW6bs4YuGGlFCLlYnrnF0cIRdRiG9RyI+xE7u2R2f9NFpH8RgTUIvjkV4lzySOv6eU P+ZiEJCyNrCIu90DjJef3bCijIFFkvkQlFJJEb45GttrgtWUbRDqnUJhJWzoL08IWDsR wH8fzfTvsdOqDdoPu5uft8NoajE3eBUHaPeSGj/WTG2deC0p1XVpC01SfTn+uNMHCWDX 1mTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770968455; x=1771573255; 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=YlvzC2q/c7SOm9F+ka1PRsgxmsSmcnBvCbiSbT1TUUs=; b=DtjF5q1OLa1lLQeCKsqXEN8DBOZf+AoimeWcP6FKI5zQXxxzO1NXOYQa1hqyYfZsit 0qWQN0BQC3JhMFMeog5o9c5zy2bPvdU3nTTraMGRuCSCo+ytrRK05ul8/Kyd7aUDFZBX aUw8ntCXJYa9Pe7CF7uLNzeCeI4gdId+UnGuO/4guNNVAz1SVMS0xtdurDtP2fD9gKT6 H3QhYX06xoN+9VAz+BhUK0tn8Ispw//6Hug4+zubm72dJniqsVXhGcJrYfdcwpEyJ/oZ ooWhbMDaXZ28d128zQWQeY4ScgX1/zd/NQVBC4ARetXhvD25md6Nm1FQZ6EqfOZhGBc1 M+8A== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVt9a9IJscoKp3e+UCcEtm7RzmNbm74khntdzJF36XO+Ferj0GsZ1yzbAD6O1o2nAJAA1RFK0I=@isar-build.org X-Gm-Message-State: AOJu0Yye8oB/9uuLmJBaVbdVfxjKFAdfeXR9s4XjkSASZ47G2tVOaJ7j iq38e9PMLu76jJ6AItJV0a7TaXErSt61P7RmKnGPgHXtMFwBBQ1e2HIs X-Received: by 2002:a05:600c:4fcf:b0:483:6d9e:e4f5 with SMTP id 5b1f17b1804b1-48372f1641bmr14608475e9.5.1770968454641; Thu, 12 Feb 2026 23:40:54 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+Gk9/kFEIPYPWQMsInQD+f+skNvDqp0Vzj37CX0YZXUiA==" Received: by 2002:a05:600c:19cd:b0:46f:c63c:450d with SMTP id 5b1f17b1804b1-483670c104fls7619355e9.2.-pod-prod-00-eu; Thu, 12 Feb 2026 23:40:52 -0800 (PST) X-Received: by 2002:a05:600c:46ce:b0:47e:e981:78b4 with SMTP id 5b1f17b1804b1-48372f4c71emr13625225e9.12.1770968452395; Thu, 12 Feb 2026 23:40:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1770968452; cv=none; d=google.com; s=arc-20240605; b=XCANO0y08/RDun4gjhlKMZeZ/IpybbyfLrRhIMqKSaTDEF53vgj41Uxv9wl3dIYxep v0iSiZi+cW58J5YLlnEmY3NCZgrmfLGA+byPQB4eT80GYoEiLXs3LdBQxbiON9ZoGCjA KL14wgSzF3hbUsn9XodAZTbtVkup03U16ci0CnfdZRmFctvUVXSaXWBaknp92PpxoHOW nKZ6TnBCGPpFhzbr8t1MDldIiQnnMfd/5Iw2lcodI3keTah7rVpYTpUs+Oh4AqWfwC+O 2DDbVx+lODoSDvjxT8lOFI9dWZzvPJ5A/uPs54lbj969ezvSkEoywxFF868ghsQ5oxSD M4og== 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=A0mpIAYEahghDCx2/pwY2ddtSmj5RfJoxLk6CpsiJ/s=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=RLA6SF41bIPD6H5mQCTkCT5aAFqLfjMv5rxzftanzdvnHs6VaD0uEVycdbkdYIC11i pZZ7FW49JBhc31MOTOt7RDtGujWe/gbMlj5ZjFR+t8CwMtTWCrK6tttjxco9rrAB+ijX KWMUHc6ZXY9DG7iEOm8g0bWYl2yLM7YW8e0YJM6AI5EW4CDSCp53EAFOK/06Q2slf0VE XJ8U7AJ7+OZWmKO+qW57bOOKQ1oM4+l3u/Dm4471sFcsini2AWTP2YV8jN/IhikgvZP2 AyUbDZx90tfZj0PYU8Zqd8aXb9UPmXl8FXEsCybkCgJ8FobN0Vm4d/gRKtCSRfgQQ6Bt AOCg==; 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 5b1f17b1804b1-483709f536asi223395e9.0.2026.02.12.23.40.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Feb 2026 23:40:52 -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 61D7enLv026889 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 13 Feb 2026 08:40:51 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v6 2/4] testsuite: Add testcases to check dtb deployment Date: Fri, 13 Feb 2026 09:40:40 +0200 Message-Id: <20260213074042.76277-3-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?= 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 f11cd5af..c521f6fe 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 Fri Feb 13 07:40:41 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4857 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:03 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f58.google.com (mail-wm1-f58.google.com [209.85.128.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 61D7f2dR026953 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 Feb 2026 08:41:02 +0100 Received: by mail-wm1-f58.google.com with SMTP id 5b1f17b1804b1-4836cf00787sf9468925e9.1 for ; Thu, 12 Feb 2026 23:41:02 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1770968457; cv=pass; d=google.com; s=arc-20240605; b=gxhV7cifZ/aV5fM61yvtoK6Lc7T1uGWmzMJukRnZb5kS9nQ0pTjy0NojqBf7NlTm0K 39xp+FTb0VYSMC7d4MRvruyioReVOSKhSq9JY6qnBRxesMoGOLLAZTwiW3pa5Gi3GT+R kVKR9lauYgHQrYT+YA+jE1vreKyg/fKeTghzWInoGUk3A1mgTL4unFC7OWSb8BmN7nan nH8vqS+Ispoht1nuQY2gqix5WY83k+mFyLek0wUSrNm4Kq2SML23Yd1gFZCG9oWYuYk+ +DXI/eqHF3Ulv/z6gf+rNDhm3NUtGE0JKJ/VyeH5pzd6xGpGuONmIF7/gst0WIF1kMCc f/8g== 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=IHXA3n4tdAgwomFeYQfUYasujdBiXZSheozwsEZ22lM=; fh=2EABN/1ojgLBlWYemPFQxgGmRnPplS4vC0LUDhuOz58=; b=GBLDP7C/cWc8nz/N+zZvSZ/frmhbnc8n5nj94KZ8DjF9ngm2JfebDPv/2zzyj+NhFR 7I/+9BpPbpYl5JXz3U2xRFrlVYH1+d8sGLdqRooBmm8qjnuZEr6qvIFto8RzQi3Dlihr Y4HJb6YfPuxMD8vqvWtjO3RDKaI1u+sbruUBNappMTLRWICe7zNUYxR0c3/5P+LyvZPf dZN5uyh1CHcRO2g8gZ/BZj7hHdOPauC0SifZy2XM39wmvxqeYWoWA4QoHcqtv7YsX+qb xJVAhy/wWYn5MJ9Q3yW4CXjyc80y8gO+WIwHMkopFxJ1EcxGbXVS/I8QQaLWmmdOUR2c 9QkQ==; 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=1770968457; x=1771573257; 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=IHXA3n4tdAgwomFeYQfUYasujdBiXZSheozwsEZ22lM=; b=HJFKifDEP393HSPqke1sFFCp40supBRSHPhIgCqvfsY1kAhx85iIWXhwzo8AnCEI+T 3C1WTorx2ZLjLkJUC4rbRUw5ERu5UTHTYNRh7AM44Tf0VRJZIkjc64H9JvtCihTQVx4v Ir7etHVCs+8eWyuDFa/k3mcXi0iHe4jb2q5zi5zoTrTTahpgFLcke/Zh9uVcO9U7Y8g3 h6/RQK7I5QmsNWjaSpGqLix98MJmqKr5qy/YiPUuelaWHMiWvhkrF+f5IZOKvEBvW1jB r9/NJgwaRWqw8EVV7jlnPi1gTy9UPOPnZqhxmkIoij5GOKguw6we8RISb7xw4RPTnFtQ +0Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770968457; x=1771573257; 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=IHXA3n4tdAgwomFeYQfUYasujdBiXZSheozwsEZ22lM=; b=iB6WZP/Z+EEcZid9n88KQqgBglf6wQJzneuNlParUnf0n6hJjk5EH+RiFTj5vd9iDy MmjqubN1/BrY4VL5mXpA28y+5GS/uLiq1nyiZmw2JsltbMWKQqixY9vg+7jmmz9HBKKX ysd5QEHAiDB/xOO7sRPeYuKsSnz4D6O/AgN5tv0QM6v6ldD8faZSfmfAB6HDzbq59fHx 1ls+iYN4RcDYuBCm0py5Mwh5H5MUFQ/3Q1N9J+RlKXZcOaVu7xERZXf2CxLuUNnDAbbB N9LZITbxjmHcPqt0FVbw74CcbsK9MDL1R+el0EFUJXyB+yWg7a9LCjIC31QbjtyiidE5 dQUQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUBXF8csU1hlBk0jhVon4QN34y6U2Dr4q3NWY8i2Lt2nEqkdC8/qNRpVgq2a73qtttCzTBoros=@isar-build.org X-Gm-Message-State: AOJu0YwjvOXuWFrucMgbDYbUUgLUuUIhEOTttG7WxYnGdTMuOn/1EO54 w2g/X52KDQFkGEex6mA9SRkFA341yugR5iiZ3Uv3aQ9cerKaLGnW0Lqu X-Received: by 2002:a05:600c:45c4:b0:481:a662:b3f3 with SMTP id 5b1f17b1804b1-48372f22e67mr14385585e9.7.1770968456742; Thu, 12 Feb 2026 23:40:56 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+EVkANvUXGXk7yHi2Ipg4y8nAX6M1hJOkFmrEc9OTzs0A==" Received: by 2002:a05:600c:1d1e:b0:477:9e7d:40a2 with SMTP id 5b1f17b1804b1-483670622bcls6888535e9.0.-pod-prod-00-eu; Thu, 12 Feb 2026 23:40:54 -0800 (PST) X-Received: by 2002:a05:600c:628f:b0:47d:333d:99c with SMTP id 5b1f17b1804b1-48372f7983emr14077005e9.18.1770968454416; Thu, 12 Feb 2026 23:40:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1770968454; cv=none; d=google.com; s=arc-20240605; b=RIZ/g1RimsgYtoQUD1zLv9w6joy+dDZk3MihTuCJTVLqHc8+NeMlJOUFaQFeXlXFcx NmlYNyPoI3lf3KOJDBY2UtVGPd0qzRVbHUC+rlJByB3NzQZD4yyzHnOgCfBQodapNkr8 +9MEE/X5mgUazYYo+xfXLi5X7TmjaXOAoxsyzv/4aLSyZO4wnB2IeuPTSBgCG9VVsFob CAwVAjm2h0scA/Wmq06mL1slIrY2YVWv2jJinb/WLgXbFhyseEZvu6S13NkAxzgjiWbq lGqvO6AOic8igRNTg48lM59Cs30cJvkfsZFhpLfkjccYwy5/CQEI5MYhaYhrqV4ZNNop pJ+g== 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=3jECTv+u5E8D4Ld50FEXu5tPuA34Gij612h2hpA9sF4=; fh=TJO83ZPiifPcn/eO1vjaK8KBcIEI9UB4e0WXU1YgcuI=; b=Bb4CmwH3DBlEKT0J7sBStROYNtaOPFqmS6ttf+teHInSHGaz0q93gO8PbG5OaLqzL+ W4diXO5XLUC8vjUdkfmWap6NS8n9t6RsFylVtOWXBUIuA1QL0lP8TaThJ6zRCqsxl5iq 9wSN96SKfKOQbXjAN1UHvf9+/KFoCEJC8qdBy43oBYz8kOz4TX/PEFQRVfN8Uh/eOiNP jwPNEfiDWoq0Syq141iQnU5mKW+RyM80etiEw6+1NwEgFsa2Wa8rKPVZ4/HARRIcw8Vz U/5BAVe8mui4v9l6XnljRlLv3L78kssyJBLyZX32G53GJgluaBkKZsht8ecyunZRwmRs tjcA==; 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-43796acd39esi35222f8f.6.2026.02.12.23.40.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Feb 2026 23:40:54 -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 61D7enLw026889 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 13 Feb 2026 08:40:52 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Ilia Skochilov , Uladzimir Bely , Badrikesh Prusty , Anton Mikanovich Subject: [PATCH v6 3/4] meta: Fix do_copy_boot_files error for different distros of same machine Date: Fri, 13 Feb 2026 09:40:41 +0200 Message-Id: <20260213074042.76277-4-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?= From: Ilia Skochilov When building different distros for the same machine (e.g., phyboard-mira-bullseye and phyboard-mira-bookworm), files with the same name (e.g, DTB files) might be deployed to the same location and this causes a build error. Use DISTRO- and KERNEL-dependent deploy directory. Also fix paths in installer and testsuite. 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: Ilia Skochilov Signed-off-by: Uladzimir Bely Signed-off-by: Badrikesh Prusty Signed-off-by: Anton Mikanovich --- RECIPE-API-CHANGELOG.md | 15 +++++++++++++++ .../classes-recipe/installer-add-rootfs.bbclass | 4 +++- meta/conf/bitbake.conf | 2 +- testsuite/citest.py | 7 ++++--- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 0bad8a44..6d7f12b2 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -962,3 +962,18 @@ INSTALLER_UNATTENDED_ABORT_ENABLE = "1" # Optional: set countdown timeout in seconds (default 5) INSTALLER_UNATTENDED_ABORT_TIMEOUT = "5" ``` + +### Change DEPLOY_DIR_IMAGE path + +Change DEPLOY_DIR_IMAGE from ${DEPLOY_DIR}/images/${MACHINE} to +${DEPLOY_DIR}/images/${MACHINE}-${DISTRO}-${KERNEL_NAME}. 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 this new path is separated also by distro and kernel values. + +This change will influence on build artifacts location and should be taken +into account by downstreams. diff --git a/meta-isar/classes-recipe/installer-add-rootfs.bbclass b/meta-isar/classes-recipe/installer-add-rootfs.bbclass index 2fa551bd..b79c2357 100644 --- a/meta-isar/classes-recipe/installer-add-rootfs.bbclass +++ b/meta-isar/classes-recipe/installer-add-rootfs.bbclass @@ -13,7 +13,9 @@ 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_KERNEL_NAME ??= "${KERNEL_NAME}" +INSTALLER_TARGET_DEPLOY_DIR_POSTFIX ??= "${@ ('-'+d.getVar('INSTALLER_TARGET_KERNEL_NAME')) if d.getVar('INSTALLER_TARGET_KERNEL_NAME') else ''}" +INSTALLER_TARGET_DEPLOY_DIR_IMAGE ??= "${DEPLOY_DIR}/images/${INSTALLER_TARGET_MACHINE}-${INSTALLER_TARGET_DISTRO}${INSTALLER_TARGET_DEPLOY_DIR_POSTFIX}" IMAGE_DATA_FILE ??= "${INSTALLER_TARGET_IMAGE}-${INSTALLER_TARGET_DISTRO}-${INSTALLER_TARGET_MACHINE}" IMAGE_DATA_POSTFIX ??= "wic.zst" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 0f84e715..ad3d6b53 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -57,7 +57,7 @@ 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}" +DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}-${DISTRO}${@ ('-'+d.getVar('KERNEL_NAME')) if d.getVar('KERNEL_NAME') else ''}" DL_DIR ?= "${TOPDIR}/downloads" SSTATE_DIR ?= "${TOPDIR}/sstate-cache" SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${DISTRO}-${DISTRO_ARCH}" diff --git a/testsuite/citest.py b/testsuite/citest.py index c521f6fe..072d8e92 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 From patchwork Fri Feb 13 07:40:42 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4856 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:04 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f58.google.com (mail-wm1-f58.google.com [209.85.128.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 61D7f3t7026962 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 Feb 2026 08:41:03 +0100 Received: by mail-wm1-f58.google.com with SMTP id 5b1f17b1804b1-48336b182ebsf6034225e9.3 for ; Thu, 12 Feb 2026 23:41:03 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1770968458; cv=pass; d=google.com; s=arc-20240605; b=MlYf4WKbSF51lAc1MpKzaYz+9oIk1pI1xnCxa3utYvbIRwpGrs3cxgZH1jfgt92j5/ wo/WugwwRMdoawioSRy0nqPAG2Lc+o6vAH7ybCk9jw8tQAxV/wpU0+UCaeA97gpNNW0O 5kWAcZRcasWFwuHHYq4fe5E6EN56USpErk/FHbagv7bmZPJr8iVxUjuniaLtTgNwPTgv DGoB6YE4vsYPFFsSrMu6gJrq2BNfjEw/sLTyk134Gu287cWkwYkmkIECMvB5XDzpEfI5 6HCZiMJREiGPLvGa0H80m4wU/BAk0R6zihTTw90eBXmSbbumX0I+nDoWaHOSoWnoPmwF rScw== 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=rf6tuhR/C8noOBGtiJWJSqtCy1MJr7ClAKU1/3tTK7s=; fh=mm7CgvtS0IcLDYTl6y8Kb1OcZCZPZAT9O+qJ8y34H1E=; b=ErVztumVIVWgGD8VLP7bx2E4Z6YGYWlnqAbu398pN9yOuRWgrGpfu1XrrAdAoOYa1O 06N2c5djFflxOQlkNmxVi1Nc+e64obVODPx9MWnxz3Ra+uCGULMMfq0SR7J5MOqCVNDb o7M/XNkZOqUtxlLLVaXhgsNMHnUaXtOD/Xp9GrUzFURjQ2TbdeusDvi1HkWQB43qpvFe S0quIw6UIZtE8l6Rojk87Ccwn9kEn05DSjeAvC7cqBKJRiYUHgE0bljAhMF7EjqL/kOT q+2ruj4Nasamk2DhYBta/4SFv16E1+vNEVSqstMM9TIkyrw6kQxetpUzUCYS8xmBsCd7 p1TA==; 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=1770968458; x=1771573258; 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=rf6tuhR/C8noOBGtiJWJSqtCy1MJr7ClAKU1/3tTK7s=; b=xZPOB3qedpL1li0E0qVNBhFpIwboNqG0ruWV9um6QGBEZtD9nxbS7rFcZtVTV2AzBM 8h4/6KfroDmf6hUpeCffkwkIcsJMthZJCmoRwiNK0A9gYQEhOedvMIuJORNpiRM6WAm5 elTWAV0e/Uoo3xFMgRaKZeTRBBsCRxzSpMQ+D4G678LE8hWEKMCGas2vU821ThR7rSJB 9hygLbsaoAIjiYx1E7++peiHg/LCYxxM0oXjIyl9xfaqNDD63V7tt/apuBnG/ldbNmLf l4S38qzjU9azU762vvoOSUJ9ZGE0Ge9K8+8VKw6Q7R/xYAoabc61N29I1lhS2fTkldNU hrCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770968458; x=1771573258; 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=rf6tuhR/C8noOBGtiJWJSqtCy1MJr7ClAKU1/3tTK7s=; b=gFZfCLveOVOyrx8yjcpePo1bPmWOMazzKccbKYYNhXvEdkVA50u/kk9IxTGEx1uW9R 2iN7wjxaOb+oTiLxNx/wFvSq10+50jh3NaOhL5nAvPubuT1BKo25rHTgsV/9r5i0UV5J aqXyvS5sjrbs9wRZlFZ821cnHoiybXK5Sczk+Y5+YqWmir3WOjZ0smyoQattcO/hHA5/ 30iwWhbwT22VW4v3Gxj5rfZX4d0YWJSDG1utty1YSU76vW2YyHDpfWnb+3lIgttUiv7d 9MUSa+R2QpsKpOm6aF9m8cB2rjx48b+G70s2pG9vegzD6j50Wy9LJVLu5Kx0PgbIvWaC l66w== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCULPzxm3IvJgAwfdIek01eAbzdXH38ovpEj5FAZDykwH6ptU9lI2hpK6Y52/2S6HVDV8oacqdU=@isar-build.org X-Gm-Message-State: AOJu0YzeW3d/FpcQoWFYNKamn+ClX0Pycdxci5ybfrmH+ItQGX8Tk4ks HR8cJgSK/Z5wgKoWfRvWxwh3qQ+U0uVAfxJgV9OWOOsgu8Yjq4nRpPIq X-Received: by 2002:a05:600c:3145:b0:471:13dd:bae7 with SMTP id 5b1f17b1804b1-48373a74362mr12220435e9.30.1770968457463; Thu, 12 Feb 2026 23:40:57 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+FUd993KhApc2F9hvDm5TUSTZalrVA9LqA3Lab3++RPNA==" Received: by 2002:a05:600c:1d1e:b0:480:6c57:d5d8 with SMTP id 5b1f17b1804b1-48367063dbbls8126145e9.0.-pod-prod-09-eu; Thu, 12 Feb 2026 23:40:55 -0800 (PST) X-Received: by 2002:a05:600c:82c3:b0:483:71f7:2794 with SMTP id 5b1f17b1804b1-48373a25cffmr11098215e9.15.1770968455326; Thu, 12 Feb 2026 23:40:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1770968455; cv=none; d=google.com; s=arc-20240605; b=aLoH+i9NXBhFH4F8sVM3Mb6oBQHyrTGRtCHZ5TyackcOxP/YfJ8fclYA4Y0s6z4NGG kK3uySmhWh7yW+TBTeUgCqBzjeSnIywoM/5fEtKPER2VOJVtwGAQ3SU8SRYuRrPDju82 OBP9eJRSBxrPiMp0ll/elglYQU4oO/M38Ne0rIO5MZfLx8H147/sQRfLLdIV4726fgRk XBZcsLqXkt0mS19cz1Ed2Dok76w7kTRI+3xk+ylUV3ZPce2vVab0kBF8NYN5pOrgdIJW FLVdEzbNK9Fepjuv7fRQnj8eZl0W3WW9wcjvtGoAK7hmhwMseH4Q4ZgLZPPfJSk/MW8U qFmg== 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=qiU7cYlwElYWZgStrvP4BUnOIcocag0RA1ZZFNG3LSs=; fh=403AV4hwEHWB4lTYzGdOyLsp6fLjI4P6I+0rnADDAes=; b=PjcIEsFk6N1zAJT9apPiaCNb66krwE66xA/8q2oGFiIe0iSdicpd3/GEAIwJgDF8v5 VIh9GLbceZkJzTtE49wqrhkXZNtQRLBOmMNElm1Z4M+en/yEfajm7sWgykiQcxUvDw+o ZtHOAuNv0hULbxcKR30U5oIcju1HNnEb/33TzSO4B9uDnJ8t5cGE/c3fcYG86n2bmGEm c++86hXDMC4yMvcF8hJRF432qbrx5YRBkWaEpOWRsIoHb+IK7qS9H7JEK7KBDfa06K2p 9SfUbdMNEp5DImMItVR0C5EH/CqVhDZB4LNT2vinPqGbIk9SVqPumNm/4PGL33CtsgB6 UyKA==; 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 5b1f17b1804b1-483709f536asi223425e9.0.2026.02.12.23.40.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Feb 2026 23:40:55 -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 61D7enLx026889 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 13 Feb 2026 08:40:54 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Uladzimir Bely , Anton Mikanovich Subject: [PATCH v6 4/4] meta: Deploy DTBs once per kernel Date: Fri, 13 Feb 2026 09:40:42 +0200 Message-Id: <20260213074042.76277-5-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?= From: Uladzimir Bely Task do_copy_boot_files deploys DTB files into the same location for different images (e.g., isar-image-base and isar-image-ci). This causes a build error. do_copy_boot_files is called once for every image recipe while dtb files belong to the kernel which is the same for both images. Performing dtb deployment once for the same kernel solves the issue. Introduce `dtb-files` recipe responsible for extracting the DTBs from the linux-image package and deploying them. The kernel package is now installed into sbuild chroot. This is achieved via the respective dependency of `dtb-files` recipe. Fixes test_dtb_deploy_images 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: 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: Uladzimir Bely Signed-off-by: Anton Mikanovich --- meta/classes-recipe/image.bbclass | 15 +++----- meta/recipes-kernel/dtb-files/dtb-files.bb | 41 ++++++++++++++++++++++ 2 files changed, 46 insertions(+), 10 deletions(-) create mode 100644 meta/recipes-kernel/dtb-files/dtb-files.bb diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass index afe6906e..06b72b09 100644 --- a/meta/classes-recipe/image.bbclass +++ b/meta/classes-recipe/image.bbclass @@ -381,6 +381,11 @@ INITRD_IMG = "${PP_DEPLOY}/${INITRD_DEPLOY_FILE}" # only one dtb file supported, pick the first DTB_IMG = "${PP_DEPLOY}/${@(d.getVar('DTB_FILES').split() or [''])[0]}" +python() { + if d.getVar('DTB_FILES'): + d.appendVarFlag("do_copy_boot_files", "depends", "dtb-files-${MACHINE}:do_deploy") +} + do_copy_boot_files[cleandirs] += "${DEPLOYDIR}" do_copy_boot_files[sstate-inputdirs] = "${DEPLOYDIR}" do_copy_boot_files[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}" @@ -394,16 +399,6 @@ do_copy_boot_files() { sudo cat "$kernel" > "${DEPLOYDIR}/${KERNEL_IMAGE}" fi - for file in ${DTB_FILES}; do - dtb="$(find '${IMAGE_ROOTFS}/usr/lib' -type f \ - -iwholename '*linux-image-*/'${file} | head -1)" - - if [ -z "$dtb" -o ! -e "$dtb" ]; then - die "${file} not found" - fi - - cp -f "$dtb" "${DEPLOYDIR}/" - done } addtask copy_boot_files before do_rootfs_postprocess after do_rootfs_install diff --git a/meta/recipes-kernel/dtb-files/dtb-files.bb b/meta/recipes-kernel/dtb-files/dtb-files.bb new file mode 100644 index 00000000..6f1ef146 --- /dev/null +++ b/meta/recipes-kernel/dtb-files/dtb-files.bb @@ -0,0 +1,41 @@ +# This software is a part of Isar. +# Copyright (C) ilbers GmbH, 2026 +# +# SPDX-License-Identifier: MIT + +inherit dpkg-raw + +PN:append = "-${MACHINE}" + +KERNEL_IMAGE_PKG ??= "${@ ("linux-image-" + d.getVar("KERNEL_NAME")) if d.getVar("KERNEL_NAME") else ""}" + +DEPENDS = "${KERNEL_IMAGE_PKG}" +DEBIAN_BUILD_DEPENDS = "${KERNEL_IMAGE_PKG}" + +DPKG_ARCH = "${PACKAGE_ARCH}" + +do_prepare_build:append() { + for dtb in ${DTB_FILES}; do + dir=debian/${PN}/usr/lib/${PN}/$(dirname ${dtb}) + cat <> ${S}/debian/rules + mkdir -p ${dir} + find /usr/lib/linux-image* -path "*${dtb}" -print -exec cp {} ${dir} \; +EOF + done +} + +DTB_PACKAGE ??= "${PN}_${CHANGELOG_V}_${DISTRO_ARCH}.deb" + +do_deploy[dirs] = "${DEPLOY_DIR_IMAGE}" +do_deploy[cleandirs] = "${WORKDIR}/deploy" +do_deploy() { + dpkg --fsys-tarfile ${WORKDIR}/${DTB_PACKAGE} | \ + tar --wildcards --extract --directory ${WORKDIR}/deploy ./usr/lib/${PN} + for dtb in ${DTB_FILES}; do + mkdir -p ${DEPLOY_DIR_IMAGE}/$(dirname ${dtb}) + find ${WORKDIR}/deploy/usr/lib/${PN} -path "*${dtb}" -print \ + -exec cp {} ${DEPLOY_DIR_IMAGE}/${dtb} \; + done +} + +addtask deploy before do_deploy_deb after do_dpkg_build