diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-06-05 09:38:54 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-06-05 09:38:54 +0200 |
| commit | 458f1a86f602410b6724ebf3cdadcddbce710f4c (patch) | |
| tree | 13b386b5017cf5234273ef47bb8d747613733ffa /kernel.spec | |
| parent | d9398fbac9d5a5a40aecdcc263348071b467486b (diff) | |
| parent | ab80721865abf3dc3bf232fb212461a5ee24296a (diff) | |
| download | kernel-458f1a86f602410b6724ebf3cdadcddbce710f4c.tar.gz kernel-458f1a86f602410b6724ebf3cdadcddbce710f4c.tar.xz kernel-458f1a86f602410b6724ebf3cdadcddbce710f4c.zip | |
merge masterkernel-4.18.0-0.rc0.git1.1.vanilla.knurd.1.fc29
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index 2bbbb1672..0a67ce5b7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -6,7 +6,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. For rawhide # and/or a kernel built from an rc or git snapshot, released_kernel should # be 0. -%global released_kernel 1 +%global released_kernel 0 # Sign modules on x86. Make sure the config files match this setting if more # architectures are added. @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -130,7 +130,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 %if %{with_verbose} %define make_opts V=1 @@ -1876,6 +1876,12 @@ fi # # %changelog +* Mon Jun 04 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc0.git1.1 +- Linux v4.17-505-g9214407d1237 + +* Mon Jun 04 2018 Laura Abbott <labbott@redhat.com> +- Reenable debugging options. + * Mon Jun 04 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-1 - Linux v4.17 - Disable debugging options. @@ -3160,6 +3166,7 @@ fi - Linux v4.11-1464-gd3b5d35 - Reenable debugging options. +<<<<<<< HEAD * Mon May 01 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-1 - Linux v4.11 |