|
|
@@ -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 14
|
|
|
-%define patchlevel 29
|
|
|
+%define sublevel 18
|
|
|
+%define patchlevel 17
|
|
|
%define kversion 3.%{sublevel}
|
|
|
%define rpmversion 3.%{sublevel}.%{patchlevel}
|
|
|
%define release 1%{?_dist_release}
|
|
|
@@ -296,21 +296,24 @@ Patch2710: linux-2.6-drm-ignore-invalid-EDID-extensions.patch
|
|
|
#
|
|
|
|
|
|
# aufs3
|
|
|
-%define aufs_version 3.14-20140707
|
|
|
+%define aufs_version 3.18.1+-20150704
|
|
|
Patch6100: aufs%{aufs_version}.patch
|
|
|
Source6100: aufs%{aufs_version}.tar.xz
|
|
|
|
|
|
#
|
|
|
# TuxOnIce (formerly suspend2) patch
|
|
|
-%define tuxonice_version 3.14-20140707
|
|
|
+%define tuxonice_version 3.18-20150704
|
|
|
Patch9000: tuxonice-%{tuxonice_version}.patch
|
|
|
+Patch9001: 0001-toi-3.18-attempt-to-fix-compiling-without-TOI.patch
|
|
|
+Patch9002: 0002-toi-3.19-attempt-to-fix-TOI-for-32-bit-kernels.patch
|
|
|
+Patch9003: 0003-toi-3.19-remove-static-qualifier-from-check_image_ke.patch
|
|
|
|
|
|
#
|
|
|
# 10000 to 20000 is for stuff that has to come last due to the
|
|
|
# amount of drivers they touch. But only these should go here.
|
|
|
# Not patches you're too lazy for to put in the proper place.
|
|
|
#
|
|
|
-Patch10000: linux-2.6-LINUX_COMPILER-LANG_C.patch
|
|
|
+Patch10000: linux-3.18-LINUX_COMPILER-LANG_C.patch
|
|
|
|
|
|
# Security fix patches
|
|
|
|
|
|
@@ -642,6 +645,9 @@ echo "header-y += aufs_type.h" >> include/uapi/linux/Kbuild
|
|
|
|
|
|
# tuxonice
|
|
|
%patch9000 -p1
|
|
|
+%patch9001 -p1
|
|
|
+%patch9002 -p1
|
|
|
+%patch9003 -p1
|
|
|
|
|
|
%endif
|
|
|
|
|
|
@@ -1169,6 +1175,10 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Jul 3 2015 Daisuke SUZUKI <daisuke@vinelinux.org> 3.18.17-1
|
|
|
+- update to 3.18.17
|
|
|
+- update tuxonice, aufs
|
|
|
+
|
|
|
* Sat Jan 17 2015 Daisuke SUZUKI <daisuke@vinelinux.org> 3.14.29-1
|
|
|
- update to 3.14.29
|
|
|
|
daisuke