|
@@ -30,10 +30,10 @@ 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 18
|
|
|
-%define patchlevel 17
|
|
|
-%define kversion 3.%{sublevel}
|
|
|
-%define rpmversion 3.%{sublevel}.%{patchlevel}
|
|
|
+%define sublevel 1
|
|
|
+%define patchlevel 12
|
|
|
+%define kversion 4.%{sublevel}
|
|
|
+%define rpmversion 4.%{sublevel}.%{patchlevel}
|
|
|
%define release 1%{?_dist_release}
|
|
|
|
|
|
%define make_target bzImage
|
|
@@ -197,7 +197,7 @@ BuildRequires: bc
|
|
|
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
-Packager: daisuke, shaolin, iwamoto
|
|
|
+Packager: daisuke, shaolin, iwamoto, Takemikaduchi
|
|
|
|
|
|
Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-%{kversion}.tar.xz
|
|
|
|
|
@@ -254,8 +254,7 @@ Patch1610: linux-2.6.23-atkbd-dell-multimedia.patch
|
|
|
Patch1630: linux-2.6.23-module_version.patch
|
|
|
Patch1650: linux-3.8-input-kill-stupid-messages.patch
|
|
|
Patch1770: linux-2.6-valid-ether-addr.patch
|
|
|
-Patch1840: linux-2.6-defaults-pci_no_msi.patch
|
|
|
-Patch1850: linux-2.6-silence-fbcon-logo.patch
|
|
|
+Patch1850: silence-fbcon-logo.patch
|
|
|
Patch1890: linux-2.6.35-mmc-sdhci-update.patch
|
|
|
|
|
|
Patch1900: linux-2.6.35-quirk-lenovo-itpm.patch
|
|
@@ -295,18 +294,18 @@ Patch2710: linux-2.6-drm-ignore-invalid-EDID-extensions.patch
|
|
|
# 6000 to 10000 is for Vine Linux
|
|
|
#
|
|
|
|
|
|
-# aufs3
|
|
|
-%define aufs_version 3.18.1+-20150704
|
|
|
+# aufs4
|
|
|
+%define aufs_version 4.1-20151007
|
|
|
Patch6100: aufs%{aufs_version}.patch
|
|
|
Source6100: aufs%{aufs_version}.tar.xz
|
|
|
|
|
|
#
|
|
|
# TuxOnIce (formerly suspend2) patch
|
|
|
-%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
|
|
|
+# %define tuxonice_version 3.18-20150704
|
|
|
+%define tuxonice_version 4.1.10-2015-10-10
|
|
|
+#Patch9000: tuxonice-%{tuxonice_version}.patch
|
|
|
+Patch9000: tuxonice-for-linux-%{tuxonice_version}.patch
|
|
|
+Patch9001: 0001-toi-4.1-attempt-to-fix-compiling-without-TOI.patch
|
|
|
|
|
|
#
|
|
|
# 10000 to 20000 is for stuff that has to come last due to the
|
|
@@ -577,8 +576,6 @@ cd linux-%{kversion}
|
|
|
%patch1650 -p1
|
|
|
#
|
|
|
%patch1770 -p1
|
|
|
-# disable PCI MSI by default
|
|
|
-%patch1840 -p1
|
|
|
# dont show fbcon logo on quiet mode
|
|
|
%patch1850 -p1
|
|
|
# add quirk for ricoh mmc (e823)
|
|
@@ -646,8 +643,6 @@ echo "header-y += aufs_type.h" >> include/uapi/linux/Kbuild
|
|
|
# tuxonice
|
|
|
%patch9000 -p1
|
|
|
%patch9001 -p1
|
|
|
-%patch9002 -p1
|
|
|
-%patch9003 -p1
|
|
|
|
|
|
%endif
|
|
|
|
|
@@ -1175,6 +1170,21 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Oct 28 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.1.12-1
|
|
|
+- update to 4.1.12
|
|
|
+- update configs
|
|
|
+- remove Patch1840 (linux-2.6-defaults-pci_no_msi.patch)
|
|
|
+- update Patch1850 (silence-fbcon-logo.patch)
|
|
|
+- update aufs and tuxonice sources
|
|
|
+
|
|
|
+* Wed Jul 15 2015 Daisuke SUZUKI <daisuke@vinelinux.org> 3.18.18-1
|
|
|
+- update to 3.18.18
|
|
|
+
|
|
|
+* Tue Jul 7 2015 Daisuke SUZUKI <daisuke@vinelinux.org> 3.18.17-2
|
|
|
+- update configs
|
|
|
+ - add missing configs.
|
|
|
+ - set CONFIG_FW_LOADER_USER_HELPER_FALLBACK to y
|
|
|
+
|
|
|
* Fri Jul 3 2015 Daisuke SUZUKI <daisuke@vinelinux.org> 3.18.17-1
|
|
|
- update to 3.18.17
|
|
|
- update tuxonice, aufs
|