diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2019-09-02 20:57:53 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2019-09-02 20:57:53 +0100 |
| commit | 4dbfff26bfd76c25f9f8b6f651528b0aaf2cf107 (patch) | |
| tree | 3c2fc14012ecb51eb09716188411c7172c28c6df | |
| parent | cf146e231f089afd9c5788869a95d513ae5cb974 (diff) | |
| download | kernel-4dbfff26bfd76c25f9f8b6f651528b0aaf2cf107.tar.gz kernel-4dbfff26bfd76c25f9f8b6f651528b0aaf2cf107.tar.xz kernel-4dbfff26bfd76c25f9f8b6f651528b0aaf2cf107.zip | |
drop old ApplyPatch logic as now eveything is done via git am
| -rw-r--r-- | kernel.spec | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/kernel.spec b/kernel.spec index 5add2fcd0..14e2bdb35 100644 --- a/kernel.spec +++ b/kernel.spec @@ -811,42 +811,6 @@ if [ "%{patches}" != "%%{patches}" ] ; then done 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. # If this isn't the first make prep, we use links to the existing clean tarball # which speeds things up quite a bit. |