diff options
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/kernel.spec b/kernel.spec index bcf465711..c8f6f9bd6 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 4 +%global rcrev 5 # The git snapshot level -%define gitrev 4 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -103,8 +103,6 @@ Summary: The Linux kernel %define with_cross_headers %{?_without_cross_headers: 0} %{?!_without_cross_headers: 1} # kernel-debuginfo %define with_debuginfo %{?_with_debuginfo: 1} %{?!_with_debuginfo: 0} -# kernel-bootwrapper (for creating zImages from kernel + initrd) -%define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1} # Want to build a the vsdo directories installed %define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1} # @@ -189,7 +187,6 @@ Summary: The Linux kernel %endif %if %{nopatches} -%define with_bootwrapper 0 #define variant -vanilla %endif @@ -254,10 +251,8 @@ Summary: The Linux kernel %define all_arch_configs kernel-%{version}-*.config %endif -# bootwrapper is only on ppc # sparse blows up on ppc %ifnarch %{power64} -%define with_bootwrapper 0 %define with_sparse 0 %endif @@ -704,13 +699,6 @@ building most standard programs and are also needed for rebuilding the cross-glibc package. -%package bootwrapper -Summary: Boot wrapper files for generating combined kernel + initrd images -Requires: gzip binutils -%description bootwrapper -Kernel-bootwrapper contains the wrapper code which makes bootable "zImage" -files combining both kernel and initial ramdisk. - %package debuginfo-common-%{_target_cpu} Summary: Kernel source files used by %{name}-debuginfo packages Provides: installonlypkg(kernel) @@ -818,6 +806,9 @@ The meta-package for the %{1} kernel\ Summary: %{variant_summary}\ Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\ Provides: installonlypkg(kernel)\ +%ifarch %{power64}\ +Obsoletes: kernel-bootwrapper\ +%endif\ %{expand:%%kernel_reqprovconf}\ %if %{?1:1} %{!?1:0} \ %{expand:%%kernel_meta_package %{?1:%{1}}}\ @@ -1697,10 +1688,6 @@ done rm -rf $RPM_BUILD_ROOT/usr/tmp-headers %endif -%if %{with_bootwrapper} -make DESTDIR=$RPM_BUILD_ROOT bootwrapper_install WRAPPER_OBJDIR=%{_libdir}/kernel-wrapper WRAPPER_DTSDIR=%{_libdir}/kernel-wrapper/dts -%endif - ### ### clean ### @@ -1823,12 +1810,6 @@ fi /usr/*-linux-gnu/include/* %endif -%if %{with_bootwrapper} -%files bootwrapper -/usr/sbin/* -%{_libdir}/kernel-wrapper -%endif - # empty meta-package %files # This is %%{image_install_path} on an arch where that includes ELF files, @@ -1896,6 +1877,12 @@ fi # # %changelog +* Mon May 14 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc5.git0.1 +- Linux v4.17-rc5 + +* Mon May 14 2018 Justin M. Forbes <jforbes@fedoraproject.org> +- Disable debugging options. + * Fri May 11 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc4.git4.1 - Linux v4.17-rc4-96-g41e3e1082367 |