From 4697b687b837469de882b33641806d5d9521e208 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 21 Mar 2010 10:21:47 +0100 Subject: [PATCH] kernel-snapshot: update to 2.6.34-rc2. --HG-- extra : convert_revision : 09e24a6b9ee94beb6affa67f855af88dfb430e1d --- srcpkgs/kernel-snapshot/INSTALL | 2 +- srcpkgs/kernel-snapshot/REMOVE | 2 +- .../kernel-snapshot/files/x86_64-dotconfig | 26 ++++++++++++------- srcpkgs/kernel-snapshot/template | 4 +-- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/srcpkgs/kernel-snapshot/INSTALL b/srcpkgs/kernel-snapshot/INSTALL index 1dc09fff41..f340873585 100644 --- a/srcpkgs/kernel-snapshot/INSTALL +++ b/srcpkgs/kernel-snapshot/INSTALL @@ -1,7 +1,7 @@ # # This script builds the required initramfs. # -_KVER="2.6.34-rc1" +_KVER="2.6.34-rc2" case "${ACTION}" in post) diff --git a/srcpkgs/kernel-snapshot/REMOVE b/srcpkgs/kernel-snapshot/REMOVE index ffb81608fd..c6ba845e0f 100644 --- a/srcpkgs/kernel-snapshot/REMOVE +++ b/srcpkgs/kernel-snapshot/REMOVE @@ -1,7 +1,7 @@ # # This script removes the initramfs. # -_KVER="2.6.34-rc1" +_KVER="2.6.34-rc2" case "${ACTION}" in post) diff --git a/srcpkgs/kernel-snapshot/files/x86_64-dotconfig b/srcpkgs/kernel-snapshot/files/x86_64-dotconfig index b958659ee8..68031a0e0a 100644 --- a/srcpkgs/kernel-snapshot/files/x86_64-dotconfig +++ b/srcpkgs/kernel-snapshot/files/x86_64-dotconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.34-rc1 -# Sat Mar 13 07:37:18 2010 +# Linux kernel version: 2.6.34-rc2 +# Sun Mar 21 09:26:03 2010 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -19,6 +19,7 @@ CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_MMU=y CONFIG_ZONE_DMA=y +CONFIG_NEED_DMA_MAP_STATE=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_BUG=y @@ -1169,6 +1170,7 @@ CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 CONFIG_CS5535_CLOCK_EVENT_SRC=m CONFIG_HP_ILO=m CONFIG_ISL29003=m +CONFIG_SENSORS_TSL2550=m CONFIG_DS1682=m CONFIG_TI_DAC7512=m CONFIG_C2PORT=m @@ -1194,6 +1196,7 @@ CONFIG_HAVE_IDE=y # # SCSI device support # +CONFIG_SCSI_MOD=m CONFIG_RAID_ATTRS=m CONFIG_SCSI=m CONFIG_SCSI_DMA=y @@ -1768,6 +1771,7 @@ CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SMSC75XX=m CONFIG_USB_NET_SMSC95XX=m CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_NET1080=m @@ -2174,15 +2178,9 @@ CONFIG_I2C_TINY_USB=m # CONFIG_I2C_PCA_PLATFORM=m # CONFIG_I2C_STUB is not set - -# -# Miscellaneous I2C Chip support -# -CONFIG_SENSORS_TSL2550=m # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set CONFIG_SPI=y CONFIG_SPI_MASTER=y @@ -2209,6 +2207,12 @@ CONFIG_SPI_TLE62X0=m # CONFIG_PPS=m # CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +CONFIG_PPS_CLIENT_KTIMER=m +CONFIG_PPS_CLIENT_LDISC=m CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y @@ -3044,6 +3048,7 @@ CONFIG_XEN_FBDEV_FRONTEND=m # CONFIG_FB_BROADSHEET is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_L4F00242T03=m CONFIG_LCD_LMS283GF05=m CONFIG_LCD_LTV350QV=m CONFIG_LCD_ILI9320=m @@ -3595,11 +3600,12 @@ CONFIG_LEDS_REGULATOR=m CONFIG_LEDS_BD2802=m CONFIG_LEDS_INTEL_SS4200=m CONFIG_LEDS_LT3593=m +CONFIG_LEDS_DELL_NETBOOKS=m +CONFIG_LEDS_TRIGGERS=y # # LED Triggers # -CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m @@ -4097,6 +4103,8 @@ CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m CONFIG_SMB_FS=m # CONFIG_SMB_NLS_DEFAULT is not set +CONFIG_CEPH_FS=m +# CONFIG_CEPH_FS_PRETTYDEBUG is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y # CONFIG_CIFS_STATS2 is not set diff --git a/srcpkgs/kernel-snapshot/template b/srcpkgs/kernel-snapshot/template index 28c359a0ac..9625a9d125 100644 --- a/srcpkgs/kernel-snapshot/template +++ b/srcpkgs/kernel-snapshot/template @@ -7,14 +7,14 @@ pkgname=kernel-snapshot #revision=1 _kernel_snapshot=yes _kernel_ver=2.6.34 -_kernel_patch_ver=rc1 +_kernel_patch_ver=rc2 version=${_kernel_ver}${_kernel_patch_ver} wrksrc="linux-${_kernel_ver}-${_kernel_patch_ver}" distfiles="${KERNEL_SITE}/kernel/v2.6/testing/linux-${_kernel_ver}-${_kernel_patch_ver}.tar.bz2" #version=${_kernel_ver} #wrksrc=linux-${version} #distfiles="${KERNEL_SITE}/kernel/v2.6/linux-${_kernel_ver}.tar.bz2" -checksum=2c6a79a03193f0130a94676fa73f280d09d4ad379ffc76f105f272e2132cd547 +checksum=79dca0eea4d4afc88c0ee1772c1d3ef0918a002c15d07b75d77df6b29e3e430e subpackages="$pkgname-firmware $pkgname-headers" # Reset some stuff.