diff options
| author | George Tsiamasiotis | 2025-09-23 20:11:19 +0000 |
|---|---|---|
| committer | Christian Marangi | 2025-11-12 11:09:43 +0000 |
| commit | 58cde9ec226918812473c77e562b059316b5989a (patch) | |
| tree | b646762f782c5bb9563747f7338b3a3e2229521d | |
| parent | dddeea5e7ff5db16cf3dc513f8d5c8ca27c65fa6 (diff) | |
| download | openwrt-58cde9ec226918812473c77e562b059316b5989a.tar.gz | |
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@tsiamasiotis.gr>
Link: https://github.com/openwrt/openwrt/pull/20141
Signed-off-by: Robert Marko <robimarko@gmail.com>
(cherry picked from commit 75ca6bafd614efd1427a979d28d551af775b8e5d)
Link: https://github.com/openwrt/openwrt/pull/20742
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
| -rwxr-xr-x | scripts/patch-kernel.sh | 9 |
1 files changed, 0 insertions, 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 {} \; |