- updated to 3.11.7

[packages/kernel.git] / kernel-vanilla.spec

diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index 1e0b79d8b7789e153c95c080887d7ebd6226c0fa..a5ce1bb0cd3280f26d05fad5292d5cbf1e37b996 100644 (file)
--- 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.8
-%define                postver         .8
+%define                basever         3.11
+%define                postver         7
 %define                rel             1
 
-%define                alt_kernel      3.8-vanilla
+%define                alt_kernel      3.11-vanilla
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}
@@ -21,16 +21,16 @@ Summary(et.UTF-8):  Linuxi kernel (ehk operatsioonisüsteemi tuum)
 Summary(fr.UTF-8):     Le Kernel-Linux (La partie centrale du systeme)
 Summary(pl.UTF-8):     Jądro Linuksa
 Name:          kernel%{_alt_kernel}
-Version:       %{basever}%{postver}
+Version:       %{basever}.%{postver}
 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: 1c738edfc54e7c65faeb90c436104e2f
-%if "%{_postver}" != "%{nil}"
+# Source0-md5: fea363551ff45fbe4cb88497b863b261
+%if "%{postver}" != "0"
 Source1:       http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Source1-md5: 95224572ecb1f4c7089683c1f06ef2b4
+# Source1-md5: 68472945252ce00a86cf65638786c7b9
 %endif
 
 Source2:       kernel.sysconfig
@@ -356,7 +356,7 @@ ln -s %{SOURCE3} kernel-module-build.pl
 ln -s %{SOURCE4} Makefile
 cd linux-%{basever}
 
-%if "%{_postver}" != "%{nil}"
+%if "%{postver}" != "0"
 %{__bzip2} -dc %{SOURCE1} | patch -p1 -s
 %endif
 
@@ -388,6 +388,7 @@ install -d arch/%{target_arch_dir}
 %ifarch x86_64
        cat %{SOURCE11} > %{defconfig}
 %endif
+sed -i "s:CONFIG_LOCALVERSION=\"\":CONFIG_LOCALVERSION=\"-%{localversion}\":" %{defconfig}
 
 ln -sf %{defconfig} .config
 cd -
@@ -525,8 +526,8 @@ fi
 
 %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 --initrdfs=initramfs %{initrd_dir}/initrd-%{kernel_release}.img %{kernel_release}
 fi
 
@@ -536,9 +537,10 @@ if [[ "$USE_DRACUT" != [Nn][Oo] ]] && [ -x /sbin/dracut ]; then
 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
+if [ -x /sbin/update-grub -a -f /etc/sysconfig/grub ]; then
+       if [ "$(. /etc/sysconfig/grub; echo ${UPDATE_GRUB:-no})" = "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: %{alt_kernel}}"
@@ -775,7 +777,10 @@ fi
 %{_kernelsrcdir}/arch/m68k/install.sh
 %{_kernelsrcdir}/arch/parisc/install.sh
 %{_kernelsrcdir}/arch/x86/ia32/[!M]*
+%{_kernelsrcdir}/arch/arm/kvm
+%{_kernelsrcdir}/arch/arm64/kvm
 %{_kernelsrcdir}/arch/ia64/kvm
+%{_kernelsrcdir}/arch/mips/kvm
 %{_kernelsrcdir}/arch/powerpc/kvm
 %{_kernelsrcdir}/arch/s390/kvm
 %{_kernelsrcdir}/arch/x86/kvm