rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bring back ApplyPatch and ApplyOptionalPatch macros

Browse Source 
These are not used directly in Fedora but for easy of syncing
let's keep them around.
This commit is contained in:
Laura Abbott 2019-10-31 17:01:08 -04:00
parent 22f43b4c88
commit b8d58e2908
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
kernel.spec
View File

@ -1057,6 +1057,42 @@ if [ "%{patches}" != "%%{patches}" ] ; then
done done
fi 2>/dev/null fi 2>/dev/null
patch_command='patch -p1 -F1 -s'
ApplyPatch()
{
local patch=$1
shift
if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
exit 1
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME%%%%%{?variant}}.spec ; then
if [ "${patch:0:8}" != "patch-5." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1
fi
fi 2>/dev/null
case "$patch" in
*.bz2) bunzip2 < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
*.gz) gunzip < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
*.xz) unxz < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
*) $patch_command ${1+"$@"} < "$RPM_SOURCE_DIR/$patch" ;;
esac
}
# don't apply patch if it's empty
ApplyOptionalPatch()
{
local patch=$1
shift
if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
exit 1
fi
local C=$(wc -l $RPM_SOURCE_DIR/$patch | awk '{print $1}')
if [ "$C" -gt 9 ]; then
ApplyPatch $patch ${1+"$@"}
fi
}
# First we unpack the kernel tarball. # First we unpack the kernel tarball.
# If this isn't the first make prep, we use links to the existing clean tarball # If this isn't the first make prep, we use links to the existing clean tarball
# which speeds things up quite a bit. # which speeds things up quite a bit.