mirror of
https://git.openwrt.org/openwrt/openwrt.git/
synced 2025-10-05 23:42:55 +02:00
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>
This commit is contained in:
committed by
Robert Marko
parent
973cfbadf5
commit
75ca6bafd6
@@ -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 {} \;
|
||||
|
Reference in New Issue
Block a user