[openwrt/openwrt] scripts/patch-kernel.sh: do not try to check files after patch

LEDE Commits lede-commits at lists.infradead.org
Mon Sep 29 04:33:11 PDT 2025


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/75ca6bafd614efd1427a979d28d551af775b8e5d

commit 75ca6bafd614efd1427a979d28d551af775b8e5d
Author: George Tsiamasiotis <george at tsiamasiotis.gr>
AuthorDate: Tue Sep 23 23:11:19 2025 +0300

    scripts/patch-kernel.sh: do not try to check files after patch
    
    Since we are not using patch -b, *.orig files are only created when
    there are conflicts, or never according to posix patch.
    
    As such, it doesn't really make sense to always delete *.orig files
    presuming they are patch backups, even if they are patch backups.
    Doing so is both deleting potentially useful information for failed
    patch applications and creating hard to diagnose bugs [1].
    
    In a similar vein, checking for *.rej files does not add any value
    since we're already checking the patch command's return code.
    
    [1]: https://github.com/openwrt/packages/issues/27485
    
    Signed-off-by: George Tsiamasiotis <george at tsiamasiotis.gr>
    Link: https://github.com/openwrt/openwrt/pull/20141
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 scripts/patch-kernel.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/scripts/patch-kernel.sh b/scripts/patch-kernel.sh
index 52750dde6e..84bcba8858 100755
--- a/scripts/patch-kernel.sh
+++ b/scripts/patch-kernel.sh
@@ -43,12 +43,3 @@ for i in ${patchdir}/${patchpattern} ; do
 	exit 1
     fi
 done
-
-# Check for rejects...
-if [ "`find $targetdir/ '(' -name '*.rej' -o -name '.*.rej' ')' -print`" ] ; then
-    echo "Aborting.  Reject files found."
-    exit 1
-fi
-
-# Remove backup files
-find $targetdir/ '(' -name '*.orig' -o -name '.*.orig' ')' -exec rm -f {} \;




More information about the lede-commits mailing list