From patchwork Wed Jan 21 15:30:25 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4813 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 21 Jan 2026 16:30:45 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f64.google.com (mail-ed1-f64.google.com [209.85.208.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 60LFUiV0004464 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 21 Jan 2026 16:30:44 +0100 Received: by mail-ed1-f64.google.com with SMTP id 4fb4d7f45d1cf-64d5bec0e59sf10974539a12.0 for ; Wed, 21 Jan 2026 07:30:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1769009439; cv=pass; d=google.com; s=arc-20240605; b=c4Cxnruei+/cjBfK3nLrATQurg7xucJCYJjDzfD5nMQG0ivP8QEA/o1e3H+IQ3pwId cACmecLzgLE2Xc1JUmv6X3qirk1PNn5Lug/slf7sALBWmGhnm2fyjyoEw/C3gf5UqMWO VqNNgLQLeEvpY+BQvovSGu+ZyDurTs4r7mcaDAHHuJQ7BP7HJsWS1vJSu2BynAF1LeLJ NnTUELcXYRLPvC8VE6GVuPHalwE1KjhKrxcY44nKUtwG9c1Q7680jv8MH55jELYY2llZ MwzTqhwKA0eo6hnGb5QhYuYbkI8y9ol9nFN9XDq0mZ9CxPqvOOhnWri06485I+Lxm1XM weCg== 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=yTDBKXbkYtk3nh6zhSaUl76fDFslOOreCjkx1MPsjDA=; fh=BU3eSAPrOEfOFHm+opZ/6RD2n7ndyzkqKF7rSCFB28g=; b=V6VmDc2zMSiBuVb32FE3kA6NCb/+m9UrsvMl9h2knNrFmrLFDIt/24dmdM3WYU9nt+ hYY+NpTcw5T/uRDdsS0J+9noYX2njYvzGoVIE/DdhXvEklrfOCJ59AmfvRrw/EY2AXwc gHF+OLP8Ye7K3Wqq8memaYcfJi1M9totkaFhuTVvQZsAQODd0py8IOMuXsJdahyWiRXe 9Y1abV9Y8Ll4QBDAuHIC6ivEAdwma94R3+hukZiUTjF9EhmtBVsJz/zw2hl5lfAXShHf nt0puTbOU2EbzZoiHzUmxurDasP5jWtnd9gQY593QU1dYSAUPA15/03n6F3lXAB8KmlF NN+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=1769009439; x=1769614239; 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=yTDBKXbkYtk3nh6zhSaUl76fDFslOOreCjkx1MPsjDA=; b=mqKfcwL6BwwjHPynA3ltl/F4WvSeCiNtM37hPPy7t0xp2RiwsvUkosgGATxFpBMUKV DFt/JzIuE3Sjyzsy/FztvWKhfDZWGOPFWHEz4zSWAYWJhXYuOl3z5uLgUhC5Uhd0LJLi Vh24XQ6m2qYqAC+v6JyURa+8IIO7+pLRvmGAGMNOBxL7DBu4sWxXjUOs9xgWkMYbx3/Z O+G/PqixB3kx2QwraioG7b7Y3ExoE2neSWxtBh11ZLBH5CtWOL3/kCpO4o6ZHTyFHcPn 758F794JztLcLmQfMFtBH2Cdg4KRieDLjsgAi2sAxQrpeiDa6nNNEFb51DTTD6nW/fyx hwzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769009439; x=1769614239; 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=yTDBKXbkYtk3nh6zhSaUl76fDFslOOreCjkx1MPsjDA=; b=kMr9iS+8LrCemMTDyyWu8QuK7mqWYSYF+DJtpQLg/f/5sdXv2rGSXVW1rYakWQsmBp IAiTUdmpEITpPI2g5+utpexrOWIW595n7Tj1rsNk+vPOHFe2YkA7gniTWxNZuGrYWiJy avXssyOWZZEzSWJVDZSIOp8/AZ15aDy/r6RF/u5nz/kq+OH/GkJ4KMXiCu96XUdMjJ4Z e1D1eDsZyENARmkzB5m2aNqT/LdXKlcwlQnEPKSCa1+t+09ECQEKNx93dWOEadcTicnV DzJPyCGIyervvJuORuc3m9rvaqEGrlN/UIiBojEYFbVctcpV8EOeZC0Pd7Bc1sG6ikwo klUg== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVzt0j4URZ8Buww/iGe0O3E2/3o/A2Ro1ELUQ1YpiN8ShsRaIkB2/Go3VbUtwY7i1pOTuWJIp0=@isar-build.org X-Gm-Message-State: AOJu0YwcUvhs/E69dnqB7ZuPSV1DSM1MFr8zIvOrHMk6KlNNjjC4stTc Cxl7KXPMBvbZELAZpra9utqf8+CFVyEtQL/CsOzw7UbKUQwHTxX4mhk/ X-Received: by 2002:a05:6402:3586:b0:658:2f4e:b15d with SMTP id 4fb4d7f45d1cf-6582f4eb488mr381015a12.12.1769009439162; Wed, 21 Jan 2026 07:30:39 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+Fidk+VKFw1gArn5zITHZS/x7qaaGXoHws2zveElTO2kw==" Received: by 2002:a05:6402:3246:10b0:644:fc33:37b6 with SMTP id 4fb4d7f45d1cf-6541c6d5e11ls7050069a12.1.-pod-prod-08-eu; Wed, 21 Jan 2026 07:30:37 -0800 (PST) X-Received: by 2002:a05:6402:4552:b0:658:1274:3841 with SMTP id 4fb4d7f45d1cf-65812744fbdmr1850101a12.21.1769009436901; Wed, 21 Jan 2026 07:30:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1769009436; cv=none; d=google.com; s=arc-20240605; b=N7KmcEm14KedFv02g0WdBFo3Z0LSHNLG1hNp9NtWjZ9ZOjZXaix4v8cB3EirBzfb8k Pw9F6XEpd3523RzUhslxUWsFKY/ad/OT8MdnQNWbMmRuCl7BUWj4qIVhkoSboHZgLOkG XvOrNUvUnNAX4NDc5K8n7HBQcZfUuFY1/JtFUiswF+/OoFzuPGZoM1FIkx9ujkJiyXVe RhxoUgN5EmPSa3dDBw0X+jiQVuZNyBznHcp0oYvg4Ve0BYzQV0BFkBxw23sD9apVcIG9 9jGL0OxQkaHItwNry9juw2tgLRBARjM4yN6MRHVboVnN6UQ9VmFmvIbtz9mzvxOKHc0x pD/w== 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=cFbR27nDNCxRWyWqRfIirPSWGJXkRPQ2vC30PkTL8GY=; fh=8Xmq4Esf4yw5dI5c5lgvA954EkhyniWG23Mi5phyejA=; b=Xac4J8YdPH07tv+7WeCVOhSSGcpJmeNTSSGnXbr1XaCTSkyGqiJe3XyUj/8TDtRQIr RTbqMDPZ9CMTVSZPxNtk6upUbpMfyHPNKRrXsDVf2zbfemUJZagWQCRMIKGy3fiWcFom tgQ0vAYyXeiP9cg4W2qr+CMPBATWOSyf7AZLuP05GAnn/fHly1SZpy/mWRsKzfmhnoZX RkGZQ2YMV1Ad+tpK6ZU4Utq4ujpQ75WThzZK2y4t5ovYQ7jbJjKiJbcT60GzZooBsHzG fTfPNWXvvO1673Ejt345W1Cf+2VstMgvxRwGj4nOn0EFpFVsaWEIEouFjCVjIT8OUDwx YnlA==; 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 4fb4d7f45d1cf-654532d75d9si415874a12.8.2026.01.21.07.30.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Jan 2026 07:30:36 -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 60LFUYcS004423 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 21 Jan 2026 16:30:36 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Ilia Skochilov , Uladzimir Bely , Anton Mikanovich Subject: [PATCH v4 1/4] meta: Fix do_copy_boot_files error for different distros of same machine Date: Wed, 21 Jan 2026 17:30:25 +0200 Message-Id: <20260121153028.869575-2-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260121153028.869575-1-amikan@ilbers.de> References: <20260121153028.869575-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 with the same machine (e.g., phyboard-mira-bullseye and phyboard-mira-bookworm) it happens that some files with the same name (e.g, DTB files) are deployed to the same location and this causes build error. Use DISTRO- and KERNEL- dependent deploy directory. Signed-off-by: Ilia Skochilov Signed-off-by: Uladzimir Bely Signed-off-by: Anton Mikanovich --- RECIPE-API-CHANGELOG.md | 15 +++++++++++++++ meta/conf/bitbake.conf | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) 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/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}" From patchwork Wed Jan 21 15:30:26 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4815 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 21 Jan 2026 16:30:48 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f192.google.com (mail-lj1-f192.google.com [209.85.208.192]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 60LFUmED004490 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 21 Jan 2026 16:30:48 +0100 Received: by mail-lj1-f192.google.com with SMTP id 38308e7fff4ca-38303040a01sf32693651fa.3 for ; Wed, 21 Jan 2026 07:30:48 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1769009443; cv=pass; d=google.com; s=arc-20240605; b=Mx4HA/tn9QKxDbgMtMPTQ8kEylMnlzs77L23DXyI6ESXNgUL8lQg3JB1cXTyHTuZAb oY85THAK5vhQy2vy/kA9u8p1L0OaJZ8LhqUv3LQZlcruUG3wW+l2NupXt+QOQ4Knbt5+ Uh1NiwZ2SPBPU88Y1h8lQQEOKrbqE/FO5JDtOQA2ARggWxzPyrRVx8tjanN9YfJEnRQY TFwJlSoLvxYfoz5EflSjVGQcpYfMLvWjKA2HxH2dDPEKOAE32CbrP1lo5PavB2BZitAM /vG2ddJEBRFOv4PYMvoPCiGxnyS/5Hl4YAdFOz6M0CCNVrPvrcdjLXI62liwwnfUl+Ra n3qg== 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=ULibAPl1TwLpvRIHiQMyRQ5xnEJ9gBrLKHdCoFMewG8=; fh=OocHerLAbthMoc5s82F8BJ9RbL85hJYrFWUD3s9U6WY=; b=isNhlbyphoVvKZwoulWMy51Fzu623WNZ38Hqle8+MioM8Fl+7x91CjBQz+u6ZCF1n7 cnaz5ee4uR8exHeQIE8hcTqZa0chB/GxudK4fRFRAdtmfomJUyeLp2EH6PtDrcahF5nf l6o7FNq5s/Y5/7BYuMIMCbdpAsM//LGhRyH5kUzCzk3JUfDu76Imxj1XwUMc7dTo0oOG 0dCsOfDo1ip94VKkQdPy3g9vJf00pVoe0JoB0kbRWdiveRmYoUPaqN5oul1rIR+/OGoL aC8WNrinLPq7Nn3I0zIb/4PgfYwjLfxvojkRDeMx8lmUZ6D/pTju6oHhqB7iBZ46du6H x7MQ==; 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=1769009442; x=1769614242; 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=ULibAPl1TwLpvRIHiQMyRQ5xnEJ9gBrLKHdCoFMewG8=; b=RtSwnpUAnBMze7wz7zUzF0SpZl434ZQGYh028SC+kGF2tqs0Yn6inMZobb7427E4He VAfzF4U+Z+cFGn8MJmYSzkfJwHEcbB9GypdBoyegSa9HY15DpBKH+eM90Jq1HJUxJ3SV AFVYQYl3HatMd1aF0yfjilP1n+HrzlIYECIJB0mx/DdqlY6LS2Ez1BqqGPk45udiOTNt jagbKO/mHI6CuszpYxdLLyMNra4td8Ee7GKymzNROKOxfgl5lkFKKsnbvQP2Nl/LIez8 pueO8FABv9cqDDz3G38rhQCnIoa+LZH0A/OeFS4W8nZyti2Xrf1fevuwp8VnfhyCKroq DqXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769009443; x=1769614243; 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=ULibAPl1TwLpvRIHiQMyRQ5xnEJ9gBrLKHdCoFMewG8=; b=V0zxPgq5XQIesjU7fyu1TkrHuz7Z7XLMscKQz4/NrtylXCR5lgoWLZ6tiscE4P8hFe RjA9Ip44Oe66FmpLPnEM9s2qc3II856OukKaeEqa0K2eliir+++nvB7mYLpbPBkmsVFy ABCA0PhKyuIupexSGR3Q3b6QS3YH5lxS7WIU72lR/pcI5pmkiZbuaYXeggZC1+CwW5kf 9PZAHTRHfBxW07iE1NpPumbtlsNbY4RX7lwfZBYM7G251GSrBTkRlsOOcXwgkDAbrcFW fz1RKB8Go3CC46rw1GS0HMhUOTxI9PsmBMRWJxhgMzm0TciopqNPAB0Q8uU74yz4tQGs WaOg== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWGt9qMhYcKHxzEB4A/6s0Sv9f0apBv3RjpwIAoqax6GKO8+1if3kzOlf0xAzrXj9US//7O8og=@isar-build.org X-Gm-Message-State: AOJu0YwcHpHGRW8ZMltOfCBtCAkrNsoIQbBTCntaCyVHf1NBmuYwCUrF iY+VXgbaJQkHGzQinsBu8cPuqk5U9D7jczPjCj81oVJ8ei1RH7RCFNHV X-Received: by 2002:a05:651c:509:b0:383:1832:9586 with SMTP id 38308e7fff4ca-383866a4e41mr68144721fa.1.1769009442053; Wed, 21 Jan 2026 07:30:42 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+HPS2wAq+PiC4tzWoahKfmuAZY6BbN7kKnG6KrAVZu0Ug==" Received: by 2002:a05:651c:4409:20b0:385:b476:3cb1 with SMTP id 38308e7fff4ca-385b4763ea3ls1262601fa.0.-pod-prod-05-eu; Wed, 21 Jan 2026 07:30:39 -0800 (PST) X-Received: by 2002:a05:651c:19a8:b0:333:e590:1bc9 with SMTP id 38308e7fff4ca-3838692b196mr48619371fa.24.1769009439133; Wed, 21 Jan 2026 07:30:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1769009439; cv=none; d=google.com; s=arc-20240605; b=C0Ihk/RF+RkTHeACUpBdwksR3gsrgnaFF8FK8MFI7OL08tj7CgFqXXfqS4dek4FmEx vzNlaKIW+gqrX102AadXbNFDpnfy8X0Aw/KVoY189YbvmtGn9JUvq8raP5fPa3X41RRn MAyineCmQr20eoWw8j3pCP8L/lXdIscz/OvsrgcQJ/sxPu3RAzeyDovGGt9LSwQICr7m kfQzvGaN+VayZ24jdQzDYiHZpY/HrDnWYpq2HVa8+xDmZgJObdDXrqtJfc/RJtSr/Fo+ AU5PXBMAF+ikXbGj4ge8oB+qyTVLtLsAmV+Ahp7rMojCUnSJWKWWCuCDDlbTwKEoN55K 3OfQ== 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=5z5531UVwf57sppGtyLCkK4/BrLktX/yfh9AA+oVYeo=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=IgWCdrHIZ8kdU/wB1oxSQ290cS3tek+4dt2Wp3heIRR2ITqmuIrK8pAW+vltKvMfJK wHWHV1vpf81+hvwM9DEmlAwh9fHLOVToKsksy4PaIMeoBdzzarvIWrGVSbz+aGgITRZ+ viS0265FCcApPwFZ2La2Ogs+/J528k4irNAZs6G4OQd4thhQEKjVO+Lrs3KlOBhDGcXR 00xxccw7TxV9GRH9oN7qFeQ4n6QyQcItyknJmvBdIxKsoHLPfjur4bIgoGb8k2KyBrJb 6ldgs9MpZJ1kmXApJFdk1ffmTM7S18rIVmc5ZLDwom+LwjSrRBYRpnUUyPdLH/WcdzAt j9XQ==; 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 38308e7fff4ca-38384e285a2si3789661fa.5.2026.01.21.07.30.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Jan 2026 07:30:39 -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 60LFUYcT004423 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 21 Jan 2026 16:30:36 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v4 2/4] testsuite: Add test to check dtb deployment Date: Wed, 21 Jan 2026 17:30:26 +0200 Message-Id: <20260121153028.869575-3-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260121153028.869575-1-amikan@ilbers.de> References: <20260121153028.869575-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 in parallel to catch all possible conflicts between deployed DTB files: - Same distro/machine, different images. - Same machine, different distros. Signed-off-by: Anton Mikanovich --- testsuite/citest.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/testsuite/citest.py b/testsuite/citest.py index 76a3df69..6f744c8c 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -484,6 +484,29 @@ class WicTest(CIBaseTest): ) +class DtbDeployTest(CIBaseTest): + + """ + Build some targets potentially causing DTB deploy issues. + Cover cases: + - Same machine, different distros + - Same machine/distro, different images + + :avocado: tags=dtbdeploy,full + """ + + def test_dtb_deploy(self): + targets = [ + 'mc:phyboard-mira-bullseye:isar-image-base', + 'mc:phyboard-mira-bullseye:isar-image-ci', + '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 Wed Jan 21 15:30:27 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4816 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 21 Jan 2026 16:30:50 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f184.google.com (mail-lj1-f184.google.com [209.85.208.184]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 60LFUnZA004523 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 21 Jan 2026 16:30:49 +0100 Received: by mail-lj1-f184.google.com with SMTP id 38308e7fff4ca-385ba7acdd9sf3109931fa.2 for ; Wed, 21 Jan 2026 07:30:49 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1769009443; cv=pass; d=google.com; s=arc-20240605; b=jUScq9eq6hMu91n1VR2z5RHVYi0HCSuZE1v+bv/nZ2ej8tDiMmCo626abR/DJd6WIo KiZuEggD4sGEl7MGV1MdZgJOGWXs18ZZKM5YOw4MhjiMoyk8Qv5Ei5NwP9lt0hJyIB3C GfdGuJPaZt/Po0t/3vzMu6eCZT/xCOtJ4aizHkkoKv00ld/2SvFKONcRrFzye2pfz5Ya pz9/HbtH2Q0T9sr/MBlkmegWYOmLYD/zqMPRZ69IE4CKAs/BLBJzjZN/VhxHhCykquHZ h7ooELgiXJlyqyhGYa7zt81tWI5f7KZR5lHm+DXQ3cWHXFziTnTqNHVpwR8aHvp4pOMo fjTg== 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=nXxdKp+z8rbsiQ/CD9pzxgzuQtWvvSv5DyfyLU4Ulj0=; fh=cykuVRreSRqojN+iQR9ftbZiFzSDkUel82yid6cdh0A=; b=FQxdRp4v41Y5KL/aIxFrXJ66QXhto1I/m1yEWoiBX62Xz/+3Q1/jQhsUw6OPFcUcvc o6WXJDbPlLiPLFKCAz5nEHchJojZNAfuTcjFbnyQbSuCwbxdIgP+gV4ffg+yEP0dYOVN YHG1pJbia0p0rxFK/lsA/sA1P2yNW/iMx5nzrLN8MtG7TaMrUmXUINNiVemJE1PW0j1U iTC5BSTYnn+ROPozw8G6WJfkaLR/aB/xXnTEvjdKHDtWju3u7ZQx3QdxJq5ttFpeeQlQ NPxl0MXlQ32ybJaB9zw95FQKo+MSG2Bv2C+QjW+vem35xRRcSXRKIhGxDRp9CU0Vo+0a MSRg==; 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=1769009443; x=1769614243; 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=nXxdKp+z8rbsiQ/CD9pzxgzuQtWvvSv5DyfyLU4Ulj0=; b=pa2r+jAIR+psRKl/q1kwMrEzBwst1R8bBJyHp7vf+ACOk54XokeRbHjjYPqifAmJDP QotY6s2vf0iEOWqpTiO91jNYIqxUNeCsKIgnp1lgaHXAsQKzml8zju55OaW6WKUtfktl jXdqr+SHT2Q4QE0C9BdoaG30sCdXST20cBr/W7brDoCPS4WWnfGU3QlYWxK0Lni8ico2 nwVLySCgmfho+zS6UGh1p7mm3dVUP8wIWmbvwAU/kjy7vuniE0AO559txzb0qP9b0v9q wNaKGKtt85mQSJ1Fgj5eGPpovYHPwEdWAEmaHSpxDiLqZ9uFhmmJZsDkXFiUra1EVngT GlHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769009443; x=1769614243; 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=nXxdKp+z8rbsiQ/CD9pzxgzuQtWvvSv5DyfyLU4Ulj0=; b=VHB3p40kpVfwNbMwPBZ3wJ9zR4EtsLyxOrAazEk2B8Cj7defK7CTkpsxNCREPPDjVR 4qIqqRGDKbwoZ63L1o9c52qQFKIJ5ClXUJ77ybl2yClpNiu/dTBCgthH7J1KXRumPhtt 0hmxmdyNo9FgZ+AERIiQvkIzH5z/rO46MCBlxV6zUQO9jABzfvV64pU0Ix6cJxoMehtb jCEe3AGKLM+LsxVYNkHrwUfkFqnF9X+Yy5k2/l+mPmMWeXqqs9qWdFwkgPQiydxdgQGI 4yiRQxWvoZ1FSj4AgbIIuRsfgj2PYplPlzzmphV8l7giauTK/VrO3xCP4irSttiBB8Vx KQ/Q== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXNBvAd+9gfTUY7bX7GGVd00pHLXnx0+FKDX04kifkjByYFrhSsU4Oap6vpZOEXrjG+ECbfpjU=@isar-build.org X-Gm-Message-State: AOJu0YwHzeyprE0TjSGUdnDJOTefFo/HAJ80cbDhqKsnxEqkHh4hnIEO Kf78iUtQsT/xUZLRU86d2E1VD2b3xlIKiOU4q0aP5UjpjASUfICjy+Yj X-Received: by 2002:a2e:8a94:0:b0:383:1b4b:c2b7 with SMTP id 38308e7fff4ca-383841b6c67mr57273721fa.19.1769009442529; Wed, 21 Jan 2026 07:30:42 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+FKooifHaVca+ywna8+dhIvHXb/bPibxNouAZpGXZzx0Q==" Received: by 2002:a05:651c:254c:20b0:382:fec7:d4c6 with SMTP id 38308e7fff4ca-3836edf5778ls6496491fa.1.-pod-prod-02-eu; Wed, 21 Jan 2026 07:30:40 -0800 (PST) X-Received: by 2002:a05:651c:1442:b0:37a:75c6:b44 with SMTP id 38308e7fff4ca-383841489c2mr62971441fa.3.1769009439726; Wed, 21 Jan 2026 07:30:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1769009439; cv=none; d=google.com; s=arc-20240605; b=Fo+4Ae7AKCVCZ6laCs5LBXV7DUyDixSgtzj0wbcROcjdmNQCzfq5FYLhuFZx1ZBlDC +hliWC8DCtZh2HJhRghzFBfYkJf7D5qYsqq4zEqZ5YUzyaN6VFIhBXBmxuFw27+NSpSu bGvX2rBnLrqIE1Ml8hQ0GRLUywfxmnp5mAKg2605xOPDM0o8wNyTrhTPhMIj5aqgWvoM 8N2ZHNQCPwSafZN9HWXMcQST4FkkgwbHH5Gwlk+FlEcQnx57zIzXD5kD7ECsA6FHSnZQ GlQBnAG618IbJA5Tv4yqwbv17gmWPclgDIZxAl5sYzK24DA+Sufrl6a5Cys0iD1OLbIa 7E8w== 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=Md76QeykaGEmDrSOqBOhLy0mDfpJqkwkS5RhBk/kcRo=; fh=403AV4hwEHWB4lTYzGdOyLsp6fLjI4P6I+0rnADDAes=; b=Y1wHJwpzStNvhZeCWl1LY1DkUVhnDuyB2Pvgn6EBRDtenw88wGFuf9l7iHgmIE0Nyr mIFMlOLhuc9nY6Y6xsi9uyfWq+1fFAIfLK/3/MRicRUTiYVhj7y/4JvF5o/VCMieKR/a MVJDe+ujY20PLaYlR68Ir5A9DNF9vsjR1EfeLRCds1LuK64YyDYDDRctNQMevpJcUCjW Kmfa/2BgQchlqxPbaWYfAzhIthnL+3+UuMNNW9y3RLgjJUUQ1jKEbqc+HM8PYW5v8aMW PDd84xREs0naTNOayYlMdT0jZ9nyf1wflUlJzOrG9OqeW8b7/qS2xXp6+YVNmoG8vzQh LiNg==; 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 38308e7fff4ca-385b513d90bsi449721fa.8.2026.01.21.07.30.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Jan 2026 07:30:39 -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 60LFUYcU004423 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 21 Jan 2026 16:30:37 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Uladzimir Bely , Anton Mikanovich Subject: [PATCH v4 3/4] meta: Move DTB deployment to a separate dtb-files recipe Date: Wed, 21 Jan 2026 17:30:27 +0200 Message-Id: <20260121153028.869575-4-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260121153028.869575-1-amikan@ilbers.de> References: <20260121153028.869575-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 was deploying DTB files into the same location for different images (e.g. -base or -debug). This causes build issue. Introduce `dtb-files` recipe responsible for the extraction of DTBs from linux-image package (distro or self-built) and their deployment. Different images for the same machine now depend on this recipe and shouldn't cause parallel execution issues. 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 e605bc80..dc599535 100644 --- a/meta/classes-recipe/image.bbclass +++ b/meta/classes-recipe/image.bbclass @@ -372,6 +372,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}" @@ -385,16 +390,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..f64b4845 --- /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, 2025 +# +# 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 From patchwork Wed Jan 21 15:30:28 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4814 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 21 Jan 2026 16:30:48 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f55.google.com (mail-wm1-f55.google.com [209.85.128.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 60LFUlTM004479 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 21 Jan 2026 16:30:47 +0100 Received: by mail-wm1-f55.google.com with SMTP id 5b1f17b1804b1-477cf25ceccsf68365615e9.0 for ; Wed, 21 Jan 2026 07:30:47 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1769009442; cv=pass; d=google.com; s=arc-20240605; b=CKJkGnpM/k/eSs0XEZnzCHRZLjRCHP53WJ1F87Pw3BHZOWvVwxLwGiJPwK8kVjoSB6 2+tmB/fVxEPATbN13cKFws/JUL2VK5WwxhdN4Xb97NqgcZBDja7h8Chbe05B4zCrfc// hyu3MjrYlCUBvmIgWUWYF3pdtk5T4qwb7D9X/pn/niIsru/MBhnbqJFEIcJee79bWn7d SRcogHCe4Tv1qK06qLt9yVQIEq10M1KkzQ3hOvXwI4L9ml+ukbYp92/7VINYT+fR0pyx bPpCzmrwNZqZhZIDbBkySIpq0Rx6bBrwvt5DYqZwWX22fIxVb8OUp6qfdojOGx5BMUdg 9/1A== 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=lFu8olo2bjP8NkidVGvqspikPzDUOQhtVaRDEujCp2E=; fh=B0Zf+Jdanj4Bf8o5h/eeymN2WD7rN1tBB7kk93yJe8g=; b=NaBpoAu4N4AbyU9U2Bxvzz8HBu8OLWR+rxCmbv0JDmZi0IUyd19fMiITPILDLTo7Q5 nHWSY4ltc0iVq3ZHl3J30ZpE3+LiGA10McwFI6DhFfjHENC8clSmwwswwRnub4R3IOtK SS64I8nS1KBr0/9Ac+UmgQG5dAZO2Kq1Zg5PeJcB1nqMOZsuOr2qF2AYvj/+NvEJQVzz bKvMD6qvUgXTnXd3Xl5tRtCHLt/Nsjq0uaXPUrW5m0FNbEtvGcqFVkUKRrzqhvK2KUP1 2rkd0i1FS0Q3e8A5nZNjxmfBHKzYxG7s5SpHY91NBb0cRZ+2NMLYHfi0NhWUBuQEogif V5IA==; 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=1769009442; x=1769614242; 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=lFu8olo2bjP8NkidVGvqspikPzDUOQhtVaRDEujCp2E=; b=sP2tpjE99kUYWg9HeZrUx5ry6gqhmDz9JQOU47U+2/uCoAU3mvRxk2oCv5oEkT/8+n PLcDiaF0HgLWkfCWAs0y9acnM26i+8EsPIYuNgpz+V4kEh3GJ6JgbF/MKGazkfTqqat9 bWzdaAF+giN9Ty9sQDobvw21+vmCIQAMcHb9HyNzq5zy5kuUHD5WriBanz7QIk9HZ7yf 9RwpEHug1lzEGQx9oeYTaZpLF9ehUF4LgQj4/nIEV2NBzjYytniKEOT3fF11n0QXXSTv EwMINCkq1KOamF+BFQVi54CL14Hm5me0U8OYG+5rDANiN8Y5I6/3uXJ4LDCtCJwtPYxI APRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769009442; x=1769614242; 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=lFu8olo2bjP8NkidVGvqspikPzDUOQhtVaRDEujCp2E=; b=pgyZs8jb0OirQknFhW7YOjiVAtG3Bw0tBMA3cYVkx7vQMTsOB0GaDFbMRIpUBupa0M nE5J9o8kxwtZvfozL25i/chsHvM5q8yWE4d/MRkvwRFT101TAOw6/CxevP3apPCaebq6 2LbpcffhVHHhdFVc/C881EZSqNnxgTPzV+Q8/0QB787UT/VEUw1nO15QN2EyYRxiWkGV 33jWVRCVYaZCh3Huy5BYxABpSq48Lqi7XON89mzW3+qcmLluxiVvlI1OO5RvOZHDeAmp 1MbQtPJ5YLaQOc6o/zuNd1itFn0eUR8G8j/iLjnS7zIydA0T2pVl8842ci4K+CD6WctQ tPdw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCX5dHA6M+nyRrw3mCOdrrdXwFOSDoIOnXHAJUCeIb4TajEu2GIpxB6wT0Oq2Oi7nLFcI5LY5wM=@isar-build.org X-Gm-Message-State: AOJu0YxeMRJiGHC+bcN4MxBdpl3QsWB3fhWOtGUALoRVNoCz7V+ubCX/ +v/fwltUT9nR7HrT1tCzgmYNU/9e6kOYucm4UM8U0FqM1cyUI+aql1ja X-Received: by 2002:a05:600c:3f10:b0:475:e067:f23d with SMTP id 5b1f17b1804b1-4803e7f03c1mr80320935e9.25.1769009441715; Wed, 21 Jan 2026 07:30:41 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+EjvqOa1PGJP6++m2qqqtT9KClXw6Ax0j7eE99zxU8Xbg==" Received: by 2002:a05:600c:1c02:b0:47e:e788:97d2 with SMTP id 5b1f17b1804b1-47f1a8dfb4fls49023555e9.0.-pod-prod-07-eu; Wed, 21 Jan 2026 07:30:39 -0800 (PST) X-Received: by 2002:a05:6000:186f:b0:42b:38b1:e32e with SMTP id ffacd0b85a97d-4358ff6265dmr9583914f8f.46.1769009439159; Wed, 21 Jan 2026 07:30:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1769009439; cv=none; d=google.com; s=arc-20240605; b=E4FgoeHXVSQBr0AmJ0c9/1OYkTINUvGObBH7VpM9Q29tbSCs7IDFmD64h15/6QJsM/ z53Eaq2bjEIoOfhTfkwSMMCDAp9MKXC7gc2igT+Y8ZvmAf+YJ2Tl4xOfoL4TxI26EL0/ qyR/NpcIZ/EJXFwCfhwGRKMeLxfwduRjA1C3oh/HURcEQG2vT5xk07cTX6GTANLIKWuQ dUfbeAN/jFS3vbkzNsPjxDGag5IAMPCqxmksamYAAzbtmLDdarsUoyfEQR59c81RWtLy 1tQOiXldhd7F9CenzgiZlMG7FjxzGwlVEuAeMNfID+ilV1QXxTE+YeN+mkNECMrBEv+6 vyDg== 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=/p17hzaJQ/cqHDIVPh7WaHZmdCbWzbCKGSwMBxm476w=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=DNRxas1VWvWRNL8hh1JXKC9N/LN9ZHfeezRrIDUcXrKCxW5P3E01FVM4yp07+QkAqS zRQ0Cb/Ln5s9yo9vnxZc8iEhBWaCa71nS1UG595dFWI7U/qcKXpgAPBNvNg425pObdNO /nXyw4eXR0dXMPTgvp9INAkwDoUr4FqRe8mUSpibmIHhPB/J4Yl5lIw7rK4Id6rstIsY BckIY5RsWWleBxIxmGXLuF0t3CS7722FO23O6HEyQq0s303wTc0qziALrCUVHoV4pzPe Hcn5FMwgtAplaXM/MtNfWLH+zXQM3GpiuxmschuLmclVA3NIeYVl66G94+wpBys5Q0Jq qmJw==; 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-435903fe0acsi101549f8f.8.2026.01.21.07.30.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Jan 2026 07:30:39 -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 60LFUYcV004423 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 21 Jan 2026 16:30:38 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v4 4/4] installer: Fix DEPLOY_DIR_IMAGE path for target image Date: Wed, 21 Jan 2026 17:30:28 +0200 Message-Id: <20260121153028.869575-5-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260121153028.869575-1-amikan@ilbers.de> References: <20260121153028.869575-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?= As it was changed for fixing DTB deployment conflicts. Signed-off-by: Anton Mikanovich --- meta-isar/classes-recipe/installer-add-rootfs.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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"