From patchwork Thu Apr 23 12:19:39 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhihang Wei X-Patchwork-Id: 5047 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 23 Apr 2026 14:20:17 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f61.google.com (mail-lf1-f61.google.com [209.85.167.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 63NCJqlr009226 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 23 Apr 2026 14:19:52 +0200 Received: by mail-lf1-f61.google.com with SMTP id 2adb3069b0e04-5a2c0da6fc1sf5769403e87.1 for ; Thu, 23 Apr 2026 05:19:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1776946787; cv=pass; d=google.com; s=arc-20240605; b=UJYEmsbAIHy7mt2fPL7MoWuzQKnzWtgB83b76QgCusTsPfWCjanura3U9jWouXdCXl SwDeaLeAh/HDddgGg1+x/EFNGXVnC37TgdirjjqNISvnfeHiX8htmX3w/W7NXVlrawOA Ip4hnYRhIDKSHvq2gSMKsUHkNg1xcG1wYupu8Ld4DGRVzLAiOEDc/+AP651xaUn6JxbS QZvpN0ZYhd63LRifOFliN5GopOCrNbz/R5RIl2MxxSuCrxp/5UTzSAwg13a+gUNivvqv y+efPBAhnjTW4Ge5C2TMmqyJt0oKR8r27fQB0WsPundO2asD8Ao3g/+jVDct52aRfUB2 dWoQ== 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:message-id:date :subject:to:from:sender:dkim-signature; bh=U46DH2ujR/GdD/UzcGMK3yiWQCsxmevdfCSvT7oKdZE=; fh=Qjlbu9btgK8a0Hr2RMuiOFYDdWVwwvUZ/d3TA7Dj87A=; b=jOPYIglmAyaLz84SUTnX9b8gaUf/BXoNTrgxypAf2assGoRm8HflMNls1I8Z6jQ9YV hgSAZ9Ul4AmBJya98zVm3ueIfDRthlPM/Fxzq46i3ANFPWq86Gz+UtJdACN9oCxXFhkk XdvXSv8s2Mq9yK46xr/MmSkp9usLO1BQLJRb+ukLSyiJOA7IRPeN1vGUWyBKmuGTArJH uq6CeItb7BJy9Gwt39V3LMHf33M67I/VdyxHvQOTnNbGYCZZzvKMDEC4AlJRkNZ7jnkJ LI6S3YGn+piUEi/XK8EJhmclNd1u3foxK/uQ1QDLfU/DmFscg3eZnpc1zTjF2McT738J jsVQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20251104; t=1776946787; x=1777551587; 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:message-id:date:subject:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=U46DH2ujR/GdD/UzcGMK3yiWQCsxmevdfCSvT7oKdZE=; b=gDhBPFPzUp1v/u3ytJRs68rOnecJv3CI6MhMTnMUim0wZ2Bvq6+XjEhgCzgRj1nnnu 8dd5hpHaYJ1MK75ono7wAzJAaSphGhicaQk1Ber8PIkjUz1wHc8Tp+TNJdHULNHbIDUo Rp8Y3WZQcVr32iwqDhIx3J55jcp3bZhK9wV5TChitcKFBNE1TRF7cxFrQdkdA/8IvsVj xrJvuJAnGXwC+kV8ylF1Yph7v42YJKWLOB5dr9JFK8gbB3wrdDy2fjqt+K87q4xtrbDR UsiWmSWS9Aadf79JqJCtckUelyqNynZz67qdZAwCTveD4qaxmLQejzjxGHV0dmMXzYfm x/dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776946787; x=1777551587; 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 :message-id:date:subject:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=U46DH2ujR/GdD/UzcGMK3yiWQCsxmevdfCSvT7oKdZE=; b=OndbcBCAp9P+Llqrm5dYuA698zkRscBfqUypqMJsjxsWXRii6v3/1KdekDGh3dVHiO 5SDxP/Nr+ykAHOQ1OsOr/D3dJd+vW1sputG6zDXwAXmRAFMn+pbMhKHigMbYt9BQsCr1 rSWhl0d8HvOCvg3YwFoaRRAVKcPUgPdJcApK3USw0mFj1RjobUyqsL2CCNQcEc6D3xHR bjvQyAZl2IY72cnMAVqXjJ+vTQFF/BNj2Wg1BGkRAOIIfB+IvcnZnetNwtKiKBJaLUKq sQ8vPEqYBd9ZjdP4NfsCcAKu1wgBKOH6Ggqh16L46rjSSwkxBeF1HmcOeKGkHF1cRLLg oXrg== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AFNElJ8e6Jq2VoT4eV2TC3RWe8vRsrdOhHcu6SjTUXuBpPmTFySHErMn33izoZddfEw/2MWZusTmzus=@isar-build.org X-Gm-Message-State: AOJu0YwLPjcFfYbvYsyWZbZcpja/QAmgIjq3zgi3gzXUKGKF4L7l4q9+ fo6csshkJIldHR7YoZD7rRfdTWAMJh3G88uxFQFrUKCFz4puUInX/LXD X-Received: by 2002:a05:6512:1191:b0:5a1:1de6:bc66 with SMTP id 2adb3069b0e04-5a4172a32bdmr8053339e87.18.1776946786826; Thu, 23 Apr 2026 05:19:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AYAyTiI0VTsRgG7FmKho/U1Ff0E1yymhq0ZpxazJM0/mSngv/w==" Received: by 2002:a05:6512:3714:b0:5a2:c093:42f0 with SMTP id 2adb3069b0e04-5a40e445012ls956799e87.1.-pod-prod-00-eu; Thu, 23 Apr 2026 05:19:43 -0700 (PDT) X-Received: by 2002:a05:6512:211:b0:5a4:1ab7:77ba with SMTP id 2adb3069b0e04-5a41ab7782dmr5041719e87.8.1776946782836; Thu, 23 Apr 2026 05:19:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1776946782; cv=none; d=google.com; s=arc-20240605; b=HgNZ4Cw3hITRd3EdxeWv/Tvha3eD3+YNDhYYVWEdfh/Yi2dTmd/uQ7jcVhFeoa9QHJ cFr9IbUzd21pKV2KcDQREiZF3gbgzDb1sgYUqlVTP0aOaMqjYNStBGdXQ6/b7kFL8fqk S1FYbQP2ilfsTjFKi1pnLyoMOEiUirayKzff+4D8Xq7NMWVYDNhRC5eAQBmMfv/RplX/ 8CnfSXDPuoWJWj9K8qa4FW6uVaBtzu8QJ8Z/iS6fElvjMztgijbCOwiinkDZXk6xIJf1 tq1lvqg/xambobkWRAvBzWODN7ajZs36/K6dKyqGRB4ckFjCTy5DFpjP1L63azNNJat3 AQ9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=YscgdMK720cpaB8f3h9vTFTmYj+8sHRfjWeDgWnR1Ak=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=T80xOoDYGJzSI3X1w8VjFyZT0AHYTe14pZN+yJOz4j0SUxpaE3Ja1YlNxWR/m3jCh6 Tc9uCSV1kVV3XRMvUf9g7cmzeykEy2pZ7tEiufw7vTpGr6WgLb1DWY6gY4SbUeP3aaEl ZzAmIhV8xuBDjArVEZcJ7x2OVd64SNENTfcK+avXmmX+7VY9csTpWeYsBy56vrJ/bnL7 uiqGfTY+ntULr2bLRRfQbbnh7B5yDyKXnDB5oWw2Tzgz+5mT/bEiKpnhMWkXL/2VM0J7 1x/HYcESK+ZrgtGmo60oxA5fV2A79HJoSM7PWiIyeFSLhG+GosdssYmd5znad8Le3505 uw6A==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-5a4187dcf74si351149e87.7.2026.04.23.05.19.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 Apr 2026 05:19:42 -0700 (PDT) Received-SPF: pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from debian-zwei.m.ilbers.de ([88.130.203.42]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPA id 63NCJfs0009189 for ; Thu, 23 Apr 2026 14:19:41 +0200 From: Zhihang Wei To: isar-users@googlegroups.com Subject: [PATCH 1/3] Revert "prefix DTB files with PN in deploy dir" Date: Thu, 23 Apr 2026 14:19:39 +0200 Message-Id: <20260423121941.1704827-1-wzh@ilbers.de> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: wzh@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= This reverts commit 8c34bb25b800d2d0d32a5154f87252a199cd902e. The approach of prefixing DTB filenames has proven difficult to adopt for some downstream users. Additionally, a general solution is needed not only for DTBs but also for other artifacts that could cause conflicts in multiconfig builds. Therefore, the patch is reverted. This revert may re-introduce the do_copy_boot_files error for DTBs with identical names belonging to different multiconfig targets. Signed-off-by: Zhihang Wei --- RECIPE-API-CHANGELOG.md | 20 ------------------- meta/classes-recipe/image.bbclass | 6 ++---- meta/classes-recipe/imagetypes_wic.bbclass | 2 +- .../wic/plugins/source/bootimg-efi-isar.py | 3 +-- 4 files changed, 4 insertions(+), 27 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 856da5de..0e6a3172 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -981,23 +981,3 @@ fragment, this can be specified via adding `${S}/path/to/fragment.cfg` to `KERNEL_CONFIG_FRAGMENTS`. If a fragment was checked out into ${WORKDIR} as part of a repository, a tarball, or some other directory structure, just specify it relative to ${WORKDIR} in `KERNEL_CONFIG_FRAGMENTS`. - -Changes in next ---------------- - -### Prefix DTB file names when deploying - -DTB files are now placed in the ${DEPLOY_DIR_IMAGE} with a prefix of -${PN}-${DISTRO}. During wic imaging, the prefix is removed again, so no changes -to downstream wks files are needed (i.e. `dtb=my-device-tree.dtb` is not -affected by this change). Custom imaging plugins need to be adapted to this -change by removing the prefix from the filename. For that, the variable -DTB_PREFIX is exported as bitbake var into wic environment. - -This fixes errors when building different distros with the same machine, -whereby previously the following error occured: - -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. diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass index 9b5dd23e..26a4ec06 100644 --- a/meta/classes-recipe/image.bbclass +++ b/meta/classes-recipe/image.bbclass @@ -379,8 +379,7 @@ EOF KERNEL_IMG = "${PP_DEPLOY}/${KERNEL_IMAGE}" INITRD_IMG = "${PP_DEPLOY}/${INITRD_DEPLOY_FILE}" # only one dtb file supported, pick the first -DTB_PREFIX = "${PN}-${DISTRO}." -DTB_IMG = "${PP_DEPLOY}/${DTB_PREFIX}${@os.path.basename((d.getVar('DTB_FILES').split() or [''])[0])}" +DTB_IMG = "${PP_DEPLOY}/${@(d.getVar('DTB_FILES').split() or [''])[0]}" do_copy_boot_files[cleandirs] += "${DEPLOYDIR}" do_copy_boot_files[sstate-inputdirs] = "${DEPLOYDIR}" @@ -403,8 +402,7 @@ do_copy_boot_files() { die "${file} not found" fi - dtb_name=$(basename "$dtb") - cp -f "$dtb" "${DEPLOYDIR}/${DTB_PREFIX}$dtb_name" + cp -f "$dtb" "${DEPLOYDIR}/" done } addtask copy_boot_files before do_rootfs_postprocess after do_rootfs_install diff --git a/meta/classes-recipe/imagetypes_wic.bbclass b/meta/classes-recipe/imagetypes_wic.bbclass index c0813223..dd6c501d 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 MACHINE DTB_PREFIX" +WICVARS += "DISTRO DISTRO_ARCH KERNEL_FILE MACHINE" python do_rootfs_wicenv () { wicvars = d.getVar('WICVARS') diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py index 32b220fa..6bc78d42 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -57,8 +57,7 @@ class BootimgEFIPlugin(SourcePlugin): if dtb: if ';' in dtb: raise WicError("Only one DTB supported, exiting") - dtb_file = "%s%s" % (get_bitbake_var("DTB_PREFIX"), dtb) - cp_cmd = "cp %s/%s %s/%s" % (bootimg_dir, dtb_file, hdddir, dtb) + cp_cmd = "cp %s/%s %s" % (bootimg_dir, dtb, hdddir) exec_cmd(cp_cmd, True) @classmethod From patchwork Thu Apr 23 12:19:40 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhihang Wei X-Patchwork-Id: 5046 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 23 Apr 2026 14:20:07 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f58.google.com (mail-lf1-f58.google.com [209.85.167.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 63NCJq7Z009222 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 23 Apr 2026 14:19:52 +0200 Received: by mail-lf1-f58.google.com with SMTP id 2adb3069b0e04-5a3ff732c58sf5576194e87.1 for ; Thu, 23 Apr 2026 05:19:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1776946787; cv=pass; d=google.com; s=arc-20240605; b=MEK9awJUSOL9+mShS3aQdNw7MfxoJ0Du7ezivV5rsBTzEcw1SNfo7z8onkwjw7pEg8 xbj1sepw1dQPn4MJJ2BZMGVlUdF1WeFLgT3xWsDKLjWPZljOx9G7o+ax8vVSdCw8CYEy 1JbszgnvPIXQ0EZ0f/TnWfeZ7f9EVHNPNrKTeUPYzDDJ657EPZeELlHAWXpbe7c8/zcz EwkDFTfQToryC6+EZef6sBwTknkW6rhWTgrhBfT8K0KNbKuJYQsSL671V+vEFKXZPtc9 RXwRzxd0huV7fAb90wsiB6OxRIgcV9+NgpEv6n5bPnkgo8l+LPb+rJY+620XX+c8lhjH s8Ng== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=dsP6WYpLQzN3TJRAnQo+qjYLDGJyedbrzfBnzV5+YYI=; fh=VVevfv6bAwGXcRdtL/vcBOMjaQwcPe6uKP2pGyyfsrI=; b=hi1oNvV25J7YXrBmqFAqgG4o+J1ZrdNli6b+nbiEw8o0mI4YpvtCYS/fhmoeKPZQcQ fvkqFHbaP7IpUKPA5sBgElXee+eH/1krxMSHjIdtIuXY7arSVcTr+wLznQ0lEsEtBXhB wiGslKGYt9oUf1Ojbj3bItvurPYa0UR+bae8Uh35fwZpp/Yf/afcVEY9UewL+I6XnWwV XR4L0V8lIl6rwkS/HnERJq2k+/y6galeCT64xFx0/ghSTq/+OBUK2mQuHS6+Mu3Zh9C6 YxBZABCfeHFhSo5mPsMRAO8yWLq7PEKqWYL+bSGMu03MVd5suxAp9BNlLO38KMebEPzY OhuQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20251104; t=1776946787; x=1777551587; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=dsP6WYpLQzN3TJRAnQo+qjYLDGJyedbrzfBnzV5+YYI=; b=CLQ4Zn0ZFHWfSKBfRT1kcamzxVe5DxWD7cW3efqlcj+7O9cTqZLV6kLN3j5Mf7djvB JnFMSoC2ZZzpsoV9b/uhyxAcns4uYXN0Ux50HZdrGmze7hiTFx7nbODHbm5XJ+x8S59V h1Tvk2jYYBBqDYDKK9K3/jc3yE0XnuEvbVPBYRNh513p/lN3A29XOUBjIqnBSkvbCRBk AtziF3QHcwzAUOegCx5oKXkcvXyG1Dky+l8LynH4MFnEwXnlzIeTgyEieSkh9iGSwGhQ VSao6TUYQod/J4QYCPa794LCQzAGvsrfyzQnW+7HYlZZDBNtaZFjjGi26L6+hAn0uSXV kZpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776946787; x=1777551587; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:to:from:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=dsP6WYpLQzN3TJRAnQo+qjYLDGJyedbrzfBnzV5+YYI=; b=aExUsHHFmB6YTUqXRnVVqNtoJNmm6OcmtufFvKBpwAAVOhAFWeBRVLESNn49VUHfxg aZE3hUsYBIHeBKIbT5foHDNEr0nEH0pADpmmFOTGDNb1VHm1WVoGHc11V0xPDZnh9yiF I4YNr2x1iDgmxfeMhdZOZeda4ZIsbdUhDvGfznHmv4iadA+ZCi5M1z9pFi1+YZvbONVT Ru883HUXZ4g7YzNu750GMfAH+50gK437P4dpK8ZHQeiplVcR4dvqRispvQ1y/Beju2L8 3c8b5HRJTV6/uzWhD8bCsof9QdyXzZPW4ufE9qKIYW1dVDwFwQaARmGgF5Ln0k88aQQ/ S/uw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AFNElJ98UuLkgXfLcZFD/rA90NWTNv7UAmbPcRH4Q4nls7blEBv9PU4D4ikw/T4ULj4epVuxUd2+NT8=@isar-build.org X-Gm-Message-State: AOJu0Yxd+pzH0fIneEVjRHDwXIbdj7tU+4WI1TNEsyeUBY7KnlQkR5UG ciq0FQpVHgO86dSE8jSKLxBmxPLrXnGMg665PGf0Csil/zQLxUPJDFn/ X-Received: by 2002:a05:6512:31d6:b0:5a3:f309:47e4 with SMTP id 2adb3069b0e04-5a4172eeb12mr10136127e87.32.1776946786336; Thu, 23 Apr 2026 05:19:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AYAyTiLqFMWLN8MDmg+fif0/5m+NnXjc1QE0xzIsmXkvTf3tCA==" Received: by 2002:a05:6512:3690:b0:5a3:ffe8:61e3 with SMTP id 2adb3069b0e04-5a40e451beels73424e87.1.-pod-prod-07-eu; Thu, 23 Apr 2026 05:19:43 -0700 (PDT) X-Received: by 2002:a05:6512:2204:b0:5a3:f305:a50f with SMTP id 2adb3069b0e04-5a4172ee620mr7321848e87.30.1776946782837; Thu, 23 Apr 2026 05:19:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1776946782; cv=none; d=google.com; s=arc-20240605; b=GITRGno++iAdZWoik88ayjsVe2F3lrAkXSVTcrRtvEBsS6lb0oU2e8oOtdq30frfSY TflwvhEZRpFA7Qwyw0pR47K4p/v/TVxK89P9oQfv87QppTXWWDKONPJutMXnmC6LZcj9 etNGVu4kfA5aB8cIosaNXJueevicfkpiW8ZWvnFAAYoO7tMPFniN0tqvDICdMAA/2JbI dhg+lnxUT6o1ML51aMFZzNlUOoHYMQ4qSEbep8HCMPAQ+73Ei/apmjx9oBap27OvFpKa VHyyGBaezhQPzLXhelLZqQUtsSNMZRq/C98KHfR5jT2CpntVexgrt09O0jsvJqPNresJ 9fmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=4Ehn7oaaRO2V5buLBZNZBp/kdeVCEW+zLiHaoh8YRpY=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=dLGLC3sCRjaGiPzPnmnlXdpF4Qi7NBebytSjBqjE7uj0IvVWi7uSfR/F666kQZqVTH VKEPfTMZ6rrnWuMZX+b9AfSwrwmSNrA5W9JBhEs23QzIVzblN34M9cYZDNLzRVXTwlbb 1ahgHFf5OQtILE+ConS+L1DUjA77ghMqNwjSWzxJTFzzi1iM0mUEMgvGK3JtXdFPau2m a5jpcd3rlaJ9jS4Jy/cBS3FEy2ISNLIfRSdw4BXZSuCYsf1OZyNji9d0bS7Qjm2nVBuO YP9idW0bHVM7hIi+uLoAdslKaRZUeAAjhKGpNdSkrfGCOLUT40JNYkQMC8CYsfm6fD+0 Q2RA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-5a4187d7a5esi301816e87.6.2026.04.23.05.19.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 Apr 2026 05:19:42 -0700 (PDT) Received-SPF: pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from debian-zwei.m.ilbers.de ([88.130.203.42]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPA id 63NCJfs1009189 for ; Thu, 23 Apr 2026 14:19:42 +0200 From: Zhihang Wei To: isar-users@googlegroups.com Subject: [PATCH 2/3] doc: Restore API-CHANGELOG entry for artifacts naming and path changes Date: Thu, 23 Apr 2026 14:19:40 +0200 Message-Id: <20260423121941.1704827-2-wzh@ilbers.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260423121941.1704827-1-wzh@ilbers.de> References: <20260423121941.1704827-1-wzh@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: wzh@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= To keep it clear for users what API changes (13cb77dd) were introduced in Isar v1.0 and subsequently reverted (79e10791), the API-CHANGELOG is restored and updated. Signed-off-by: Zhihang Wei --- RECIPE-API-CHANGELOG.md | 86 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 0e6a3172..659a03b0 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -981,3 +981,89 @@ fragment, this can be specified via adding `${S}/path/to/fragment.cfg` to `KERNEL_CONFIG_FRAGMENTS`. If a fragment was checked out into ${WORKDIR} as part of a repository, a tarball, or some other directory structure, just specify it relative to ${WORKDIR} in `KERNEL_CONFIG_FRAGMENTS`. + +### Change DEPLOY_DIR_IMAGE path and artifacts naming + +Change DEPLOY_DIR_IMAGE from ${DEPLOY_DIR}/images/${MACHINE} to +${DEPLOY_DIR}/images/${MACHINE}/${DISTRO}-${IMAGE_PN}. + +When building different distros with the same machine the following +error occurs: + +do_copy_boot_files: The recipe isar-image-base is trying to install +files into a shared area when those files already exists. It happens +when some files have the same names (e.g., dtb files) for different +distros. + +To prevent such collisions, image artifacts are now deployed into a +distro- and image-specific subdirectory. + +Additionally, artifact filenames have been shortened by removing the +${DISTRO} and ${IMAGE_PN} prefix, since this information is now +encoded in the directory path. + +Example 1: Build isar-image-base (phyboard-mira, debian-bookworm) +Under "build/tmp/deploy/images/": +Before: +phyboard-mira/imx6q-phytec-mira-rdk-nand.dtb +phyboard-mira/isar-image-base-debian-bookworm-phyboard-mira-initrd.img +phyboard-mira/isar-image-base-debian-bookworm-phyboard-mira-vmlinuz +phyboard-mira/isar-image-base-debian-bookworm-phyboard-mira.dpkg_status +phyboard-mira/isar-image-base-debian-bookworm-phyboard-mira.ubi + +After: +phyboard-mira/debian-bookworm-isar-image-base/imx6q-phytec-mira-rdk-nand.dtb +phyboard-mira/debian-bookworm-isar-image-base/initrd.img +phyboard-mira/debian-bookworm-isar-image-base/vmlinuz +phyboard-mira/debian-bookworm-isar-image-base/phyboard-mira.dpkg_status +phyboard-mira/debian-bookworm-isar-image-base/phyboard-mira.ubi + +Example 2: Build isar-image-ci (qemuamd64, debian-bookworm) +Under "build/tmp/deploy/images/": +Before: +qemuamd64/isar-image-ci-debian-bookworm-qemuamd64-initrd.img +qemuamd64/isar-image-ci-debian-bookworm-qemuamd64-vmlinuz +qemuamd64/isar-image-ci-debian-bookworm-qemuamd64.dpkg_status +qemuamd64/isar-image-ci-debian-bookworm-qemuamd64.manifest +qemuamd64/isar-image-ci-debian-bookworm-qemuamd64.wic +qemuamd64/isar-image-ci-debian-bookworm-qemuamd64.wic.bmap +qemuamd64/isar-image-ci-debian-bookworm-qemuamd64.wic.manifest + +After: +qemuamd64/debian-bookworm-isar-image-ci/initrd.img +qemuamd64/debian-bookworm-isar-image-ci/vmlinuz +qemuamd64/debian-bookworm-isar-image-ci/qemuamd64.dpkg_status +qemuamd64/debian-bookworm-isar-image-ci/qemuamd64.manifest +qemuamd64/debian-bookworm-isar-image-ci/qemuamd64.wic +qemuamd64/debian-bookworm-isar-image-ci/qemuamd64.wic.bmap +qemuamd64/debian-bookworm-isar-image-ci/qemuamd64.wic.manifest + +Artifacts that do not belong to a full image (e.g. isar-image-base, +isar-image-ci) remain unchanged. For example, a customized initramfs +built independently is not affected. + +This change affects the location and naming of build artifacts and must +be taken into account by downstream users. + +Note that this approach differs from OpenEmbedded. + +OpenEmbedded typically avoids artifact collisions in multiconfig builds +by using separate TMPDIRs per configuration, resulting in multiple +build directories such as tmp-qemuarm64 and tmp-qemuarm64customized. In +this model, artifacts with identical names but different contents do +not cause conflicts because they reside in their own isolated build +directories. + +If multiple configurations are intentionally configured to share the +same TMPDIR in OpenEmbedded, conflicts may occur and are not handled by +OE. Artifacts with the same name overwrite each other, leading to +incorrect build results. + +Changes in next +--------------- + +### Revert "Change DEPLOY_DIR_IMAGE path and artifacts naming" + +The DEPLOY_DIR_IMAGE path and artifacts naming changes introduced in +13cb77dd (included in Isar v1.0) have been reverted. Deployment paths +and artifact names are the same as pre-v1.0. From patchwork Thu Apr 23 12:19:41 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhihang Wei X-Patchwork-Id: 5045 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 23 Apr 2026 14:19:59 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f57.google.com (mail-wm1-f57.google.com [209.85.128.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 63NCJpqo009212 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 23 Apr 2026 14:19:51 +0200 Received: by mail-wm1-f57.google.com with SMTP id 5b1f17b1804b1-48a55ecc249sf22859475e9.1 for ; Thu, 23 Apr 2026 05:19:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1776946786; cv=pass; d=google.com; s=arc-20240605; b=iYCbU2QfveNxGBNxGpUrOi6VhtY304kgX16pLUBz1dcQ0eGej6iHtAG1M3ObTdXknc hW87DqJ6ELnjJZI43kTMMJNeVPy8vLEnooRHPZOsZrwJAES5w8gfc7Ok5XwnIxdmRRRu QvMIZlDbT2V2J5e8IHsksVcIAW0PpBHNaa8T7cpS3o6fSuGpVCz5PEjJYYGkiStsyZUb /vFQgqjlUvGlHGcTwyGfI+cKfIjJo68fEVDwZxpp/yne3/aDZ8W2lsD1vWwYpeSnMY2N vXRPhJoWqBrzksAPm6KeJPT5oC3Zej3xWLg1o3k2FhpiIfqFS7epF/AjCeZzRciLKtYA l2mw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=vtnxGTEaca+nw7HEmu7Tg8oTKy9nPqw7ps5QxbY0xH0=; fh=Fny2cAd90rqbZJn46KOgSZb7LyAF0He5H3rAuE+iDY8=; b=DMFPYghxqog7IYbTLDB89F79SZ04FUO/V4srxmYaV+Ipd5M1mKrGOzp9K98gCFKEER sc1rcxJ0GOB4h9UXahhEwJeww4sy52XKbHEeR0sUAg1ufckvKj1CBpJ0A6vN7ADU/f0x WYmJx5w/IhwF9kqWP+qt71j3PprJQ9O6JV+HhL6gfKrzsRP5KI55DDSOLW63LnMH0Sk4 GpTA66wDDcrYcFtL3Hu+lGtR34AZCNGZrDCUsD2cb1NrPr4qmAcl7oqI7QFX7m92vFLc 6RyMvRO2g3zGcSmWFTQtd0PYNPs2RGNJ3Sqgi+FQRL/aavoVLr79PZa4RVWofI+SGSKV jmQA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20251104; t=1776946786; x=1777551586; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=vtnxGTEaca+nw7HEmu7Tg8oTKy9nPqw7ps5QxbY0xH0=; b=Zk33vstFo8S8HIVixlJyNQ+9CaOyN8xRnZ9W+6OZmCqGLd5rIghUV7y2lb/o1GPDXi 7VQNdc2vMtH1vVjQmnDmiUe+ovtzdteabdXmf2jCCOnFdOPHdFY4EJyG2yfSDdxJtoVU JPjHjhbSyHWh4yPhZc4H/0KPbtg5EzX0yPr16N3DU+EAFCjXYP5w8oTWZ+2wgYdqSDRt /wULrUX+CmRK/fKDhvvEjUqHxZSGL8XmalHkadXQXaa7NUJtRCBePKc+66lZoogRAIJg YAJz0Kh03fUHRXQwE+MVPm1z8r6MU5mOsaX/K8MuTDW+TS4nMkM8hlIO/seTEZHMJcZd C64g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776946786; x=1777551586; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:to:from:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=vtnxGTEaca+nw7HEmu7Tg8oTKy9nPqw7ps5QxbY0xH0=; b=nwoqIlYovglskYHA0URDv1+imGijYAfBMusAVWBmkG8GvY5xipMomVGksUnUZe9cVI Mmit8NGPazvMrSGNitDB01XAd/hC1dKFFogFAbBnj7I5xLqgV6Kq2FAcVUS+/VS+W8YM hFoupjnLinxFJjMjnhut2/2KbbqT1QnEp9BgjNIu33kxPt2hWOMzHKHxORMG5fYSlpNp 7javgyapS7wEgLrPaBYajOE4MizAbYhiuB9WvG7oUjpZ9ov/FxCIgrBmGPec5tQBmEbW Py48S6eMHChbcL+yXPOrJwlSK2LuyscDPoC2oA4ckb0haz9hMU9vTH1n594ymMWrjA9Z ZJpg== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AFNElJ9YilJhWf38O3A0Ger6X+Yy4x0MdRCdJGMmvQsMtCcf447DUOVbehGULLRvn8ISkUtiuQVvGzI=@isar-build.org X-Gm-Message-State: AOJu0YyJFvw979ZcwcCC7i6ZWNmQbzhXoGWgF1l6iZ4Ldw48UHCjCgE+ DINhu/xltzQFBoU7VCbtfvl5I9VK/LDWHWLZhJ36HdPAIi0rZTkAUtOS X-Received: by 2002:a05:600c:a416:b0:483:8062:b2f with SMTP id 5b1f17b1804b1-488fb73b31dmr321696955e9.6.1776946785864; Thu, 23 Apr 2026 05:19:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AYAyTiL57z5puwtuM9S0NWced5isMdSG7vg4K9j/sP5nGQ4e/w==" Received: by 2002:a05:600c:a418:b0:489:1ce4:41e0 with SMTP id 5b1f17b1804b1-4891ce452ccls25860045e9.2.-pod-prod-01-eu; Thu, 23 Apr 2026 05:19:43 -0700 (PDT) X-Received: by 2002:a05:6000:184b:b0:43d:775b:c9bd with SMTP id ffacd0b85a97d-43fe3db3a23mr41431680f8f.10.1776946782829; Thu, 23 Apr 2026 05:19:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1776946782; cv=none; d=google.com; s=arc-20240605; b=l2+P38ybCIW+kvey1w0x7FNwByvwxQlzsINd9PsVI/gzyLlIOnpApgUrbiqf6RLg9a bIjNUQyG96QpQ4JEF+GCCXOOdmO031wXGWZt8du+lujDqpVpnqsr7/AcCxmGHl+5BMVv r11GyMSbsLsU0eNcb9AzYfyVtVNVF+PvrwS2+joij3GD4VqqF4tA0z7pKSp5NUdhxJbX Ti5I90rkcDUIbMu5C2tZDmnhXcn6T3drotxrZHl766pJcVdjcDFMCJmemsj/N8bd0wRH kIKhRxgYgv0nwZlPISp0IRas4UkzzGC1VvZ7+BgfZQQdAmcGiExU/zUuEpp6ZiLQnpOz mKNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=4DQkAeYyxYw0lloyvARgQ7+0aSnfvLzecuxHK8JBru0=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=gXGY3KXuBDxKwjYf/EusJN0tPJxOAxibBvvCUU9HHIMyih1muZaz2OJ+AH5f7FjDP9 chTdy6ntDazewlZWsxiJDh/Dbpq+YruUdDMQ3svi4mpYo4PpeoGCBoQrm9XYp3/O4Syr kBBTPLtykmr65E/rimVW7ktjC+smMufnHJY9s8V1bTxJY9j3BdtN5VXoWLdKcOWuoQNF rq8kp1sFBw5hD48LZJv4f2hgxOzLirCYYMRUrAZ38oLS+VB+aU/G7GQhkQwBeySGslpU bL9tek/U1QmteKn5Gj6joBdnnavufyQF+MFEeL0GXZvbIdMsP0RSqYRXcPCij5tdqr5u 405Q==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id ffacd0b85a97d-43fe4e16b2bsi326466f8f.7.2026.04.23.05.19.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 Apr 2026 05:19:42 -0700 (PDT) Received-SPF: pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from debian-zwei.m.ilbers.de ([88.130.203.42]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPA id 63NCJfs2009189 for ; Thu, 23 Apr 2026 14:19:42 +0200 From: Zhihang Wei To: isar-users@googlegroups.com Subject: [PATCH 3/3] testsuite: Disable test cases that may fail due to unresolved DTB conflicts Date: Thu, 23 Apr 2026 14:19:41 +0200 Message-Id: <20260423121941.1704827-3-wzh@ilbers.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260423121941.1704827-1-wzh@ilbers.de> References: <20260423121941.1704827-1-wzh@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: wzh@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Since the patches resolving DTB deployment conflicts have been reverted, disable the affected test cases until a proper fix is in place. Signed-off-by: Zhihang Wei --- testsuite/citest.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/testsuite/citest.py b/testsuite/citest.py index fc6ec24c..ac45165b 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -697,7 +697,10 @@ class DtbDeployTest(CIBaseTest): ] self.init() - self.perform_build_test(targets, image_install='') + try: + self.perform_build_test(targets, image_install='') + except exceptions.TestFail: + self.cancel('KFAIL') def test_dtb_deploy_images(self): """ @@ -709,7 +712,10 @@ class DtbDeployTest(CIBaseTest): ] self.init() - self.perform_build_test(targets, image_install='') + try: + self.perform_build_test(targets, image_install='') + except exceptions.TestFail: + self.cancel('KFAIL') class NoCrossTest(CIBaseTest):