From patchwork Fri Feb 6 12:27:24 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4849 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 06 Feb 2026 13:29:30 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f55.google.com (mail-ed1-f55.google.com [209.85.208.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 616CTTYW024644 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 6 Feb 2026 13:29:29 +0100 Received: by mail-ed1-f55.google.com with SMTP id 4fb4d7f45d1cf-6597f439a10sf171493a12.3 for ; Fri, 06 Feb 2026 04:29:29 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1770380964; cv=pass; d=google.com; s=arc-20240605; b=OL04/T8Z2NrK3+9XvGVqWInv7x8tqoZlow1BIWNs6+HLmeK1Hcmmv7pX6Id61nLXOa CY/MBINPJJPpVUyEdocCo3KWKZHyMUN/5C6ujoO+/iJUC9WShJvRraLB53h54yERm2xv QTsJ4nQNyKOiG3eTV0KDS8GSRi4J9d64lAJ9gAQicD/s/xh6qmmLPmpUyn6B5QR94X+m to3cYvQH2JrB/DOrvKPA+b74yU6ud37i/rS2xUP+LxaQeOPzOZ2kzMGyvldEfUdrEJos 4O/S41yAWHW4u1hewAGItA1WIfQ28NnHrgqxrIwXpEGHBvkm1s3gpatQsvCVyTRDZ3kV 3k6Q== 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=CM8j2HsNzznUpF4bhoF39BEULYV1ravlhR7aXrtdgbg=; fh=Ly9cqz4GucNu8AZIpo/snxv0YlhvGzo6YKjoZO4cCXk=; b=iPYl/7TIUs01Ow6wUepAd1sZNG/fgg7cpm72HHGrgRQTEZ2zpojRUl8sxG5074XX8k WLZdROAYiCbHblB1gQhntDDviHvkasEQXHaM5NjhpgbgAhrA/BilxnLqshJngTIiH2yk PXNOjI/9Q5laOcwjn3r1hVBQxESEZqAQ/v4BwadwEAcjsNUPGwApD11ZfgRsSfk+hAGr ol6vn74bO7r/zBVt+rCVHEBXSIEoBiZzJm9M5LAeZJR76adU81PWIw6fNwv5dYYkQ26K ls/g32uN9pT2sjaCzzZxSR4CzqQTAotQDjR5y2ofIi07xJU7dJodmcKC2ylz3KS3Uoan oeWQ==; 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=1770380964; x=1770985764; 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=CM8j2HsNzznUpF4bhoF39BEULYV1ravlhR7aXrtdgbg=; b=DXuc+hGPdg8gDEWA5eiYaIEphZTGhNwhtB84Mlrwxsk04Y7PDvWbFFedfnPMegA/Zc 5HEWZo+mCOpjj+9V7bEZ2SADUAI7XwaFkGJAyHCJMdWkp2i+kqlYTJ05G1f4A0Q29hql u5B9xoCv4OJI+xXTDznPJHJUslG+R5ZbDrF/jw/iDAd5Exm960w1ZLkmk+84N7gQJCEq UhJyLz8ZD2eiZ0m7oYvQININx8YiUMv9Fo1kOaX/Ffften+JHtRcG8cXjxyXxpdYxw6b uIa5QVZ4oHinA1lW9hzA8jXYnHPzo6KMCJ6mB2PbmvgnYgL6M8/MbOP0P+2TIk2vzNJA KTqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770380964; x=1770985764; 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=CM8j2HsNzznUpF4bhoF39BEULYV1ravlhR7aXrtdgbg=; b=iDFEMlMgT2RoYy6WpWnd5tyF4f8ZhIplgRJTtxaW1QjgNeDO1bGSyZjkmlgx3p2+1t XnQ5RzLgQolnY7QvJGuXSZxt8HRzFLOuPL2KkxSYdUpBgNtqBKrhkibLtidG6cPq81u9 AlPIYXMOGTblNkzufKgcOcObkdKfVdNXCYti7ldEE0LJBD7pJ1Uqk/nDhPxFnWivd0+R 7blKAwlTzlD0SLGM9pOwkCth2SOoTo2N2Ug9zhwososRUIseDp6xE6sMC8zTOW2mz/IN OsS9wApC52nQOb/Z+xXlp5nWrhO+eKUVaBrRIoAjzAQJqYV0nkTprYvgtL92ovOKyKQj +kgA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCV5gRTWgGCdP8hvmvjoGR3cSYRE8r3u/3a5s7mTwpYCs4MPLXMIRq0mnZqyFllhEry51Oo6I2U=@isar-build.org X-Gm-Message-State: AOJu0YxDa9GoRWWGn+u7qFGOFXKWVSJj8cXmTainorEIVKHRdzsP4rMk wd/STJ6je/FQpa6+lQr+gYu9jUjUyymdpravtCq4rmRUPRyBBQfQ7Ro3 X-Received: by 2002:a05:6402:510c:b0:658:e5e5:de73 with SMTP id 4fb4d7f45d1cf-6598411cd9emr695950a12.2.1770380963394; Fri, 06 Feb 2026 04:29:23 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+Gh1VvCEGv3qEArtTc4y6NoLG04wwCGE2xkiefrNKS+Kw==" Received: by 2002:a05:6402:f10:b0:659:495a:85f4 with SMTP id 4fb4d7f45d1cf-659622984c8ls2361504a12.1.-pod-prod-06-eu; Fri, 06 Feb 2026 04:29:21 -0800 (PST) X-Received: by 2002:a05:6402:2709:b0:655:c395:4553 with SMTP id 4fb4d7f45d1cf-6598416868emr1210051a12.23.1770380961265; Fri, 06 Feb 2026 04:29:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1770380961; cv=none; d=google.com; s=arc-20240605; b=L2VCIA5xZZA2a2FkLngF5yoRS5hyVZEHLyJqU+gKpNg30BJIXsDqmgy3axitsdRXCZ ewJZZv3z0gjFE1eI+Q2f8GCr3JGJDpsNzC1/fGHL1IliGuxs49MquD8QmnjLlDjJvfbn C0zOJ9+Pz0FfV7IU+hY8oYPuwTGY/+oQBMcpzqfIVrPofM4Oym5TgNAj+MzOink6AONW QJnRGkZmTtyMhB99w/nLjq+dc66miifiAGjHd7W5OSbTJwJjjKtpTU7vnXeguC3po0pL 52/Ej/fTOBYmmrStXVZX++XO9mP+h8OOT2hD0itiTzeQK54St17hU9YaCmMpUJZTcZgp 0O6g== 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=KPbNvbAax+ik6V4KMvLjJKEoo1iTMcgqk0iXs8dh9fk=; fh=TJO83ZPiifPcn/eO1vjaK8KBcIEI9UB4e0WXU1YgcuI=; b=AMdNa+GVK0Er7Bsk3l1h/EmTHrcM0k/3k7TPVbu+h/AdftWn3GZFGFX2FflRoXAfQS TqWztPNLswszdLU7Q8dzgHQMsPNbGk2T0H0LYwGduKpiKy7wcWWuc3qMKcqC8TwAYvtx /riCNprr46L8urwzy3P+Xq/TMaLFYWsqyeSYXt9Umsclos5HtNCCPQaiHoVJMYBbDtou QfAz7y18uRtofMzEHr4YQUrlQeHmIyFbG87HyZvDywmLgtPOwJ/3SLKFkko0hdxkaGBa kr8d+IrNOEFPGjbmqGl6yQYHKcZ0AzDbhkV/Ug0SJ+ZD8l4t3FroXIOyW1fL7HTrsjLk xMxw==; 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-6598400bad3si44512a12.5.2026.02.06.04.29.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Feb 2026 04:29:21 -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 headcrash-nb.. ([81.198.135.230]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 616CTH1N024605 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 6 Feb 2026 13:29:20 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Ilia Skochilov , Uladzimir Bely , Badrikesh Prusty , Anton Mikanovich Subject: [PATCH v5 1/3] meta: Fix do_copy_boot_files error for different distros of same machine Date: Fri, 6 Feb 2026 14:27:24 +0200 Message-ID: <20260206122910.248334-2-amikan@ilbers.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260206122910.248334-1-amikan@ilbers.de> References: <20260206122910.248334-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. Also fix paths in installer and testsuite. 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 f11cd5af..8047c42c 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 6 12:27: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: 4850 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 06 Feb 2026 13:29:31 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f63.google.com (mail-wm1-f63.google.com [209.85.128.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 616CTUvo024656 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 6 Feb 2026 13:29:30 +0100 Received: by mail-wm1-f63.google.com with SMTP id 5b1f17b1804b1-4806cd00e02sf3387155e9.0 for ; Fri, 06 Feb 2026 04:29:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1770380965; cv=pass; d=google.com; s=arc-20240605; b=XA+XIClYa4VqnfxLWqjK+n8kCRJ/SRfolebQQ0u+6BITAtFL/GbilLX4QDK0gc08YU OBrV+JsXWYrnERaE/DU6p2dc4ZGJiETosyc9m12K8EcKB/YKwKcWEEMGXrojNE3KFw1c NJrKMIF5i0ucTWBNRV5eRG+5ErcD3gb1qc1qUc53QVBgsye14lmC+5CjJ6WLTyEzAPKy P0DEgD+Go+ka3r8Jit4p1ZUD4KRW4gkHIdF6n8JvxPm2j9EXRTZlkO3n/OKJrRsrOQ1K r3FJrPn/F97ZVBmp+6rND6t7obXVc64y0pGgytM6cW/47CkWWp0xBrQbXGWIMN7SDFRL G42g== 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=y3K3QwVNmVn2XbnhesRaIbQU7bPyH7gZi1mn/5mVdiU=; fh=e0JYni5HhADFXv35HfaucWnhelkb9tYt64XU+xFkKZU=; b=bM7kGdWeYT7LnfOv2/4mhGvaKGtcX54B7TZfdB7pmG9XltRsC+Mkj7Rjyf/MdeWScH WG1LXbt34bfwEb+2j71kX5LffVwkK867rBg1caIASSC+q8B+g/u4gKwLQHxgfY9wxFuH BnH/JzYd8RAfuegpUkEmkXXkx+cfeedkFC8g0v2RGHy2vIRyBCFxAI81fJppnc6wtVqi /FR1iZy4liAdTzm6/V+KxlFkdtAVlT3nPdWIpdZXir7SUbAdZiApvNFvzFm8gOyZ8Bpy 8WYdQYH7u4PChSQQusNnYkTFv6I7c+Tl5NK2cqowRyrdiemDmT5fH4URUeDCv2IuF56i DK7Q==; 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=1770380965; x=1770985765; 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=y3K3QwVNmVn2XbnhesRaIbQU7bPyH7gZi1mn/5mVdiU=; b=oZ/vQt2k0cRjLyx+7Q/x9Ze+FipU0CETioO+bDxeqIgIdhSKn6YyxG+Pp/TRSAZ6kD r9ewDcgJ171N1PMrqwFSOcmC/yY80+DJ1Sj2k95R5baaHqrNDNM4VxoByp6s+Q0Fyn6D Oc8DxOQlMqSGT69UtHmTKrM6HPdMuQINgAM2b0y7sLPl9NLD15v8f5M2edzBEsrDlbev E9n3MCnLeQciR0NRiBV5RVGW2IZvunq1FWpd1LEw1olV/R+YMtL8CS0SAZwMDwhlKd1N SlmVwwjwLYPYQpx7sewQTCehzbI1y2fIqb1odpacbPEbndSEyqihUdll2Uxc70UV7JfO IRsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770380965; x=1770985765; 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=y3K3QwVNmVn2XbnhesRaIbQU7bPyH7gZi1mn/5mVdiU=; b=GJ5qthQSHQpBz97eABZBW+4DdjnWJC3dkIqG/q8EDqDmAcpwSUVGIE4vKbuqdzZK5F GiwgVB1GJkdepTUf+NNIevpaL4K/plctMIVyIR8awX7zNw4EgqSiuf3ATJsqjC3LLcFy RxgkrE2C/vjg/ybnDykMd3k0A8YI47oKEMvdWmhWiYD0um+sEIQiUkvZkf5ftjjiCwu3 0RXkGzOp6SmlafgAtHzGE7LsDSdGGEHbQcRhzb6w4JTJTclNGNLFXA0AhFEYtbTHNq7U 87pcAOnUPqgHuS/jaNG2tND0Djr8Pc2oeMnzKvdPEvQbjoAfriJIR894iMvijeE6JXpf dSJA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWnG+YvWaUZXGw3ew0wK1DNmXFTrghlimgNVGDXB9yHqYyjsj6oiHY9zWg8TYrvbcgjQw8cQI4=@isar-build.org X-Gm-Message-State: AOJu0YxBFKB67Q8sfSql/rE6dqzYs1W9MeOWQ8dHsWXAS+7AsZUOwV3o HkvlzDg6lpNmFL8GYLbm5PmTjAtshfDCYk2xRY5Pg9FeBlOmlgamC1PV X-Received: by 2002:a05:600c:154b:b0:47a:81b7:9a20 with SMTP id 5b1f17b1804b1-483201e17b5mr34489075e9.9.1770380964509; Fri, 06 Feb 2026 04:29:24 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+HNL5Pwg2YCdzU6E95fn3sJcGsDyd0TjXEVoVjTXKXb/w==" Received: by 2002:a05:600c:4704:b0:477:5a45:da9e with SMTP id 5b1f17b1804b1-48317523daals12535245e9.0.-pod-prod-04-eu; Fri, 06 Feb 2026 04:29:22 -0800 (PST) X-Received: by 2002:a05:600c:458c:b0:477:b734:8c41 with SMTP id 5b1f17b1804b1-483201da2e1mr39334695e9.1.1770380962116; Fri, 06 Feb 2026 04:29:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1770380962; cv=none; d=google.com; s=arc-20240605; b=F2yO3cR2F6h9+4htinGG6/2kRvQ6637lqLnXMkcuy6rnWbIzcgYYD1vRasc5PD74Gl Ix92NKYYRvFZY5YHwfSlgKEBVWS82wBiGLgP4yq7pQExqEpi1bgowxcdHAc61Q5ggxvj +veQHo9Lc1tt4XF4kJ8RvVDm0qFCcsRqX/sd/LgE1CMdS8oHMr4rDvlpA9smW5g0bfQo /vPaSSjHVqPgOT6yge13NTPY3sl+aU6LTIew8U1kbPmDzBqrQvpKRTqDPnqAjSvnC5cZ q6PFOOdet1LtupFBY40rju0lFsTwelVzqfze5aCjAPkVy9Ltp0sAOtcCQK096GPek1DB IaVg== 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=JxrtymsHQyqWAYseX+Je+i8Ozywq153xkIz3clcD3Do=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=LGCpxdpePRTfU2X9Jw41+Qsbfa4+udUGZYFgjuz7AAvu7M23aZO5Tqe/csaCxvrBVN T5/fPiNG4Kts5mVn6Y3zqdli4+nmf55YU+2KKgXb3WRUx+rK0FMdxNWQ+1D6bDtkhC/B aMmnsTA2c+9qre4lsPcce8xzX7jO210P/ofJ59U+5/7suZKRLnwa0+qHU3G1het45/uX Cv0baVWUBeIcu0PPRdR3x+VNpNfzHGD6I0Mm5RGu8JS4FewGKRfADXtEuQCITue8Nxnc gMhISjzCQ8psLAxpodGZdJ9dDrOhv+QkyZMwi/IMxyMvROjEAueAedh8WbYP8yvI3fTC p1NQ==; 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-48323d790c4si142295e9.2.2026.02.06.04.29.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Feb 2026 04:29:22 -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 headcrash-nb.. ([81.198.135.230]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 616CTH1O024605 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 6 Feb 2026 13:29:21 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v5 2/3] testsuite: Add test to check dtb deployment Date: Fri, 6 Feb 2026 14:27:25 +0200 Message-ID: <20260206122910.248334-3-amikan@ilbers.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260206122910.248334-1-amikan@ilbers.de> References: <20260206122910.248334-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 8047c42c..bed0505b 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -678,6 +678,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 Fri Feb 6 12:27: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: 4851 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 06 Feb 2026 13:29:32 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f60.google.com (mail-ed1-f60.google.com [209.85.208.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 616CTVZk024667 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 6 Feb 2026 13:29:31 +0100 Received: by mail-ed1-f60.google.com with SMTP id 4fb4d7f45d1cf-658b2f4e929sf550104a12.0 for ; Fri, 06 Feb 2026 04:29:31 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1770380965; cv=pass; d=google.com; s=arc-20240605; b=V1eT29m93Ax/nTfzid03/g9MI9eNtaIfWpG4JzaJAO4vM+LF25tb9kRCLec2o1C/Ay XtxHf/PArKLrKBVAsuUH8xcVgMeqBLKiYtbqrHjjOvjVJHm3LcGnM15w/qOBHXMRHp3L Oc0Ojia/vd/J2/dd9jWNWDgeaYUeFMADBI+T86MYzqKh2epLBGkSUI/9hFUzlUDWUjWf cspHMXIDwxH5xekMF5R0Pm3mzMlEaukpJejiQgpZG4jOilVs1RyGDnwSFEb7U6Oaf5YJ Z4aLdA/EXiMBLLV169A9+wZkmLl+42YJ5CqiERWHXP9cUZzlq3mWgKSsHT4wB95OGlt9 +jQQ== 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=N9T/JdLo5OQUDNRvTdLm6pfViTidYxGqED807G7tlUE=; fh=E4q/IArd3t6yUlLM9fCdgpF/cOaIXJd10khzu23ZwMw=; b=QeH9zU0IgQv+p1Mk+7HsAgFYzvg3aqkeM/JkqqZV0O3SvPFC9Ux4LhVvz2ZjJVUl8D 0lwbfpGUpBp6oaEwgYEhZhKtec9zAQ1WVCZT9E0HiJprC5UV5RiGpEXng5WAH0RtxM1A fiLxAUZjLoGMs3qwIam9uuQgTazGtw54cw9dDc7LGZU5d9Mpqeqfz24GRUWJgZsePm+B NeFJTtt9tuP9CtMpkVw4KlEry4hgKvpdkKwyYEMdFIKhbfJ/vlej4VsokuvSkTxyMwAL mT7t4ly0SoyrHuMnnbtyubwQw1sfJ/OK7ktGXvetwj+4iOyMeSI42/r27L5jo9FOS4nW RlWQ==; 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=1770380965; x=1770985765; 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=N9T/JdLo5OQUDNRvTdLm6pfViTidYxGqED807G7tlUE=; b=omIfA7b7gZtqA+Q7RuEzP/oDFYGFEzOwr1TyLj4p6AFTQuwN5xMc1gwUinltJKGXnM FMWWdRKaf5NOPzKGDkcATvHhIml3w+vLkUtsrIFkSVF8zgCqz1VxelIw1vql+gDi3NGX M3F1HgQWR4FoXZb2KvhbwofZu/mKnaViMF1p5EO8A1ZSGoJWXbNZ2ID/HpTKDHUCud95 3oNanGlHX7F/8FQDSwJovo0PY64rdDnZ1IMBNep/Lr6F1Ajj5KG4WNiZQyW13UM5pgEH oDTreRC8vRJfkZCsd1VAaNulF1Cn5gd/nrXKFXZj7w66vqD924juUW+8Dk7j6qNqMK3+ wh5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770380965; x=1770985765; 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=N9T/JdLo5OQUDNRvTdLm6pfViTidYxGqED807G7tlUE=; b=ES17A9BccKa3hBJ5lzFKwCwHLvdZiJ5qZIv0ldmJ2dEo3zC2CtfjTK2x+ma52wPYRp rQuZvLpMTBHTW8QPB4t7d+YFOGF2JVptJeh6wagXvy701P4nkkcrnkPZfsTO02Nlpqfq P9uubqu3lDwwsQbYqqt4kqpBn0853jcF9HiCEtlE4B5Nj14sxuucFc8LAlD9kwgXeOf/ RKLzTI5JN2Fu2q+KC284AvP/scPZwHCD0ysXG8QAkFQRjAkVyRLCAaDR/C+ISzNfQq0C Bv64+roFDl72Qp5281FdLXGuzyXyjnZ7ye5xM2otKkGlwXA2V7Xo3mynyjvOb0UmxIp+ G8lA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXiuyvhvhgceg5PkYwCt1kSsAzZMB/3W3gWPdrD355sOLqApGEHtn5NTWfu40dfHJtgX0SEeJc=@isar-build.org X-Gm-Message-State: AOJu0YzlJv+br33eNftMXq+qWFEp6331JvIQlSrwJXe8q7TKw6rOAdI0 Cagv4TYCz4TB04JQzm5g2SaxcjB70GuXDss/3YyGyP+9Q3tiv+Z54buM X-Received: by 2002:a05:6402:34c9:b0:658:c49a:adb9 with SMTP id 4fb4d7f45d1cf-65984182d61mr1211385a12.18.1770380965188; Fri, 06 Feb 2026 04:29:25 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+G/k883lslp7WuCsgp7qACNtqnHW7mWOL+DQwOLcGjRfw==" Received: by 2002:a05:6402:8cf:b0:659:4b8c:bb08 with SMTP id 4fb4d7f45d1cf-659621fae78ls1760379a12.0.-pod-prod-05-eu; Fri, 06 Feb 2026 04:29:23 -0800 (PST) X-Received: by 2002:a17:906:6a18:b0:b87:7042:9aea with SMTP id a640c23a62f3a-b8edf198297mr139043266b.18.1770380963127; Fri, 06 Feb 2026 04:29:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1770380963; cv=none; d=google.com; s=arc-20240605; b=W28tQ37Vx/8UAfZpZslLYLCAS6De8pR3bnPy0o5I5yAcVMRtrxj0ro3ing/Nt44MLa OQiWf3BEQFX7F+yOcAGkvN8rHtqCduNmtfUnk/K5PLvqetWZvuXXBOI0CvyIEBpkyGas KX1rB6B1WFm9frmKvg1vvu0YuEb3klOHkTycfJA5OsCnF1FFgz3jVQe1/GJDfN1H9S10 BKgKeiqClo3PUalsp3YwvTIQU5qXVDxZ2EmbmjcQgYRc4CZAaxVIEkmgieOGQMZF32Gr F4oVYwnsbxIylTwLFacn6pKIxbwPp4HdTNj9W9lbMaw0nuLxeYSxCQ2I4XoX6pQdohAH lMZQ== 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=2xRjZ01TkF7B8s7V+5l08jJyCVHyR8wyBF+j/IJ5CRI=; fh=403AV4hwEHWB4lTYzGdOyLsp6fLjI4P6I+0rnADDAes=; b=ToMlLOSbOMyXx4EPVIpArnQii2XPTe2fffxACZTLDzky9l4Ny3w3TN2hYm02vrY/lT 3TCU9Haksp+HueJuVeveeWDquPtpI+1+bq4dM76MRr0jkor+bfwsFGff9jt634uhug9G lq4fDj96hIPFEaohiGxBvECkMfFRL1e6+vhcSqdhXCEy304HC/1dG4poaWX4JDhZTwG6 tvEVxvI6G/0q3+597TntFDUxJ4YHXB4bBQjHe9oQotbIBKJhemtsY1miUwwqOPPR662n x60tmu7ngKypHCBchHMrc1zGXad8cuh1/VTQ1BvMJHMck7arq4V+6DeV03YVCud945MQ R8KA==; 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 a640c23a62f3a-b8eda72a7fesi4915266b.1.2026.02.06.04.29.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Feb 2026 04:29:23 -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 headcrash-nb.. ([81.198.135.230]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 616CTH1P024605 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 6 Feb 2026 13:29:22 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Uladzimir Bely , Anton Mikanovich Subject: [PATCH v5 3/3] meta: Move DTB deployment to a separate dtb-files recipe Date: Fri, 6 Feb 2026 14:27:26 +0200 Message-ID: <20260206122910.248334-4-amikan@ilbers.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260206122910.248334-1-amikan@ilbers.de> References: <20260206122910.248334-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