Browse Source

kernel:
- update to 3.7.7
- update tuxonice and aufs patch

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

daisuke 11 years ago
parent
commit
57d5448020
1 changed files with 23 additions and 14 deletions
  1. 23 14
      k/kernel/kernel-vl.spec

+ 23 - 14
k/kernel/kernel-vl.spec

@@ -30,8 +30,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 6
-%define patchlevel 10
+%define sublevel 7
+%define patchlevel 7
 %define kversion 3.%{sublevel}
 %define rpmversion 3.%{sublevel}.%{patchlevel}
 %define release 1%{?_dist_release}
@@ -261,10 +261,10 @@ Patch1890: linux-2.6.35-mmc-sdhci-update.patch
 Patch1900: linux-2.6.35-quirk-lenovo-itpm.patch
 
 # initial MBA Mid2011 hacky support
-Patch1910: linux-3.0.4_macbookair_middle2011_fixedmode_hackyhack.patch
+Patch1910: linux-3.7-macbookair_middle2011_fixedmode_hackyhack.patch
 
 # pt1 fix
-Patch1920: linux-3.6.8-pt1fix.patch
+Patch1920: linux-3.7.1-pt1fix.patch
 
 # VM bits
 Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch
@@ -296,11 +296,14 @@ Patch2710: linux-2.6-drm-ignore-invalid-EDID-extensions.patch
 #
 
 # aufs3
-Patch6100: linux-3.6-aufs3.patch
+#Patch6100: linux-3.6-aufs3.patch
+%define aufs_date 20130212
+Patch6100: aufs3.7-%{aufs_date}.patch
+Source6100: aufs3.7-%{aufs_date}.tar.xz
 
 #
 # TuxOnIce (formerly suspend2) patch
-%define tuxonice_version 3.2.1-for-linux-3.6
+%define tuxonice_version 3.7-20130212
 Patch9000: tuxonice-%{tuxonice_version}.patch
 
 #
@@ -636,7 +639,8 @@ cd linux-%{kversion}
 
 %if !%{_minimum_patches}
 # aufs
-%patch6100 -p1
+%__tar xf %{SOURCE6100}
+%patch6100 -p1 -b .aufs3
 
 # tuxonice
 %patch9000 -p1
@@ -739,9 +743,7 @@ BuildKernel() {
     fi
     rm -f .newoptions
     
-    ##VINE## make -s ARCH=$Arch nonint_oldconfig > /dev/null
     make -s ARCH=$Arch oldnoconfig > /dev/null
-    make -s ARCH=$Arch include/linux/version.h 
 
     make -s ARCH=$Arch %{?_smp_mflags} %{make_target}
     make -s ARCH=$Arch %{?_smp_mflags} modules || exit 1
@@ -1165,6 +1167,13 @@ fi
 
 
 %changelog
+* Tue Feb 12 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 3.7.7-1
+- update to 3.7.7
+- update tuxonice and aufs patch
+
+* Tue Dec 18 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 3.6.11-1
+- update to 3.6.11
+
 * Tue Dec 11 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 3.6.10-1
 - update to 3.6.10
 - pre require mkinitrd >= 6.0.93-22 to build correct initrd.
@@ -1187,7 +1196,7 @@ fi
 * Thu Nov 01 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 3.6.5-1
 - update to 3.6.5
 
-* Thu Oct 29 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 3.6.4-1
+* Mon Oct 29 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 3.6.4-1
 - update to 3.6.4
 
 * Mon Oct 22 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 3.6.3-1
@@ -1441,7 +1450,7 @@ fi
   - 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
+* Mon 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
 - change CONFIG_VGASTATE to y
@@ -1603,7 +1612,7 @@ fi
   - re-enable CONFIG_SYSFS_DEPRECATED which is still needed by some
     userland utilities
 
-* Thu May 13 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.27-30
+* Wed May 13 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.27-30
 - update configs
   - disable CONFIG_SYSFS_DEPRECATED
 
@@ -1771,7 +1780,7 @@ fi
     ide_generic does not help in recent PCs, and may cause confusion,
     so it should be set 'n' now.
 
-* Wed Jul 22 2008 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 2.6.26-3
+* Tue Jul 22 2008 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 2.6.26-3
 - drop unneccesary powerpc patches
 - re-create Patch370 and ppc.config
 - add Patch380 and apply in reverse (until Vine goes to gcc-4.4.x)
@@ -3336,7 +3345,7 @@ fi
 * Tue Jun 29 2004 Arjan van de Ven <arjanv@redhat.com>
 - make a start at gpg signed modules support
 
-* Sat Jun 27 2004 Arjan van de Ven <arjanv@redhat.com>
+* Sun Jun 27 2004 Arjan van de Ven <arjanv@redhat.com>
 - experiment with making the hardlink call in post more efficient
 - 2.6.7-bk9