Browse Source

kernel:
- update to 3.2
- require module-init-tools >= 3.16


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

daisuke 12 years ago
parent
commit
3a713739a4
1 changed files with 11 additions and 9 deletions
  1. 11 9
      k/kernel/kernel-vl.spec

+ 11 - 9
k/kernel/kernel-vl.spec

@@ -24,8 +24,8 @@ 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 1
-%define patchlevel 6
+%define sublevel 2
+%define patchlevel 0
 %define kversion 3.%{sublevel}
 %define rpmversion 3.%{sublevel}.%{patchlevel}
 %define release 1%{?_dist_release}
@@ -150,7 +150,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 >= 6.0.93, linux-firmware >= 20110601-1
+%define kernel_prereq  fileutils, module-init-tools >= 3.16, initscripts >= 8.80, mkinitrd >= 6.0.93, linux-firmware >= 20110601-1
 
 Name: kernel
 Group: System Environment/Kernel
@@ -232,7 +232,6 @@ Patch800: linux-2.6-build-nonintconfig.patch
 #
 
 # NIC driver updates
-Patch1393: linux-2.6-e100-race.patch
 
 Patch1394: linux-2.6-zd1211rw-gw-us54gxs.patch
 
@@ -268,7 +267,7 @@ Patch1900: linux-2.6.35-quirk-lenovo-itpm.patch
 Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch
 
 # IDE
-Patch2010: linux-2.6.31-ide-piix-prefer-ata_piix.patch
+Patch2010: linux-3.2-ide-piix-prefer-ata_piix.patch
 
 # SCSI
 Patch2301: linux-2.6.23-VMWare5-fix-LSI_emulation.patch
@@ -295,12 +294,12 @@ Patch2710: linux-2.6-drm-ignore-invalid-EDID-extensions.patch
 
 # unionfs 2.5.10
 # http://www.am-utils.org/project-unionfs.html
-Patch6030: unionfs-2.5.10_for_3.1.0-rc4.diff.gz
+Patch6030: unionfs-2.5.10_for_3.2.patch
 Patch6031: unionfs-2.5.8-open-unlink-ftruncate-crash-fix.patch
 
 #
 # TuxOnIce (formerly suspend2) patch
-%define tuxonice_version 3.2-for-3.1-20111001
+%define tuxonice_version 3.2-for-3.2-rc5
 Patch9000: tuxonice-%{tuxonice_version}.patch.bz2
 Patch9010: tuxonice-build-fix-on-powerpc.patch
 
@@ -558,8 +557,6 @@ cd linux-%{kversion}
 #
 
 # NIC driver fixes.
-# fix race in e100 driver
-%patch1393 -p1
 # add support PLANEX GW-US54GXS
 ##VINE## %patch1394 -p1
 
@@ -1165,6 +1162,11 @@ fi
 
 
 %changelog
+* Sat Jan 07 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 3.2.0-1
+- update to 3.2
+- update x86 configs
+- prereq module-init-tools >= 3.16
+
 * Thu Dec 22 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 3.1.6-1
 - update to 3.1.6