- fix default behavior of UPDATE_GRUB

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

diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index 102d008c58ad47ba16d8db4dc7f361e69f8d7a76..0f0ee45cd9b5f59439df991e2d40e58ebf7879de 100644 (file)
--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@@ -4,13 +4,13 @@
 
 %{?debug:%define with_verbose 1}
 
-%define                _basever                3.2
-%define                _postver                .43
-%define                _rel                    1
+%define                _basever                3.4
+%define                _postver                .68
+%define                _rel                    2
 
 %define                _enable_debug_packages                  0
 
-%define                alt_kernel      vanilla
+%define                alt_kernel      3.4-vanilla
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}
@@ -30,10 +30,10 @@ Epoch:              3
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{_basever}.tar.xz
-# Source0-md5: 364066fa18767ec0ae5f4e4abcf9dc51
+# Source0-md5: 967f72983655e2479f951195953e8480
 %if "%{_postver}" != "%{nil}"
 Source1:       http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Source1-md5: c7fb90a2d200f0baf281c54884415e79
+# Source1-md5: 18e6716ed0f8c80c1177bc04705544ab
 %endif
 
 Source2:       kernel-vanilla-autoconf.h
@@ -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
@@ -621,7 +625,6 @@ fi
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko*
 %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/telephony/ixj_pcmcia.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*
@@ -654,7 +657,6 @@ fi
 /lib/modules/%{kernel_release}/kernel/drivers/*/pcmcia
 /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/isdn/hardware/avm/avm_cs.ko*
-/lib/modules/%{kernel_release}/kernel/drivers/telephony/ixj_pcmcia.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/*_cs.ko*
@@ -702,8 +704,15 @@ fi
 %{_kernelsrcdir}/localversion
 %{_kernelsrcdir}/arch/*/kernel/asm-offsets*
 %{_kernelsrcdir}/arch/*/kernel/sigframe*.h
+%{_kernelsrcdir}/arch/x86/syscalls/*.tbl
+%{_kernelsrcdir}/arch/x86/syscalls/*.sh
+%{_kernelsrcdir}/arch/x86/tools/relocs.c
 %{_kernelsrcdir}/drivers/lguest/lg.h
 %{_kernelsrcdir}/kernel/bounds.c
+%dir %{_kernelsrcdir}/tools
+%dir %{_kernelsrcdir}/tools/include
+%dir %{_kernelsrcdir}/tools/include/tools
+%{_kernelsrcdir}/tools/include/tools/*.h
 %dir %{_kernelsrcdir}/scripts
 %dir %{_kernelsrcdir}/scripts/kconfig
 %{_kernelsrcdir}/scripts/Kbuild.include
@@ -768,7 +777,7 @@ fi
 %exclude %{_kernelsrcdir}/scripts/*.sh
 %{_kernelsrcdir}/sound
 %{_kernelsrcdir}/security
-%{_kernelsrcdir}/tools
+%{_kernelsrcdir}/tools/*
 %{_kernelsrcdir}/usr
 %{_kernelsrcdir}/virt
 %{_kernelsrcdir}/COPYING