Browse Source

2.6.33-3

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@743 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 14 years ago
parent
commit
8aa3ffcd38
1 changed files with 11 additions and 10 deletions
  1. 11 10
      k/kernel/kernel-vl.spec

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

@@ -27,7 +27,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 %define patchlevel 1
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release 2%{?_dist_release}
+%define release 3%{?_dist_release}
 
 %define make_target bzImage
 %define hdrarch %_target_cpu
@@ -327,13 +327,9 @@ Patch2504: linux-2.6-at76.patch
 # http://www.bootsplash.de/
 #Patch6020: linux-2.6.31-bootsplash.patch
 
-# unionfs 2.5.2
+# unionfs 2.5.4
 # http://www.am-utils.org/project-unionfs.html
-#Patch6030: linux-2.6.31-unionfs-2.5.2.patch
-
-# squashfs 3.4 - upstream since 2.6.29
-# http://squashfs.sourceforge.net/
-# Patch6040: linux-2.6.27-squashfs-3.4.patch
+Patch6030: unionfs-2.5.4_for_2.6.33.diff.gz
 
 #
 # TuxOnIce (formerly suspend2) patch
@@ -692,9 +688,9 @@ cd linux-%{kversion}
 #%patch6020 -p1
 
 # unionfs
-#%if !%{_minimum_patches}
-#%patch6030 -p1
-#%endif
+%if !%{_minimum_patches}
+%patch6030 -p1
+%endif
 
 # squashfs
 # %patch6040 -p1
@@ -1207,6 +1203,11 @@ fi
 
 
 %changelog
+* Wed Mar 24 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.33-3
+- change configs
+  - enable CONFIG_PREEMPT, disable CONFIG_PREEMPT_VOLUNTARY
+- update unionfs to 2.5.4
+
 * Tue Mar 15 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.33-2
 - update to 2.6.33.1
 - remove bootsplash patch, we use plymouth