Bläddra i källkod

kernel: update to 3.1.3

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5217 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 13 år sedan
förälder
incheckning
ddfc079903
1 ändrade filer med 16 tillägg och 11 borttagningar
  1. 16 11
      k/kernel/kernel-vl.spec

+ 16 - 11
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 0
-%define patchlevel 8
+%define sublevel 1
+%define patchlevel 3
 %define kversion 3.%{sublevel}
 %define rpmversion 3.%{sublevel}.%{patchlevel}
 %define release 1%{?_dist_release}
@@ -188,7 +188,7 @@ Vendor:		Project Vine
 Distribution:	Vine Linux
 Packager:	daisuke, shaolin, iwamoto
 
-Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
+Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-%{kversion}.tar.xz
 
 Source10: COPYING.modules
 Source11: genkey
@@ -246,10 +246,10 @@ Patch1410: linux-2.6.35-iwlwifi-support-new-ucode.patch
 Patch1420: linux-3.0.4_macbookair_middle2011_fixedmode_hackyhack.patch
 
 # MBA Mid2011 trackpad support
-Patch1421: linux-3.0.4_macbookair_middle2011_trackpad.patch
+#Patch1421: linux-3.0.4_macbookair_middle2011_trackpad.patch
 
 # MBA Mid2011 special keys support
-Patch1422: linux-3.0.4_macbookair_middle2011_hid.patch
+#Patch1422: linux-3.1.3_macbookair_middle2011_hid.patch
 
 # Misc bits.
 Patch1610: linux-2.6.23-atkbd-dell-multimedia.patch
@@ -295,14 +295,13 @@ 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.0.4.diff.gz
+Patch6030: unionfs-2.5.10_for_3.1.0-rc4.diff.gz
 Patch6031: unionfs-2.5.8-open-unlink-ftruncate-crash-fix.patch
 
 #
 # TuxOnIce (formerly suspend2) patch
-##VINE## %define tuxonice_version 3.2-for-2.6.35
-##VINE## Patch9000: tuxonice-%{tuxonice_version}.patch.bz2
-Patch9000: current-tuxonice-for-3.0.patch.bz2
+%define tuxonice_version 3.2-for-3.1-20111001
+Patch9000: tuxonice-%{tuxonice_version}.patch.bz2
 Patch9010: tuxonice-build-fix-on-powerpc.patch
 
 #
@@ -570,9 +569,9 @@ cd linux-%{kversion}
 # initial MBA Mid2011 hacky support
 %patch1420 -p1
 # MBA Mid2011 trackpad support
-%patch1421 -p1
+#%patch1421 -p1
 # MBA Mid2011 special keys support
-%patch1422 -p1
+#%patch1422 -p1
 
 # Misc fixes
 # Make multimedia buttons on Dell Inspiron 8200 work.
@@ -1166,6 +1165,12 @@ fi
 
 
 %changelog
+* Mon Oct 24 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 3.1.3-1
+- update to 3.1.3
+  - update x86 configs
+- update tuxonice to current
+- drop patch1421,1422
+
 * Mon Oct 24 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 3.0.8-1
 - update to 3.0.8