- update grub.cfg by default

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

diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index 0912ce5905a4bec201cdebd918073f0ae1c57b3e..a1fde4dbb38e7bd4572387ab559f233ca22fb4e7 100644 (file)
--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@@ -10,7 +10,7 @@
 
 %define                _enable_debug_packages                  0
 
-%define                alt_kernel      vanilla
+%define                alt_kernel      3.8-vanilla
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}
@@ -374,8 +374,6 @@ BuildKernel() {
 
        %{__make} %CrossOpts clean \
                RCS_FIND_IGNORE='-name build-done -prune -o'
-       %{__make} %CrossOpts include/linux/version.h \
-               %{?with_verbose:V=1}
 
        %{__make} %CrossOpts scripts/mkcompile_h \
                %{?with_verbose:V=1}
@@ -426,8 +424,6 @@ install include/generated/autoconf.h \
        $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/generated/autoconf-dist.h
 install include/generated/utsrelease.h \
        $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/generated/
-install include/linux/version.h \
-       $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux/
 install .config \
        $KERNEL_INSTALL_DIR%{_kernelsrcdir}/config-dist
 PreInstallKernel
@@ -472,8 +468,6 @@ cp -Rdp$l $KERNEL_BUILD_DIR/include/linux/* \
 %{__make} %CrossOpts mrproper
 install -d $RPM_BUILD_ROOT%{_kernelsrcdir}/include/generated
 install -d $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux
-install $KERNEL_BUILD_DIR/build-done/kernel%{_kernelsrcdir}/include/linux/version.h \
-       $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux
 install $KERNEL_BUILD_DIR/build-done/kernel%{_kernelsrcdir}/include/generated/autoconf-dist.h \
        $RPM_BUILD_ROOT%{_kernelsrcdir}/include/generated
 install $KERNEL_BUILD_DIR/build-done/kernel%{_kernelsrcdir}/include/generated/utsrelease.h \
@@ -522,11 +516,10 @@ 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
-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
+# update boot loader
+[ -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
@@ -611,9 +604,6 @@ fi
 %dir /lib/modules/%{kernel_release}/kernel/sound
 /lib/modules/%{kernel_release}/kernel/sound/ac97_bus.ko*
 /lib/modules/%{kernel_release}/kernel/sound/sound*.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/media/video/cx88/cx88-alsa.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/media/video/em28xx/em28xx-alsa.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/media/video/saa7134/saa7134-alsa.ko*
 
 %dir /lib/modules/%{kernel_release}/misc
 
@@ -674,9 +664,6 @@ fi
 %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/video/cx88/cx88-alsa.ko*
-/lib/modules/%{kernel_release}/kernel/drivers/media/video/em28xx/em28xx-alsa.ko*
-/lib/modules/%{kernel_release}/kernel/drivers/media/video/saa7134/saa7134-alsa.ko*
 
 %files sound-oss
 %defattr(644,root,root,755)