|
|
@@ -28,7 +28,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
|
|
|
%define patchlevel 13
|
|
|
%define kversion 2.6.%{sublevel}
|
|
|
%define rpmversion 2.6.%{sublevel}
|
|
|
-%define release 18%{?_dist_release}
|
|
|
+%define release 19%{?_dist_release}
|
|
|
|
|
|
%define make_target bzImage
|
|
|
%define hdrarch %_target_cpu
|
|
|
@@ -49,7 +49,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
|
|
|
%define buildup 0
|
|
|
%define buildpae 0
|
|
|
%define with_headers 0
|
|
|
-%define with_firmware 1
|
|
|
+%define with_firmware 0
|
|
|
%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-*.config
|
|
|
%endif
|
|
|
|
|
|
@@ -63,7 +63,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
|
|
|
%define with_headers 1
|
|
|
%define buildsource 1
|
|
|
%define builddoc 1
|
|
|
-%define with_firmware 1
|
|
|
+%define with_firmware 0
|
|
|
%endif
|
|
|
|
|
|
%ifarch %{all_x86}
|
|
|
@@ -150,7 +150,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
|
|
|
# Packages that need to be installed before the kernel is, because the %post
|
|
|
# scripts use them.
|
|
|
#
|
|
|
-%define kernel_prereq fileutils, module-init-tools >= 3.6, initscripts >= 8.80, mkinitrd >= 6.0.93, kernel-firmware >= %{version}
|
|
|
+%define kernel_prereq fileutils, module-init-tools >= 3.6, initscripts >= 8.80, mkinitrd >= 6.0.93, linux-firmware >= 20110601-1
|
|
|
|
|
|
Name: kernel
|
|
|
Group: System Environment/Kernel
|
|
|
@@ -239,6 +239,8 @@ Patch1394: linux-2.6-zd1211rw-gw-us54gxs.patch
|
|
|
# e1000e update
|
|
|
Patch1400: linux-2.6-e1000e-update.patch
|
|
|
|
|
|
+# iwlwifi new ucode support
|
|
|
+Patch1410: linux-2.6.35-iwlwifi-support-new-ucode.patch
|
|
|
|
|
|
# Misc bits.
|
|
|
Patch1610: linux-2.6.23-atkbd-dell-multimedia.patch
|
|
|
@@ -249,6 +251,8 @@ 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
|
|
|
+Patch1880: linux-2.6.35-sdhci-enable-ricoh-mmc.patch
|
|
|
|
|
|
# VM bits
|
|
|
Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch
|
|
|
@@ -267,6 +271,8 @@ Patch2700: linux-2.6.35-drm-update.patch
|
|
|
# https://bugs.freedesktop.org/show_bug.cgi?id=31154
|
|
|
Patch2710: linux-2.6-drm-ignore-invalid-EDID-extensions.patch
|
|
|
|
|
|
+
|
|
|
+
|
|
|
#
|
|
|
# External drivers that are about to get accepted upstream
|
|
|
#
|
|
|
@@ -566,6 +572,12 @@ cd linux-%{kversion}
|
|
|
%patch1850 -p1
|
|
|
# silence acpi blacklist code
|
|
|
%patch1860 -p1
|
|
|
+# Recognize ALPS Touchpad on Dell E6510
|
|
|
+%patch1870 -p1
|
|
|
+# enable Ricoh MMC cardreader (e823/e822)
|
|
|
+# http://kernel.ubuntu.com/git?p=ubuntu/ubuntu-maverick.git;a=commit;h=be04c161614e57f31deae7505afcdec220a7dd1f
|
|
|
+%patch1880 -p1
|
|
|
+
|
|
|
|
|
|
#
|
|
|
# VM related fixes.
|
|
|
@@ -1116,6 +1128,12 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Jul 01 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.35-19
|
|
|
+- add patch1870 to recognize ALPS Touchpad on Dell E6510
|
|
|
+- add patch1880 to support newer ricoh mmc hosts
|
|
|
+- add patch1410 to support iwlwifi new ucode loading
|
|
|
+- disable kernel-firmware build and require linux-firmware instead.
|
|
|
+
|
|
|
* Mon May 16 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.35-18
|
|
|
- update configs
|
|
|
- disable PCI MSI by default (CONFIG_PCI_MSI_DEFAULT_ON)
|
daisuke