update to 2.6.33

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@539 ec354946-7b23-47d6-9f5a-488ba84defc7

k/kernel/kernel-vl.spec

@@ -23,11 +23,11 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 # that the kernel isn't the stock distribution kernel, for example by
 # adding some text to the end of the version number.
 #
-%define sublevel 32
-%define patchlevel 7
+%define sublevel 33
+%define patchlevel 0
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release 10%{?_dist_release}
+%define release 1%{?_dist_release}
 
 %define make_target bzImage
 %define hdrarch %_target_cpu
@@ -152,7 +152,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 # Packages that need to be installed before the kernel is, because the %post
 # scripts use them.
 #
-%define kernel_prereq  fileutils, module-init-tools >= 3.6, initscripts >= 8.80, mkinitrd >= 5.1.19.6, kernel-firmware >= %{version}
+%define kernel_prereq  fileutils, module-init-tools >= 3.6, initscripts >= 8.80, mkinitrd >= 6.0.93, kernel-firmware >= %{version}
 
 Name: kernel
 Group: System Environment/Kernel
@@ -206,7 +206,9 @@ Source100: logo_vine_clut224.ppm
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
+%if %{patchlevel}
 Patch1: patch-%{version}.%{patchlevel}.bz2
+%endif
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -218,7 +220,7 @@ Patch1: patch-%{version}.%{patchlevel}.bz2
 
 # 300 - 399   ppc(64)
 Patch350: linux-2.6.23-windtunnel-printk.patch
-Patch370: linux-2.6.26-force-hibernate-on-powerpc-smp.patch
+#Patch370: linux-2.6.26-force-hibernate-on-powerpc-smp.patch
 
 # 400 - 499   ia64
 # 500 - 599   s390(x)
@@ -240,8 +242,6 @@ Patch800: linux-2.6-build-nonintconfig.patch
 
 # NIC driver updates
 Patch1393: linux-2.6-e100-race.patch
-# kludge to make ich9 e1000 work
-Patch1400: linux-2.6-e1000-ich9.patch
 
 
 # Misc bits.
@@ -277,12 +277,15 @@ Patch2504: linux-2.6-at76.patch
 #Patch2602: linux-2.6-gspca-vc0321-fix-frame-overflow.patch
 
 # nouveau + drm fixes
-Patch2811: drm-radeon-fixes.patch
-Patch2812: drm-radeon-dp-support.patch
-Patch2814: drm-nouveau.patch
-Patch2819: drm-intel-big-hammer.patch
-#Patch2827: linux-2.6-intel-agp-clear-gtt.patch
-Patch2830: linux-2.6.32-drm-i915-gem-on-pae.patch
+#Patch2811: drm-radeon-fixes.patch
+#Patch2812: drm-radeon-dp-support.patch
+#Patch2814: drm-nouveau.patch
+#Patch2819: drm-intel-big-hammer.patch
+#Patch2822: drm-i915-resume-force-mode.patch
+#Patch2830: linux-2.6.32-drm-i915-gem-on-pae.patch
+#Patch2831: linux-2.6.32-drm-intel-uevent.patch
+#Patch2832: linux-2.6.32-drm-intel-wo-edp.patch
+#Patch2833: linux-2.6.32-drm-intel-donot-change-drm-config.patch
 
 # synaptics driver update
 #Patch2900: linux-2.6.27-synaptics-update.patch
@@ -324,7 +327,7 @@ Patch6020: linux-2.6.31-bootsplash.patch
 
 # unionfs 2.5.2
 # http://www.am-utils.org/project-unionfs.html
-Patch6030: linux-2.6.31-unionfs-2.5.2.patch
+#Patch6030: linux-2.6.31-unionfs-2.5.2.patch
 
 # squashfs 3.4 - upstream since 2.6.29
 # http://squashfs.sourceforge.net/
@@ -332,9 +335,9 @@ Patch6030: linux-2.6.31-unionfs-2.5.2.patch
 
 #
 # TuxOnIce (formerly suspend2) patch
-%define tuxonice_version 3.0.99.44-for-2.6.32
+#%define tuxonice_version 3.0.99.48-for-2.6.32
+%define tuxonice_version 3.0.99.48-for-head
 Patch9000: tuxonice-%{tuxonice_version}.patch.bz2
-#Patch9000: current-tuxonice-for-head.patch-20091009-v1.bz2
 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
@@ -529,7 +532,9 @@ cd linux-%{kversion}
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 # 
+%if %{patchlevel}
 %patch1 -p1
+%endif
 
 #
 # Patches to back out
@@ -550,7 +555,7 @@ cd linux-%{kversion}
 #
 
 %patch350 -p1
-%patch370 -p1
+#%patch370 -p1
 
 #
 # ia64
@@ -589,8 +594,6 @@ cd linux-%{kversion}
 # NIC driver fixes.
 # fix race in e100 driver
 %patch1393 -p1
-# e1000
-%patch1400 -p1
 
 # Misc fixes
 # disable pcmcia warnings
@@ -630,11 +633,15 @@ cd linux-%{kversion}
 #%patch2602 -p1
 
 # nouveau + drm fixes
-%patch2811 -p1
-%patch2812 -p1
-%patch2814 -p1
-%patch2819 -p1
-%patch2830 -p1
+#%patch2811 -p1
+#%patch2812 -p1
+#%patch2814 -p1
+#%patch2819 -p1
+#%patch2822 -p1
+#%patch2830 -p1
+#%patch2831 -p1
+#%patch2832 -p1
+#%patch2833 -p1
 
 # synaptics driver update
 #%patch2900 -p1
@@ -682,9 +689,9 @@ cd linux-%{kversion}
 %patch6020 -p1
 
 # unionfs
-%if !%{_minimum_patches}
-%patch6030 -p1
-%endif
+#%if !%{_minimum_patches}
+#%patch6030 -p1
+#%endif
 
 # squashfs
 # %patch6040 -p1
@@ -845,15 +852,7 @@ BuildKernel() {
     if [ -d arch/%{asmarch}/include ]; then
       cp -a --parents arch/%{asmarch}/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
     fi
-    mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
-    cd include
-    cp -a acpi config keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound trace video drm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
-    asmdir=$(readlink asm)
-    cp -a $asmdir $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/
-    cp -a ../arch/%{asmarch}/include/asm/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/$asmdir/
-    pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
-    ln -s $asmdir asm
-    popd
+    cp -a include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
 
     # Make sure the Makefile and version.h have a matching timestamp so that
     # external modules can be built
@@ -861,7 +860,12 @@ BuildKernel() {
     touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/.config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/linux/autoconf.h
     # Copy .config to include/config/auto.conf so "make prepare" is unnecessary.
     cp $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/.config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/config/auto.conf
-    cd .. 
+
+    if test -s vmlinux.id; then
+      cp vmlinux.id $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/vmlinux.id
+    else
+      echo >&2 "*** WARNING *** no vmlinux build ID! ***"
+    fi
 
     #
     # save the vmlinux file for kernel debugging into the kernel-debuginfo rpm
@@ -1200,6 +1204,28 @@ fi
 
 
 %changelog
+* Tue Mar 02 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.33-1
+- update to 2.6.33
+- update tuxonice to 3.0.99.48
+- drop e1000 patch
+- drop drm patches
+
+* Sat Feb 20 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.32-14
+- add Patch2833 for drm-intel
+  - do not change DRM configuration when releasing load detect pipe
+
+* Sat Feb 20 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.32-13
+- add Patch2831,2832 for drm-intel
+
+* Wed Feb 17 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.32-12
+- Requires(pre): mkinitrd >= 6.0.93
+  - new sysfs layout needs new mkinitrd
+- add Patch2822 for drm-intel
+
+* Mon Feb 15 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.32-11
+- update to 2.6.32.8
+- disable SYSFS_DEPRECATED
+
 * Tue Feb 09 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.32-10
 - update to 2.6.32.7
 - enable NUMA support on x86_64