|
|
@@ -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 2
|
|
|
-%define patchlevel 20
|
|
|
+%define sublevel 4
|
|
|
+%define patchlevel 3
|
|
|
%define kversion 3.%{sublevel}
|
|
|
%define rpmversion 3.%{sublevel}.%{patchlevel}
|
|
|
%define release 1%{?_dist_release}
|
|
|
@@ -259,7 +259,6 @@ Patch1830: linux-2.6-w1-hush-debug.patch
|
|
|
Patch1840: linux-2.6-defaults-pci_no_msi.patch
|
|
|
Patch1850: linux-2.6-silence-fbcon-logo.patch
|
|
|
Patch1860: linux-2.6-silence-acpi-blacklist.patch
|
|
|
-Patch1870: linux-2.6.35-input-mouse-alps-dell-e6510.patch
|
|
|
Patch1890: linux-2.6.35-mmc-sdhci-update.patch
|
|
|
Patch1900: linux-2.6.35-quirk-lenovo-itpm.patch
|
|
|
|
|
|
@@ -281,7 +280,6 @@ Patch2700: linux-2.6.35-drm-update.patch
|
|
|
Patch2710: linux-2.6-drm-ignore-invalid-EDID-extensions.patch
|
|
|
|
|
|
|
|
|
-# misc fix
|
|
|
|
|
|
#
|
|
|
# External drivers that are about to get accepted upstream
|
|
|
@@ -299,14 +297,14 @@ Patch6030: unionfs-2.5.10_for_3.2.patch
|
|
|
Patch6031: unionfs-2.5.8-open-unlink-ftruncate-crash-fix.patch
|
|
|
|
|
|
# aufs3
|
|
|
-Patch6100: linux-3.2-aufs3.patch
|
|
|
-Patch6101: linux-3.2-aufs3-proc_map.patch
|
|
|
+Patch6100: linux-3.4-aufs3.patch
|
|
|
+#Patch6101: linux-3.2-aufs3-proc_map.patch
|
|
|
|
|
|
#
|
|
|
# TuxOnIce (formerly suspend2) patch
|
|
|
-%define tuxonice_version 3.2-current-for-3.2.6
|
|
|
-Patch9000: tuxonice-%{tuxonice_version}.patch.bz2
|
|
|
-Patch9010: tuxonice-build-fix-on-powerpc.patch
|
|
|
+%define tuxonice_version 3.2.1-for-linux-3.4
|
|
|
+Patch9000: tuxonice-%{tuxonice_version}.patch
|
|
|
+#Patch9010: tuxonice-build-fix-on-powerpc.patch
|
|
|
|
|
|
#
|
|
|
# 10000 to 20000 is for stuff that has to come last due to the
|
|
|
@@ -592,8 +590,6 @@ cd linux-%{kversion}
|
|
|
%patch1850 -p1
|
|
|
# silence acpi blacklist code
|
|
|
%patch1860 -p1
|
|
|
-# Recognize ALPS Touchpad on Dell E6510
|
|
|
-%patch1870 -p1
|
|
|
# add quirk for ricoh mmc (e823)
|
|
|
# http://kernel.ubuntu.com/git?p=ubuntu/ubuntu-maverick.git;a=commit;h=be04c161614e57f31deae7505afcdec220a7dd1f
|
|
|
##VINE## %patch1880 -p1
|
|
|
@@ -628,8 +624,6 @@ cd linux-%{kversion}
|
|
|
|
|
|
# v4l
|
|
|
|
|
|
-# misc fix
|
|
|
-
|
|
|
|
|
|
#
|
|
|
# External drivers that are about to get accepted upstream
|
|
|
@@ -653,11 +647,11 @@ cd linux-%{kversion}
|
|
|
|
|
|
# aufs
|
|
|
%patch6100 -p1
|
|
|
-%patch6101 -p1
|
|
|
+#%patch6101 -p1
|
|
|
|
|
|
# tuxonice
|
|
|
%patch9000 -p1
|
|
|
-%patch9010 -p1
|
|
|
+#%patch9010 -p1
|
|
|
%endif
|
|
|
|
|
|
#
|
|
|
@@ -917,6 +911,9 @@ rm -rf $RPM_BUILD_ROOT%{_prefix}/src/linux-%{kversion}/Documentation
|
|
|
ln -sf %{_docdir}/kernel-doc-%{kversion}/Documentation $RPM_BUILD_ROOT%{_prefix}/src/linux-%{kversion}/
|
|
|
sync
|
|
|
|
|
|
+#
|
|
|
+rm -f $RPM_BUILD_ROOT%{_prefix}/src/linux-%{kversion}/arch/x86/tools/relocs
|
|
|
+
|
|
|
# set the EXTRAVERSION to <version>custom, so that people who follow a kernel building howto
|
|
|
# don't accidentally overwrite their currently working moduleset and hose their system
|
|
|
perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}custom/" $RPM_BUILD_ROOT/usr/src/linux-%{kversion}/Makefile
|
|
|
@@ -1173,11 +1170,9 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
-* Sat Jun 16 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 3.2.20-1
|
|
|
-- update to 3.2.20
|
|
|
-
|
|
|
-* Sat May 12 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 3.2.17-1
|
|
|
-- new upstream release
|
|
|
+* Mon Jun 18 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 3.4.3-1
|
|
|
+- update to 3.4.3
|
|
|
+- update tuxonice/aufs3 patch
|
|
|
|
|
|
* Thu May 03 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 3.2.16-1
|
|
|
- update to 3.2.16
|
daisuke