X-Git-Url: https://git.tld-linux.org/?p=packages%2Fkernel.git;a=blobdiff_plain;f=kernel-vanilla.spec;h=9108dc2fb1a77b7e4db5b4172f0e1c8a9de43da1;hp=798bcc44b371880a622bfed725f296b760953e0f;hb=9154d62b96d76268f75385330664118b88c107be;hpb=6c1cb042f6d8fbe44fea8e30be8c624cf9deb729

diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index 798bcc4..9108dc2 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		3.10
-%define		postver		1
+%define		basever		4.4
+%define		postver		6
 %define		rel		1
 
-%define		alt_kernel	3.10-vanilla
+%define		alt_kernel	4.4-vanilla
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}
@@ -26,16 +26,15 @@ Release:	%{rel}
 Epoch:		3
 License:	GPL v2
 Group:		Base/Kernel
-Source0:	http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
-# Source0-md5:	4f25cd5bec5f8d5a7d935b3f2ccb8481
+Source0:	http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
+# Source0-md5:	9a78fa2eb6c68ca5a40ed5af08142599
 %if "%{postver}" != "0"
-Source1:	http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Source1-md5:	38cde44fe2b015cc5b1b3ddd12912c57
+Source1:	http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
+# Source1-md5:	d48f09bf61f2500d70f839e190dc7c5a
 %endif
 
-Source2:	kernel.sysconfig
-Source3:	kernel-module-build.pl
-Source4:	kernel.make
+Source2:	kernel-module-build.pl
+Source3:	kernel.make
 
 Source10:	kernel-vanilla-x86.config
 Source11:	kernel-vanilla-x86_64.config
@@ -49,20 +48,19 @@ AutoReqProv:	no
 BuildRequires:	hostname
 BuildRequires:	kmod
 BuildRequires:	perl-base
-BuildRequires:	rpm-build >= 4.5-24
+BuildRequires:	rpm >= 4.5-74
 BuildRequires:	rpmbuild(macros) >= 1.652
 Requires(post):	coreutils
-Requires(post):	geninitrd >= 12639-1
+Requires(post):	dracut
 Requires(post):	kmod >= 12-2
 Requires:	/sbin/depmod
 Requires:	coreutils
-Requires:	geninitrd >= 12639-1
+Requires:	dracut
 Requires:	kmod >= 12-2
 %ifarch i686
 Requires:	cpuinfo(pae)
 %endif
 Suggests:	crda
-Suggests:	dracut
 Suggests:	keyutils
 Suggests:	linux-firmware
 Provides:	%{name}(netfilter) = 20070806
@@ -352,12 +350,12 @@ Pakiet zawiera dokumentację do jądra Linuksa pochodzącą z katalogu
 
 %prep
 %setup -qc
-ln -s %{SOURCE3} kernel-module-build.pl
-ln -s %{SOURCE4} Makefile
+ln -s %{SOURCE2} kernel-module-build.pl
+ln -s %{SOURCE3} Makefile
 cd linux-%{basever}
 
 %if "%{postver}" != "0"
-%{__bzip2} -dc %{SOURCE1} | patch -p1 -s
+%{__xz} -dc %{SOURCE1} | patch -p1 -s
 %endif
 
 # Fix EXTRAVERSION in main Makefile
@@ -443,7 +441,6 @@ cp -a %{objdir}/arch/%{target_arch_dir}/boot/bzImage $RPM_BUILD_ROOT/boot/vmlinu
 install -p %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinux-%{kernel_release}
 
 # ghosted initrd
-touch $RPM_BUILD_ROOT%{initrd_dir}/initrd-%{kernel_release}.img
 touch $RPM_BUILD_ROOT%{initrd_dir}/initramfs-%{kernel_release}.img
 
 %if "%{_target_base_arch}" != "%{_host_base_arch}"
@@ -453,9 +450,6 @@ touch $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/modules.dep
 # /etc/modrobe.d
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{kernel_release}
 
-install -d $RPM_BUILD_ROOT/etc/sysconfig
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/kernel
-
 # /usr/src/linux
 install -d $RPM_BUILD_ROOT%{_kernelsrcdir}
 
@@ -525,27 +519,15 @@ fi
 %depmod %{kernel_release}
 
 %posttrans
-[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
-if [[ "$USE_GENINITRD" != [Nn][Oo] ]]; then
-	# generate initrd after all dependant modules are installed
-	/sbin/geninitrd -f --initrdfs=initramfs %{initrd_dir}/initrd-%{kernel_release}.img %{kernel_release}
-fi
-
-# if dracut is present then generate full-featured initramfs
-if [[ "$USE_DRACUT" != [Nn][Oo] ]] && [ -x /sbin/dracut ]; then
+# generate initramfs
+if [ -x /sbin/dracut ]; then
 	/sbin/dracut --force --quiet /boot/initramfs-%{kernel_release}.img %{kernel_release}
 fi
-
-# update boot loaders
-[ -x /sbin/update-grub -a -f /etc/sysconfig/grub ] && . /etc/sysconfig/grub
-if [[ "$UPDATE_GRUB" != [Nn][Oo] ]]; then
-	/sbin/update-grub
-fi
-if [ -x /sbin/new-kernel-pkg ]; then
-	/sbin/new-kernel-pkg --initrdfile=%{initrd_dir}/initrd-%{kernel_release}.img --install %{kernel_release} --banner "TLD Linux%{?alt_kernel: %{alt_kernel}}"
-fi
-if [ -x /sbin/rc-boot ]; then
-	/sbin/rc-boot 1>&2 || :
+# update boot loader
+if [ -x /sbin/update-grub -a -f /etc/sysconfig/grub ]; then
+	if [ "$(. /etc/sysconfig/grub; echo ${UPDATE_GRUB:-yes})" = "yes" ]; then
+		/sbin/update-grub >/dev/null
+	fi
 fi
 
 %post drm
@@ -595,11 +577,9 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/kernel
 /boot/vmlinuz-%{kernel_release}
 /boot/System.map-%{kernel_release}
 /boot/config-%{kernel_release}
-%ghost %{initrd_dir}/initrd-%{kernel_release}.img
 %ghost %{initrd_dir}/initramfs-%{kernel_release}.img
 /lib/firmware/%{kernel_release}
 
@@ -628,7 +608,6 @@ fi
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/isdn/hardware/avm/avm_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/isdn/hardware/avm/b1pcmcia.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/gadget/g_midi.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/*_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/b43
@@ -638,6 +617,7 @@ fi
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/tty/serial/8250/serial_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/host/sl811_cs.ko*
 /lib/modules/%{kernel_release}/kernel/security
+/lib/modules/%{kernel_release}/kernel/virt
 
 %dir %{_sysconfdir}/modprobe.d/%{kernel_release}
 
@@ -692,7 +672,6 @@ fi
 %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/usb/gadget/g_midi.ko*
 /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*
@@ -739,12 +718,13 @@ fi
 %{_kernelsrcdir}/scripts/kconfig/[m-u]*.h
 %{_kernelsrcdir}/scripts/kconfig/lxdialog
 %{_kernelsrcdir}/scripts/mod/*.c
-%{_kernelsrcdir}/scripts/mod/[^e]*.h
+%{_kernelsrcdir}/scripts/mod/modpost.h
 %attr(755,root,root) %{_kernelsrcdir}/scripts/mkcompile_h
 %{_kernelsrcdir}/scripts/mkmakefile
 %{_kernelsrcdir}/scripts/module-common.lds
 %attr(755,root,root) %{_kernelsrcdir}/scripts/setlocalversion
 %{_kernelsrcdir}/scripts/*.c
+%{_kernelsrcdir}/scripts/*.h
 %attr(755,root,root) %{_kernelsrcdir}/scripts/*.sh
 %{_kernelsrcdir}/scripts/selinux/genheaders/*.c
 %{_kernelsrcdir}/scripts/selinux/mdp/*.c
@@ -777,7 +757,7 @@ fi
 %{_kernelsrcdir}/arch/parisc/install.sh
 %{_kernelsrcdir}/arch/x86/ia32/[!M]*
 %{_kernelsrcdir}/arch/arm/kvm
-%{_kernelsrcdir}/arch/ia64/kvm
+%{_kernelsrcdir}/arch/arm64/kvm
 %{_kernelsrcdir}/arch/mips/kvm
 %{_kernelsrcdir}/arch/powerpc/kvm
 %{_kernelsrcdir}/arch/s390/kvm
@@ -787,6 +767,7 @@ fi
 %exclude %{_kernelsrcdir}/drivers/lguest/lg.h
 %exclude %{_kernelsrcdir}/drivers/media/pci/bt8xx/bttv.h
 %{_kernelsrcdir}/block
+%{_kernelsrcdir}/certs
 %{_kernelsrcdir}/crypto
 %{_kernelsrcdir}/drivers
 %{_kernelsrcdir}/firmware
@@ -811,6 +792,7 @@ fi
 %exclude %{_kernelsrcdir}/scripts/module-common.lds
 %exclude %{_kernelsrcdir}/scripts/setlocalversion
 %exclude %{_kernelsrcdir}/scripts/*.c
+%exclude %{_kernelsrcdir}/scripts/*.h
 %exclude %{_kernelsrcdir}/scripts/*.sh
 %exclude %dir %{_kernelsrcdir}/scripts/selinux
 %exclude %{_kernelsrcdir}/scripts/selinux/Makefile