From mboxrd@z Thu Jan 1 00:00:00 1970 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-f61.google.com (mail-wm1-f61.google.com [209.85.128.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 61D7f3TT026963 (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-f61.google.com with SMTP id 5b1f17b1804b1-483129eb5ccsf5524615e9.2 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=eFEnzDusHlZzXjcGmI7kEZ0mOeO3X7yZpQmMC6uOnyX7WtyApQoxBbBWyMwXMY4fJm WEk8VGR3RvwiDSlv8UuMddxmLKpfBMIhTRYlN1tN13Qv8CyHcSOA7QrZ5bVAQUXuBSZN Cg5CGseVTwNDM8gjCPdKByke7chkn1c45Gx+vmHE8PZX7BKG7t4ci2uAChoKvJVZug0D N/VG0K/bqe2zEjjqt0fYwKV63ZbWdpugImjmhUDIoBLzJZ+5z+RPci2OMvjlmRoM572i OMneMeggIHavx9JJJ3MoNNHQQO7+GchyubkNXndqycI/QHQJxaIdyAO6+oQCeOEjybOi ksaQ== 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=h9q7y4Dl5eAq1MhJPfLAYa3pPJJZnmKVDoFbgKrpayI=; b=PpLz3LrjUbhQEEP/g6Zlej0j6wrfyFUEcATpV3mIdu1v4DfJY0ECdw8tb9zrOdpF18 2EcehuoIUrLWpJKiNY4tOnh6C+kbxPNY77awGiSl6VQo2us5r8nqBUW+Duj2D0nH2tDu 3n21vzj8CJTlB2VKuk0lUbsR6cCfO0w1oUa4O5ySN2d5fHL2aB7mH93AsitwvBTLDL8t DONrx108QoojwZXM5k38oTIwlQt8FWYBXD0Ta+u+1eUIWqQqs0lRogVtYKekhTNL7U3C da8fs2AUufkEDKXqT7edPfN6UiAZpHJ4MAH/dzjBkPIk+u/JCo2IfmnmXxaWyP+aJBDj o5IQ==; darn=ilbers.de 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=ilbers.de; 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=TiVwCUpoOpQSIRD088Vg+zD/+qDkjrm2FlqXR6dSkzzWeYsIz4+qi8EZ8LCWK+r+CK MQ1u2Z0OgcUmd8VwS6eIiYOrKT+fNRpnY9GWcXYh39TU6oFgXLMR6Yp5StR59RHEyTjQ 2Q2TwecpkjA8E7QBizMRGWLMlKTlcuN/AZtQokkZlajS0YErAiAh/JoBKcEKEjpvAZo+ HLlCRt4whXBAM+ADD+8Lng9+YHivMniaAaRSqLNEzMtXM7ZT+71u5pdgQTQLPYyhA/t6 HBQnlSaLiZPXpJ0mdx04dLes2sD4aV7sBUFZ6LhzYRYwH6Cp0CyveweLeEZY0jALqdc5 Oxfw== 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=jHjPB18cYSnHLpobQfXtDDmDvNjvgrhGlFdghc+rJqvdfxJq0NDz6qCj3lBPz1I/Hd grhNxA1NU/KokpOqN+dqGpgytx5nyiLeQa3+j+piQECjeg7yb6Ua8oEU7hN0KqwaDdga faRDo/BQ8vpOzaPniGgOJ3io8N/3Kz9HeGa7Dm5AnFyjvbrwNWO1uVXQuqKZKfSWoqfF UkFEiNoG4d4PELi7s+4fll/TCeh5IYE+q5hxUVpn0uDuM7KsWPCZvFRkiUQ2SctTLPU8 KmfFVTwmLwSPyG2E855hjAAt0/DCHfc4a7mnMM2btRwaAIeWiMzlUmaEvlZ0zmNT1/Ug 6ybQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXBHbYgtj+t1N2fVdtJly7J9hw0OMbTwbgRbe+kPaV6nKZHWo4uuHrRmW0KKTgyfoyhKRXC@ilbers.de X-Gm-Message-State: AOJu0YwlcYCXS1lE4vp+1VxSOm2vrwq7QVoJEz760PFQrSvKmTIOfyYs frPsqlXzOxTV4XfiPcliyCZoEbxct8IifLNlTxmL/Bd113k6MooWD2FU 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 Content-Type: text/plain; charset="UTF-8" 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-TUID: sOxXUOUDj22Z 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 -- 2.34.1 -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/isar-users/20260213074042.76277-5-amikan%40ilbers.de.