X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel-vanilla.spec;h=5a9e6693e648941ce70b8bceb6892a083315cc5d;hb=5c3e929e577c6c3cda7af19f1cf0f3a86a288bcf;hp=102d008c58ad47ba16d8db4dc7f361e69f8d7a76;hpb=265dc97d276984e4e870144ec667bddb3029c794;p=packages%2Fkernel.git

diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index 102d008..5a9e669 100644
--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@@ -5,12 +5,12 @@
 %{?debug:%define with_verbose 1}
 
 %define		_basever		3.2
-%define		_postver		.43
+%define		_postver		.54
 %define		_rel			1
 
 %define		_enable_debug_packages			0
 
-%define		alt_kernel	vanilla
+%define		alt_kernel	3.2-vanilla
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}
@@ -32,8 +32,8 @@ Group:		Base/Kernel
 Source0:	http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{_basever}.tar.xz
 # Source0-md5:	364066fa18767ec0ae5f4e4abcf9dc51
 %if "%{_postver}" != "%{nil}"
-Source1:	http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Source1-md5:	c7fb90a2d200f0baf281c54884415e79
+Source1:	http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
+# Source1-md5:	f6b5c834cc9e7f7531748329bf589410
 %endif
 
 Source2:	kernel-vanilla-autoconf.h
@@ -53,8 +53,8 @@ BuildRequires:	gcc >= 5:3.2
 # for hostname command
 BuildRequires:	net-tools
 BuildRequires:	perl-base
-BuildRequires:	rpm-build >= 4.4.9-56
-BuildRequires:	rpmbuild(macros) >= 1.217
+BuildRequires:	rpm-build >= 4.5-74
+BuildRequires:	rpmbuild(macros) >= 1.652
 Autoreqprov:	no
 Requires(post):	coreutils
 Requires(post):	geninitrd >= 12639-1
@@ -339,7 +339,7 @@ Pakiet zawiera dokumentację do jądra Linuksa pochodzącą z katalogu
 %setup -q -n linux-%{_basever}
 
 %if "%{_postver}" != "%{nil}"
-%{__bzip2} -dc %{SOURCE1} | patch -p1 -s
+%{__xz} -dc %{SOURCE1} | patch -p1 -s
 %endif
 
 %patch0 -p1
@@ -511,9 +511,10 @@ fi
 %post
 %depmod %{kernel_release}
 
+%posttrans
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+# generate simple initramfs/initrd image
 if [[ "$USE_GENINITRD" != [Nn][Oo] ]]; then
-	# generate initrd after all dependant modules are installed
 	/sbin/geninitrd -f %{initrd_dir}/initrd-%{kernel_release}.img %{kernel_release}
 fi
 
@@ -522,13 +523,12 @@ if [[ "$USE_DRACUT" != [Nn][Oo] ]] && [ -x /sbin/dracut ]; then
 	/sbin/dracut --force --quiet /boot/initramfs-%{kernel_release}.img %{kernel_release}
 fi
 
-# update boot loaders when old package files are gone from filesystem
+# update boot loader
 if [ -x /sbin/update-grub -a -f /etc/sysconfig/grub ]; then
-	if [ "$(. /etc/sysconfig/grub; echo ${UPDATE_GRUB:-no})" = "yes" ]; then
+	if [ "$(. /etc/sysconfig/grub; echo ${UPDATE_GRUB:-yes})" = "yes" ]; then
 		/sbin/update-grub >/dev/null
 	fi
 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}"
 fi
@@ -602,6 +602,10 @@ fi
 /lib/modules/%{kernel_release}/kernel/kernel
 /lib/modules/%{kernel_release}/kernel/lib
 
+%ifarch x86_64
+/lib/modules/%{kernel_release}/kernel/mm
+%endif
+
 /lib/modules/%{kernel_release}/kernel/net
 
 %dir /lib/modules/%{kernel_release}/kernel/sound
@@ -702,6 +706,7 @@ fi
 %{_kernelsrcdir}/localversion
 %{_kernelsrcdir}/arch/*/kernel/asm-offsets*
 %{_kernelsrcdir}/arch/*/kernel/sigframe*.h
+%{_kernelsrcdir}/arch/x86/tools/relocs.c
 %{_kernelsrcdir}/drivers/lguest/lg.h
 %{_kernelsrcdir}/kernel/bounds.c
 %dir %{_kernelsrcdir}/scripts