X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel-vanilla.spec;h=6f3a2be33b90c78a077a1f7237bab67534fdfad5;hb=83afbbfb6837d4a8432212697412eee31f079051;hp=252862c749632911fe012460825f82de505915c9;hpb=5fe24102602196009d24c4a6406691f9958bc7b4;p=packages%2Fkernel.git diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 252862c..6f3a2be 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -3,11 +3,11 @@ %bcond_without doc # don't build kernel-doc package %bcond_with verbose # verbose build (V=1) -%define basever 4.5 -%define postver 2 +%define basever 4.14 +%define postver 65 %define rel 1 -%define alt_kernel 4.5-vanilla +%define alt_kernel 4.14-vanilla # kernel release (used in filesystem and eventually in uname -r) # modules will be looked from /lib/modules/%{kernel_release} @@ -27,10 +27,10 @@ Epoch: 3 License: GPL v2 Group: Base/Kernel Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz -# Source0-md5: a60d48eee08ec0536d5efb17ca819aef +# Source0-md5: bacdb9ffdcd922aa069a5e1520160e24 %if "%{postver}" != "0" Source1: http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz -# Source1-md5: 19a835c1d16183f629d45779f62d36b6 +# Source1-md5: 291aae6226dc26d75835d1c1d66e97a3 %endif Source2: kernel-module-build.pl @@ -39,10 +39,13 @@ Source3: kernel.make Source10: kernel-vanilla-x86.config Source11: kernel-vanilla-x86_64.config +Patch0: gcc8.patch + URL: http://www.kernel.org/ BuildRequires: binutils >= 3:2.18 BuildRequires: /sbin/depmod BuildRequires: gcc >= 5:3.2 +BuildRequires: gcc-plugin-devel BuildRequires: xz >= 1:4.999.7 AutoReqProv: no BuildRequires: hostname @@ -236,25 +239,6 @@ ALSA (Advanced Linux Sound Architecture) Sound-Treiber. %description sound-alsa -l pl.UTF-8 Sterowniki dźwięku ALSA (Advanced Linux Sound Architecture). -%package sound-oss -Summary: OSS kernel modules -Summary(de.UTF-8): OSS Kernel Module -Summary(pl.UTF-8): Sterowniki dźwięku OSS -Group: Base/Kernel -Requires(postun): %{name} = %{epoch}:%{version}-%{release} -Requires: %{name} = %{epoch}:%{version}-%{release} -Obsoletes: kernel-smp-sound-oss -AutoReqProv: no - -%description sound-oss -OSS (Open Sound System) drivers. - -%description sound-oss -l de.UTF-8 -OSS (Open Sound System) Treiber. - -%description sound-oss -l pl.UTF-8 -Sterowniki dźwięku OSS (Open Sound System). - %package headers Summary: Header files for the Linux kernel Summary(de.UTF-8): Header Dateien für den Linux-Kernel @@ -358,6 +342,8 @@ cd linux-%{basever} %{__xz} -dc %{SOURCE1} | patch -p1 -s %endif +%patch0 -p1 + # Fix EXTRAVERSION in main Makefile sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{?alt_kernel:-%{alt_kernel}}#g' Makefile @@ -404,12 +390,12 @@ cd - %install rm -rf $RPM_BUILD_ROOT -%{__make} %{MakeOpts} -j1 %{!?with_verbose:-s} modules_install firmware_install \ +%{__make} %{MakeOpts} -j1 %{!?with_verbose:-s} modules_install \ -C %{objdir} \ %{?with_verbose:V=1} \ DEPMOD=%{DepMod} \ + mod_compress_cmd=true \ INSTALL_MOD_PATH=$RPM_BUILD_ROOT \ - INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware/%{kernel_release} \ KERNELRELEASE=%{kernel_release} install -d $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/misc @@ -548,12 +534,6 @@ fi %postun sound-alsa %depmod %{kernel_release} -%post sound-oss -%depmod %{kernel_release} - -%postun sound-oss -%depmod %{kernel_release} - %post headers ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux%{_alt_kernel} @@ -581,11 +561,11 @@ fi /boot/System.map-%{kernel_release} /boot/config-%{kernel_release} %ghost %{initrd_dir}/initramfs-%{kernel_release}.img -/lib/firmware/%{kernel_release} %dir /lib/modules/%{kernel_release} %dir /lib/modules/%{kernel_release}/kernel /lib/modules/%{kernel_release}/kernel/arch +/lib/modules/%{kernel_release}/kernel/block /lib/modules/%{kernel_release}/kernel/crypto /lib/modules/%{kernel_release}/kernel/drivers %exclude /lib/modules/%{kernel_release}/kernel/drivers/gpu @@ -665,15 +645,10 @@ fi %exclude %dir /lib/modules/%{kernel_release}/kernel/sound %exclude /lib/modules/%{kernel_release}/kernel/sound/ac97_bus.ko* %exclude /lib/modules/%{kernel_release}/kernel/sound/sound*.ko* -%exclude /lib/modules/%{kernel_release}/kernel/sound/oss /lib/modules/%{kernel_release}/kernel/drivers/media/pci/cx88/cx88-alsa.ko* /lib/modules/%{kernel_release}/kernel/drivers/media/usb/em28xx/em28xx-alsa.ko* /lib/modules/%{kernel_release}/kernel/drivers/media/pci/saa7134/saa7134-alsa.ko* -%files sound-oss -%defattr(644,root,root,755) -/lib/modules/%{kernel_release}/kernel/sound/oss - %files headers -f files.headers_exclude_kbuild %defattr(644,root,root,755) %dir %{_kernelsrcdir} @@ -692,7 +667,6 @@ fi %exclude %dir %{_kernelsrcdir}/arch/um %{_kernelsrcdir}/arch/*/kernel/asm-offsets* %{_kernelsrcdir}/arch/*/kernel/sigframe*.h -%{_kernelsrcdir}/drivers/lguest/lg.h %{_kernelsrcdir}/drivers/media/pci/bt8xx/bttv.h %{_kernelsrcdir}/kernel/bounds.c %{_kernelsrcdir}/scripts/basic/*.c @@ -701,7 +675,6 @@ fi %{_kernelsrcdir}/scripts/kconfig/*_shipped %{_kernelsrcdir}/scripts/kconfig/*.pl %{_kernelsrcdir}/scripts/kconfig/*.glade -%{_kernelsrcdir}/scripts/kconfig/*.gperf %{_kernelsrcdir}/scripts/kconfig/*.cc %{_kernelsrcdir}/scripts/kconfig/*.y %{_kernelsrcdir}/scripts/kconfig/*.l @@ -734,9 +707,7 @@ fi %{_docdir}/%{name}-%{version}/[jkz]*.txt %{_docdir}/%{name}-%{version}/kbuild %{_docdir}/%{name}-%{version}/kdump -%lang(ja) %{_docdir}/%{name}-%{version}/ja_JP -%lang(ko) %{_docdir}/%{name}-%{version}/ko_KR -%lang(zh_CN) %{_docdir}/%{name}-%{version}/zh_CN +%{_docdir}/%{name}-%{version}/kernel-hacking %endif %if %{with source} @@ -758,7 +729,6 @@ fi %{_kernelsrcdir}/arch/x86/kvm %exclude %{_kernelsrcdir}/arch/*/kernel/asm-offsets* %exclude %{_kernelsrcdir}/arch/*/kernel/sigframe*.h -%exclude %{_kernelsrcdir}/drivers/lguest/lg.h %exclude %{_kernelsrcdir}/drivers/media/pci/bt8xx/bttv.h %{_kernelsrcdir}/block %{_kernelsrcdir}/certs @@ -805,5 +775,4 @@ fi %{_kernelsrcdir}/CREDITS %{_kernelsrcdir}/MAINTAINERS %{_kernelsrcdir}/README -%{_kernelsrcdir}/REPORTING-BUGS %endif