- up to 3.3.5

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index b2395724e6dfceb0b4a884766a928c0227e02f83..cb6c2903b8bf32f606ccd301a3e4525a2e602ebf 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -35,7 +35,6 @@
 %bcond_with    nfsroot         # build with root on NFS support
 
 %bcond_without imq             # imq support
-%bcond_without wrr             # wrr support
 %bcond_without esfq            # esfq support
 %bcond_without ipv6            # ipv6 support
 
@@ -91,8 +90,8 @@
 %endif
 
 %define                rel             1
-%define                basever         3.2
-%define                postver         .7
+%define                basever         3.3
+%define                postver         .5
 
 # __alt_kernel is list of features, empty string if none set
 # _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
@@ -132,10 +131,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: 7133f5a2086a7d7ef97abac610c094f5
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Patch0-md5:  899624bffed6a19578613b672cc9483f
+# Patch0-md5:  c44a49dcdaad9ba5385694859c4a9fea
 %endif
 
 Source3:       kernel-autoconf.h
@@ -162,7 +161,6 @@ Source49:   kernel-pax.config
 Source50:      kernel-no-pax.config
 Source55:      kernel-imq.config
 Source56:      kernel-reiser4.config
-Source57:      kernel-wrr.config
 
 Source58:      kernel-inittmpfs.config
 
@@ -181,9 +179,6 @@ Patch16:    kernel-pom-ng-mms-conntrack-nat.patch
 Patch22:       kernel-pom-ng-rsh.patch
 Patch23:       kernel-pom-ng-rpc.patch
 
-# based on http://mike.it-loops.com/rtsp/rtsp-2.6.26.patch
-Patch36:       kernel-nf_rtsp.patch
-
 # http://ftp.linux-vserver.org/pub/people/dhozac/p/k/delta-owner-xid-feat02.diff
 Patch37:       kernel-owner-xid.patch
 
@@ -202,9 +197,6 @@ Patch50:    kernel-imq.patch
 # http://www.kernel.org/pub/linux/kernel/people/edward/reiser4/reiser4-for-2.6/reiser4-for-2.6.35.patch.bz2
 Patch51:       kernel-reiser4.patch
 
-# http://www.zz9.dk/patches/wrr-linux-071203-2.6.25.patch.gz
-Patch52:       kernel-wrr.patch
-
 # http://fatooh.org/esfq-2.6/sfq-2.6.24.1.tar.bz2
 Patch53:       kernel-esfq.patch
 
@@ -220,7 +212,7 @@ Patch59:    kernel-rndis_host-wm5.patch
 # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
 Patch85:       kernel-hostap.patch
 
-# http://vserver.13thfloor.at/Experimental/patch-3.2.6-vs2.3.2.7.diff
+# http://vserver.13thfloor.at/Experimental/patch-3.3.1-vs2.3.3.2.diff
 Patch100:      kernel-vserver-2.3.patch
 Patch101:      kernel-vserver-fixes.patch
 
@@ -304,6 +296,7 @@ Requires:   virtual(module-tools)
 Requires:      cpuinfo(pae)
 %endif
 %endif
+Suggests:      dracut
 Suggests:      keyutils
 Suggests:      linux-firmware
 Provides:      %{name}(netfilter) = 20070806
@@ -673,9 +666,6 @@ sed -i 's/-Werror//' arch/alpha/kernel/Makefile
 # kernel-pom-ng-rpc.patch
 %patch23 -p1
 
-# kernel-nf_rtsp.patch
-%patch36 -p1
-
 # kernel-owner-xid.patch
 %if %{with vserver}
 %patch37 -p1
@@ -704,10 +694,6 @@ sed -i 's/-Werror//' arch/alpha/kernel/Makefile
 %patch53 -p1
 %endif
 
-%if %{with wrr}
-%patch52 -p1
-%endif
-
 %patch55 -p1
 %patch56 -p1
 
@@ -963,9 +949,6 @@ EOCONFIG
 %if %{with reiser4}
                %{SOURCE56} \
 %endif
-%if %{with wrr}
-               %{SOURCE57} \
-%endif
 %if %{with imq}
                %{SOURCE55} \
 %endif
@@ -1085,6 +1068,11 @@ cp -a$l %{srcdir}/* $RPM_BUILD_ROOT%{_kernelsrcdir}
 cp -a %{objdir}/Module.symvers $RPM_BUILD_ROOT%{_kernelsrcdir}
 cp -aL %{objdir}/.config $RPM_BUILD_ROOT%{_kernelsrcdir}
 cp -a %{objdir}/include $RPM_BUILD_ROOT%{_kernelsrcdir}
+# copy arch/x86/include/generated
+for dir in $(cd %{objdir} && find arch -name generated -type d); do
+       cp -a %{objdir}/$dir $RPM_BUILD_ROOT%{_kernelsrcdir}/$dir
+       find $RPM_BUILD_ROOT%{_kernelsrcdir}/$dir -name '.*.cmd' -exec rm "{}" ";"
+done
 
 # disable this here, causes a lot of build-time problems and our rpm-build disables it anyway
 %{__sed} -i -e 's|\(CONSTIFY_PLUGIN.*:=.*\)|# \1|' $RPM_BUILD_ROOT%{_kernelsrcdir}/Makefile
@@ -1150,6 +1138,11 @@ mv -f %{initrd_dir}/initrd{,.old} 2> /dev/null
 ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd
 %{?alt_kernel:ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd%{_alt_kernel}}
 
+# if dracut is present then generate full-featured initramfs
+if [ -x /sbin/dracut ]; then
+       /sbin/dracut --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
@@ -1269,7 +1262,7 @@ fi
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/hostap/hostap_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/libertas/*_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/parport/parport_cs.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/tty/serial/serial_cs.ko*
+%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*
 %endif
 %if %{with myown}
@@ -1336,7 +1329,7 @@ fi
 /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/hostap/hostap_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/libertas/*_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/parport/parport_cs.ko*
-/lib/modules/%{kernel_release}/kernel/drivers/tty/serial/serial_cs.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/tty/serial/8250/serial_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/usb/host/sl811_cs.ko*
 %endif