diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-02-19 19:15:33 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-02-19 19:15:33 +0100 |
| commit | 8a0689e697e71dda56ad3d1c02c1aa5fb35c489c (patch) | |
| tree | ced0b439eade4a7acd4068ac4bec8f19e8dfb3fb /kernel.spec | |
| parent | 7ea4664e80a64adf6718def9cbc0e4a5fed6a0ea (diff) | |
| parent | 08732ed8268cbd9fd23dfae32ffa18ea320b910e (diff) | |
| download | kernel-8a0689e697e71dda56ad3d1c02c1aa5fb35c489c.tar.gz kernel-8a0689e697e71dda56ad3d1c02c1aa5fb35c489c.tar.xz kernel-8a0689e697e71dda56ad3d1c02c1aa5fb35c489c.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec index 4e8b7faa7..0333fc4c9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -75,9 +75,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 1 +%global rcrev 2 # The git snapshot level -%define gitrev 4 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -477,6 +477,7 @@ Source40: generate_all_configs.sh Source41: generate_debug_configs.sh Source42: process_configs.sh +Source43: generate_bls_conf.sh # This file is intentionally left empty in the stock kernel. Its a nicety # added for those wanting to do custom rebuilds with altered config opts. @@ -1124,6 +1125,7 @@ cp %{SOURCE1000} . cp %{SOURCE15} . cp %{SOURCE40} . cp %{SOURCE41} . +cp %{SOURCE43} . %if !%{debugbuildsenabled} # The normal build is a really debug build and the user has explicitly requested @@ -1538,6 +1540,9 @@ BuildKernel() { # prune junk from kernel-devel find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -exec rm -f {} \; + + # build a BLS config for this kernel + ./generate_bls_conf.sh "$KernelVer" "$RPM_BUILD_ROOT" "%{?variant}" } ### @@ -1849,6 +1854,7 @@ fi /lib/modules/%{KVERREL}%{?3:+%{3}}/build\ /lib/modules/%{KVERREL}%{?3:+%{3}}/source\ /lib/modules/%{KVERREL}%{?3:+%{3}}/updates\ +/lib/modules/%{KVERREL}%{?2:+%{2}}/bls.conf\ %if %{1}\ /lib/modules/%{KVERREL}%{?3:+%{3}}/vdso\ /etc/ld.so.conf.d/kernel-%{KVERREL}%{?3:+%{3}}.conf\ @@ -1886,6 +1892,12 @@ fi # # %changelog +* Mon Feb 19 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc2.git0.1 +- Linux v4.16-rc2 + +* Mon Feb 19 2018 Jeremy Cline <jeremy@jcline.org> +- Disable debugging options. + * Fri Feb 16 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc1.git4.1 - Linux v4.16-rc1-100-g1388c80438e6 |