diff options
| author | Laura Abbott <labbott@redhat.com> | 2016-10-31 06:27:30 -0700 |
|---|---|---|
| committer | Laura Abbott <labbott@redhat.com> | 2016-10-31 06:27:33 -0700 |
| commit | b9e51f8ce96df1695d70d4c015e3e92a379b0b5c (patch) | |
| tree | 4f978db13708a6c617df6e10edfae4429742e92c | |
| parent | 7f483c3694ac4b3c0c7c8f79486f235b42dfb275 (diff) | |
| download | kernel-b9e51f8ce96df1695d70d4c015e3e92a379b0b5c.tar.gz kernel-b9e51f8ce96df1695d70d4c015e3e92a379b0b5c.tar.xz kernel-b9e51f8ce96df1695d70d4c015e3e92a379b0b5c.zip | |
Linux v4.9-rc3
- Update remove-binary-diff.pl to remove git binary patches as well. Git binary
patches can be applied but the spec file needs to be updated to support this.
| -rw-r--r-- | kernel.spec | 7 | ||||
| -rwxr-xr-x | remove-binary-diff.pl | 2 | ||||
| -rw-r--r-- | sources | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index 4a6b57dd9..5818186f4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,9 +67,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 2 +%global rcrev 3 # The git snapshot level -%define gitrev 2 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2149,6 +2149,9 @@ fi # # %changelog +* Mon Oct 31 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc3.git0.1 +- Linux v4.9-rc3 + * Mon Oct 31 2016 Laura Abbott <labbott@redhat.com> - Disable debugging options. diff --git a/remove-binary-diff.pl b/remove-binary-diff.pl index 520ac5d73..9048490ca 100755 --- a/remove-binary-diff.pl +++ b/remove-binary-diff.pl @@ -21,6 +21,8 @@ while(my $row = <>) { @current_patch = (); } elsif ($row =~ /Binary files (.)* differ$/) { $is_binary = 1; + } elsif ($row =~ /GIT binary patch/) { + $is_binary = 1; } push (@current_patch, $row); } @@ -1,4 +1,3 @@ c1af0afbd3df35c1ccdc7a5118cd2d07 linux-4.8.tar.xz 0dad03f586e835d538d3e0d2cbdb9a28 perf-man-4.8.tar.gz -ad6f2f144892a36b6d91cbe63c7e042d patch-4.9-rc2.xz -2b72d2cfadc0b9fdebed5cedff8ba9b1 patch-4.9-rc2-git2.xz +bf2eeea112993a992434d0151b0e9db8 patch-4.9-rc3.xz |