|
|
@@ -23,11 +23,11 @@ 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 33
|
|
|
-%define patchlevel 4
|
|
|
+%define sublevel 34
|
|
|
+%define patchlevel 0
|
|
|
%define kversion 2.6.%{sublevel}
|
|
|
%define rpmversion 2.6.%{sublevel}
|
|
|
-%define release 5%{?_dist_release}
|
|
|
+%define release 1%{?_dist_release}
|
|
|
|
|
|
%define make_target bzImage
|
|
|
%define hdrarch %_target_cpu
|
|
|
@@ -222,14 +222,6 @@ Patch1: patch-%{version}.%{patchlevel}.bz2
|
|
|
Patch350: linux-2.6.23-windtunnel-printk.patch
|
|
|
#Patch370: linux-2.6.26-force-hibernate-on-powerpc-smp.patch
|
|
|
|
|
|
-# 400 - 499 ia64
|
|
|
-# 500 - 599 s390(x)
|
|
|
-# 600 - 699 sparc(64)
|
|
|
-
|
|
|
-# 400 - 499 ia64
|
|
|
-# 500 - 599 s390(x)
|
|
|
-# 600 - 699 sparc(64)
|
|
|
-
|
|
|
#
|
|
|
# Patches 800 through 899 are reserved for bugfixes to the core system
|
|
|
# and patches related to how RPMs are build
|
|
|
@@ -247,15 +239,17 @@ Patch1394: linux-2.6-zd1211rw-gw-us54gxs.patch
|
|
|
|
|
|
|
|
|
# Misc bits.
|
|
|
-Patch1600: linux-2.6.23-pcmcia-disable-warning.patch
|
|
|
+#Patch1600: linux-2.6.23-pcmcia-disable-warning.patch
|
|
|
Patch1610: linux-2.6.23-atkbd-dell-multimedia.patch
|
|
|
Patch1630: linux-2.6.23-module_version.patch
|
|
|
-Patch1650: linux-2.6.23-input-kill-stupid-messages.patch
|
|
|
+Patch1650: linux-2.6-input-kill-stupid-messages.patch
|
|
|
#Patch1660: linux-2.6.23-input-usblegacy.patch
|
|
|
#Patch1730: linux-2.6-ide-cd-shutup.patch
|
|
|
Patch1770: linux-2.6-valid-ether-addr.patch
|
|
|
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
|
|
|
|
|
|
# VM bits
|
|
|
Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch
|
|
|
@@ -333,7 +327,7 @@ Patch6030: unionfs-2.5.4_for_2.6.33.diff.gz
|
|
|
|
|
|
#
|
|
|
# TuxOnIce (formerly suspend2) patch
|
|
|
-%define tuxonice_version 3.1-for-2.6.33
|
|
|
+%define tuxonice_version 3.1.git20100519-for-2.6.34
|
|
|
Patch9000: tuxonice-%{tuxonice_version}.patch.bz2
|
|
|
|
|
|
#
|
|
|
@@ -596,7 +590,7 @@ cd linux-%{kversion}
|
|
|
|
|
|
# Misc fixes
|
|
|
# disable pcmcia warnings
|
|
|
-%patch1600 -p1
|
|
|
+#%patch1600 -p1
|
|
|
# Make multimedia buttons on Dell Inspiron 8200 work.
|
|
|
%patch1610 -p1
|
|
|
# Add missing MODULE_VERSION tags to some modules.
|
|
|
@@ -609,6 +603,10 @@ cd linux-%{kversion}
|
|
|
%patch1830 -p1
|
|
|
# disable PCI MSI by default
|
|
|
%patch1840 -p1
|
|
|
+# dont show fbcon logo on quiet mode
|
|
|
+%patch1850 -p1
|
|
|
+# silence acpi blacklist code
|
|
|
+%patch1860 -p1
|
|
|
|
|
|
#
|
|
|
# VM related fixes.
|
|
|
@@ -1203,6 +1201,12 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Wed May 19 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.34-1
|
|
|
+- update to 2.6.34
|
|
|
+- patch1850: do not show fbcon logo on quiet mode
|
|
|
+- patch1860: silence acpi blacklist code
|
|
|
+- update tuxonice to git snapshot
|
|
|
+
|
|
|
* Fri May 14 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.33-5
|
|
|
- update to 2.6.33.4
|
|
|
|
daisuke