diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-07 18:11:47 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-07 18:11:47 +0100 |
| commit | b2e527479baa73e20e6b52e2779b69e4bd387c2f (patch) | |
| tree | a8b991fec0a7173cff6a2d22b5bc1d1f72ba453d /kernel.spec | |
| parent | 210d347298c96a3b9af4cb2362678fec1d53bef4 (diff) | |
| parent | 27b219978f2ee5510ebb06032f6763ca3c0ba7ad (diff) | |
| download | kernel-b2e527479baa73e20e6b52e2779b69e4bd387c2f.tar.gz kernel-b2e527479baa73e20e6b52e2779b69e4bd387c2f.tar.xz kernel-b2e527479baa73e20e6b52e2779b69e4bd387c2f.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.0.0-0.rc1.git0.1.vanilla.knurd.1.fc30kernel-5.0.0-0.rc1.git0.1.vanilla.knurd.1.fc29kernel-5.0.0-0.rc1.git0.1.vanilla.knurd.1.fc28
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/kernel.spec b/kernel.spec index c7df4f8d3..7f7199cca 100644 --- a/kernel.spec +++ b/kernel.spec @@ -50,7 +50,7 @@ Summary: The Linux kernel # base_sublevel is the kernel version we're starting with and patching # on top of -- for example, 3.1-rc7-git1 starts with a 3.0 base, # which yields a base_sublevel of 0. -%define base_sublevel 20 +%define base_sublevel 0 ## If this is a released kernel ## %if 0%{?released_kernel} @@ -73,11 +73,13 @@ Summary: The Linux kernel ## The not-released-kernel case ## %else # The next upstream release sublevel (base_sublevel+1) -%define upstream_sublevel %(echo $((%{base_sublevel} + 1))) +# %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) +# Work around for major version bump +%define upstream_sublevel 0 # The rc snapshot level -%global rcrev 0 +%global rcrev 1 # The git snapshot level -%define gitrev 7 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -175,7 +177,8 @@ Summary: The Linux kernel %endif # The kernel tarball/base version -%define kversion 5.%{base_sublevel} +# %define kversion 5.%{base_sublevel} +%define kversion 5.%{base_sublevel}-rc%rcrev %define make_target bzImage %define image_install_path boot @@ -435,7 +438,8 @@ BuildRequires: binutils-%{_build_arch}-linux-gnu, gcc-%{_build_arch}-linux-gnu %define cross_opts CROSS_COMPILE=%{_build_arch}-linux-gnu- %endif -Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{kversion}.tar.xz +# Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{kversion}.tar.xz +Source0: https://git.kernel.org/torvalds/t/linux-5.0-rc1.tar.gz Source11: x509.genkey Source12: remove-binary-diff.pl @@ -495,7 +499,8 @@ Patch01: %{stable_patch_01} # near the top of this spec file. %else %if 0%{?rcrev} -Source5000: patch-5.%{upstream_sublevel}-rc%{rcrev}.xz +# One more fixup apparently? +# Source5000: patch-5.%{upstream_sublevel}-rc%{rcrev}.xz %if 0%{?gitrev} Source5001: patch-5.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}.xz %endif @@ -616,9 +621,6 @@ Patch351: arm64-dts-allwinner-a64-Enable-A64-timer-workaround.patch # rhbz 1431375 Patch502: input-rmi4-remove-the-need-for-artifical-IRQ.patch -# rhbz 1645070 patch queued upstream for merging into 4.21 -Patch505: asus-fx503-keyb.patch - # nvlink failure Patch506: 0001-Drop-that-def_bool.patch @@ -1896,6 +1898,12 @@ fi # # %changelog +* Mon Jan 07 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-0.rc1.git0.1 +- Linux v5.0-rc1 + +* Mon Jan 07 2019 Laura Abbott <labbott@redhat.com> +- Disable debugging options. + * Fri Jan 04 2019 Laura Abbott <labbott@redhat.com> - 4.21.0-0.rc0.git7.1 - Linux v4.20-10979-g96d4f267e40f |