diff mbox series

[scarthgap] Backport 'kernel-devsrc: make tools/Build optional'

Message ID e2093fdff31efa8b84fa09cc62fb72a77a8cc29a.1776392062.git.calvin@wbinvd.org
State Under Review
Delegated to: Yoann Congal
Headers show
Series [scarthgap] Backport 'kernel-devsrc: make tools/Build optional' | expand

Commit Message

Calvin Owens April 17, 2026, 2:21 a.m. UTC
Backport a patch to fix v6.12+ kernel builds on Scarthgap:

    commit 13e16e5be25f379211c7329fa1462464174c0f2d
    Author: Bruce Ashfield <bruce.ashfield@gmail.com>
    Date:   Wed Nov 6 21:29:17 2024 -0500

    kernel-devsrc: make tools/Build optional

    kernel-devsrc fails to copy files for v6.12+ as the
    following upstream commit has removed the file tools/build/Build:

       commit ea974028a049f2cea4bb6be963ee3e3844a03f6d
       Author: Brian Norris <briannorris@chromium.org>
       Date:   Mon Jul 15 13:32:43 2024 -0700

           tools build: Avoid circular .fixdep-in.o.cmd issues

    We make the failed copy of this file non-fatal to support
    all kernel versions.

Signed-off-by: Calvin Owens <calvin@wbinvd.org>
---
 meta/recipes-kernel/linux/kernel-devsrc.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 7724967151..1500aff2e2 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -156,7 +156,7 @@  do_install() {
             # these are a few files associated with objtool, since we'll need to
             # rebuild it
             cp -a --parents tools/build/Build.include $kerneldir/build/
-            cp -a --parents tools/build/Build $kerneldir/build/
+            cp -a --parents tools/build/Build $kerneldir/build/ 2>/dev/null || :
             cp -a --parents tools/build/fixdep.c $kerneldir/build/
             cp -a --parents tools/scripts/utilities.mak $kerneldir/build/