[arch-commits] CVS update of core/base/kernel26 (4 files)
Tobias Powalowski
tpowa at archlinux.org
Sun Nov 18 13:26:08 UTC 2007
Date: Sunday, November 18, 2007 @ 08:26:08
Author: tpowa
Path: /home/cvs-core/core/base/kernel26
Modified: PKGBUILD (1.274 -> 1.275) config (1.110 -> 1.111)
config.x86_64 (1.38 -> 1.39) ipw2x00-2.6.23.patch (1.1 -> 1.2)
'upgpkg: update to new version,
- cleaned up configs
- cleaned up patches
- cleaned up PKGBUILDS
- updated unionfs to 2.1.9
- alsa status 20071117
'
----------------------+
PKGBUILD | 114 ++++++++++++++++++++++---------------------------
config | 14 +++---
config.x86_64 | 28 ++++--------
ipw2x00-2.6.23.patch | 111 -----------------------------------------------
4 files changed, 71 insertions(+), 196 deletions(-)
Index: core/base/kernel26/PKGBUILD
diff -u core/base/kernel26/PKGBUILD:1.274 core/base/kernel26/PKGBUILD:1.275
--- core/base/kernel26/PKGBUILD:1.274 Wed Nov 14 02:27:19 2007
+++ core/base/kernel26/PKGBUILD Sun Nov 18 08:26:08 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.274 2007/11/14 07:27:19 tpowa Exp $
+# $Id: PKGBUILD,v 1.275 2007/11/18 13:26:08 tpowa Exp $
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
# Maintainer: Thomas Baechler <thomas at archlinux.org>
pkgname=kernel26
_basekernel=2.6.23
-pkgver=2.6.23.1
-pkgrel=8
+pkgver=2.6.23.8
+pkgrel=1
pkgdesc="The Linux Kernel and modules"
arch=(i686 x86_64)
license=('GPL2')
@@ -19,87 +19,81 @@
'alsa-driver' 'ieee80211' 'hostap-driver26'
'pwc' 'nforce' 'squashfs' 'unionfs' 'ivtv'
'zd1211' 'kvm-modules')
-md5sums=('2cc2fd4d521dc5d7cfce0d8a9d1b3472'
- '896c5d4e7fd68d37b8c16e5d2842563b'
- '406570fd9554bab20aa412fe87e0f9a4'
- 'd20891d510fdf9ef6682c6fe09e87f0b'
- '5a62bcc7e96601052c7405459b483826'
- 'ed6b42fea2f5d27f7eb920746ccc1ebb'
- 'a995ec849ea43d3c89d607bbdd1e7d09'
- '2365779022389399c5c705004cdbc583'
- '36858bd6a0bca63d2aa901b2e42d4a05'
- '493137566bc397ec762c86e64bd96849'
- '695d8578a0334fa9bb140917561f03d4'
- '3ed791c3af3099489faf0d22cbcc55a8'
- 'ec43c317886f0c2e438eb0b668893776'
- 'd17abe0925d3f8eab09a49cb65af4d94'
- '0c2e6161352cbc907c397d6d786b5d17'
- 'bbc730a590d4e09b3d937b257e5a4bfe'
- '62d3ff7c067a5aa82f57711b3a4ab86a'
- '6aede489fba0c2e9f706da4f1516db17'
- '1a7e063a4972143374049e0df006044e'
- 'b7e5e3ad9fae40eba0f1e91f49c31627'
- '19d8ed2579c18627ed4de1fd037a6652'
- '5b40baab7fcd10d244308f9d1afda75c'
- '36941e21388ecac2e79d3d1ab355402b'
- '7b44d23a25698ccdfe2303ff68d96b04'
- 'cbba32ffe3ee78685dc7bf8840a65a4a'
- '5b64cd1759dc705bb4d325998d86d8fd'
- 'c273cf48f268ea205f483239e7f51073'
- 'd03807b1d61028a2d048152961b032a5'
- '6712a865d8913a92d63a5d3ca774eb22'
- 'c21566dfd3c768976e118ecdff2ed96b'
- '118eedd5553e539d4979c4f024491a08')
install=kernel26.install
source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
### next two lines only needed for rc kernel building
- #http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.23-rc9.bz2
+ #http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.23-rc9.bz2
#http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.23-rc9-git2.bz2
# the main kernel config files
- config config.x86_64
+ config config.x86_64
# the archlinux boot logos
- logo_linux_clut224.ppm
- logo_linux_mono.pbm
- logo_linux_vga16.ppm
+ logo_linux_clut224.ppm
+ logo_linux_mono.pbm
+ logo_linux_vga16.ppm
# standard config files for mkinitcpio ramdisk
- kernel26.preset
- mkinitcpio-$pkgname.conf
+ kernel26.preset
+ mkinitcpio-$pkgname.conf
# add possibility to load your own dsdt acpi table
- acpi-dsdt-initrd-v0.8.4-2.6.21.patch
+ acpi-dsdt-initrd-v0.8.4-2.6.21.patch
# fix bluetooth on some toshiba notebooks
- toshiba-bluetooth.patch
+ toshiba-bluetooth.patch
# add additional unusual usb entry
- usb-storage-unusual-devs.patch
+ usb-storage-unusual-devs.patch
# improve intel macintosh support
- mactel-linux-2.6.23.patch
- # update to alsa snapshot 20071111
- http://www.archlinux.org/~tpowa/alsa-patches/alsa-20071113.patch.bz2
- http://www.archlinux.org/~tpowa/alsa-patches/alsa-include-20071113.patch.bz2
+ mactel-linux-2.6.23.patch
+ # update to alsa snapshot 20071116
+ http://www.archlinux.org/~tpowa/alsa-patches/alsa-20071117.patch.bz2
+ http://www.archlinux.org/~tpowa/alsa-patches/alsa-include-20071117.patch.bz2
# fix broken acpi c states on buggy bioses, which violate acpi specification
acpi-buggy-bios.patch
# add squashfs and unionfs
http://heanet.dl.sourceforge.net/sourceforge/squashfs/squashfs3.3.tar.gz
- http://download.filesystems.org/unionfs/unionfs-2.1/unionfs-2.1.8_for_2.6.23.1.diff.gz
+ http://download.filesystems.org/unionfs/unionfs-2.1/unionfs-2.1.9_for_2.6.23.1.diff.gz
# two patches below for aufs compatibility
put_filp.patch
lhash-2.6.22.patch
- # fix hibernating support for saa7134 devices
+ # fix hibernating support for saa7134 devices, implemented in .24 series finally
hibernate-saa7134.diff
# fixes from upstream kernel git trees
adjust_current_level_to_closest_available.patch
sata_sis-2.6.23.patch
ipw2x00-2.6.23.patch
- zd1211rw-oops-2.6.23.patch
- ide-helper-2.6.23.patch
# add possibility to undervolt certain cpus
linux-phc-0.3.0-kernel-vanilla-2.6.23rc3.patch
# adding genpatches from gentoo
2405_hostap-netdev-type.patch
2525_usb-storage-nikon-d200-quirk.patch
2530_usb-storage-nikon-d40x-quirk.patch
- # greg kroahs stable tree queue fixes
- pre-2.6.23.2.patch)
+)
+md5sums=('2cc2fd4d521dc5d7cfce0d8a9d1b3472'
+ '8f5bcde606a910025eebe71d8a237e95'
+ '5dae9e729d6c58b37b59d4e7cf6c645d'
+ 'f438434852b16e07e64ed7d9d63c3913'
+ '5a62bcc7e96601052c7405459b483826'
+ 'ed6b42fea2f5d27f7eb920746ccc1ebb'
+ 'a995ec849ea43d3c89d607bbdd1e7d09'
+ '2365779022389399c5c705004cdbc583'
+ '36858bd6a0bca63d2aa901b2e42d4a05'
+ '493137566bc397ec762c86e64bd96849'
+ '695d8578a0334fa9bb140917561f03d4'
+ '3ed791c3af3099489faf0d22cbcc55a8'
+ 'ec43c317886f0c2e438eb0b668893776'
+ 'a46ce1cb77902a3c2cc3ab25296f9656'
+ '3c8dce56a11b7b9e6f3cb091edd6be6a'
+ 'bbc730a590d4e09b3d937b257e5a4bfe'
+ '62d3ff7c067a5aa82f57711b3a4ab86a'
+ 'c420e878060557fa3372a2e717939ea2'
+ '1a7e063a4972143374049e0df006044e'
+ 'b7e5e3ad9fae40eba0f1e91f49c31627'
+ '19d8ed2579c18627ed4de1fd037a6652'
+ '5b40baab7fcd10d244308f9d1afda75c'
+ '36941e21388ecac2e79d3d1ab355402b'
+ '316f2df6cf66ee4ecfe2b5378f8c7cb7'
+ 'c273cf48f268ea205f483239e7f51073'
+ 'd03807b1d61028a2d048152961b032a5'
+ '6712a865d8913a92d63a5d3ca774eb22'
+ 'c21566dfd3c768976e118ecdff2ed96b')
build() {
[ "${CARCH}" = "i686" ] && KARCH=i386
@@ -111,7 +105,7 @@
# greg kroahs stable patches, in reference to:
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
- patch -Np1 -i ../pre-2.6.23.2.patch || return 1
+ # add them if needed
### next 2 lines are only needed for rc kernels
#patch -Np1 -i ../patch-$pkgver-rc9 || return 1
@@ -135,8 +129,8 @@
# patches are created by diffing the kernel source,
# against the alsa-kernel/ directory from tarball.
# status is 20071113
- patch -Np0 -i ../alsa-20071113.patch || return 1
- patch -Np0 -i ../alsa-include-20071113.patch || return 1
+ patch -Np0 -i ../alsa-20071117.patch || return 1
+ patch -Np0 -i ../alsa-include-20071117.patch || return 1
# improve intel macintosh support, in reference to:
# http://www.mactel-linux.org/wiki/Main_Page
@@ -167,12 +161,8 @@
# http://git.kernel.org/
# fix brightness buttons on some laptops
patch -Np1 -i ../adjust_current_level_to_closest_available.patch || return 1
- # fix zd1211rw oops
- patch -Np1 -i ../zd1211rw-oops-2.6.23.patch || return 1
# add ipw 2x00 fixes
patch -Np1 -i ../ipw2x00-2.6.23.patch || return 1
- # add ide helper which will appear in 2.6.23.2
- patch -Np1 -i ../ide-helper-2.6.23.patch || return 1
# adding some genpatches from gentoo, in reference to:
# http://sources.gentoo.org/viewcvs.py/linux-patches/genpatches-2.6/trunk/2.6.23/
@@ -186,7 +176,7 @@
# add unionfs support. in reference to:
# http://www.fsl.cs.sunysb.edu/project-unionfs.html
- patch -Np1 -i ../unionfs-2.1.8_for_2.6.23.1.diff || return 1
+ patch -Np1 -i ../unionfs-2.1.9_for_2.6.23.1.diff || return 1
# add put_filp and lhash patches for aufs, in reference to:
# http://aufs.sourceforge.net/
Index: core/base/kernel26/config
diff -u core/base/kernel26/config:1.110 core/base/kernel26/config:1.111
--- core/base/kernel26/config:1.110 Wed Nov 14 02:27:19 2007
+++ core/base/kernel26/config Sun Nov 18 08:26:08 2007
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.23
-# Wed Oct 10 06:03:09 2007
+# Sat Nov 17 12:57:29 2007
#
CONFIG_X86_32=y
CONFIG_GENERIC_TIME=y
@@ -69,7 +69,7 @@
CONFIG_SHMEM=y
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_SLUB_DEBUG=y
-#CONFIG_SLAB is not set
+# CONFIG_SLAB is not set
CONFIG_SLUB=y
# CONFIG_SLOB is not set
CONFIG_RT_MUTEXES=y
@@ -865,8 +865,6 @@
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
CONFIG_CONNECTOR=m
-# Memory Technology Devices (MTD)
-#
CONFIG_MTD=m
# CONFIG_MTD_DEBUG is not set
# CONFIG_MTD_CONCAT is not set
@@ -1835,7 +1833,6 @@
# CONFIG_INPUT_ATLAS_BTNS is not set
CONFIG_INPUT_ATI_REMOTE=m
CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_USB_APPLEIR=m
CONFIG_INPUT_KEYSPAN_REMOTE=m
# CONFIG_INPUT_POWERMATE is not set
# CONFIG_INPUT_YEALINK is not set
@@ -2736,6 +2733,10 @@
CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
#
+# SPI devices
+#
+
+#
# USB devices
#
CONFIG_SND_USB_AUDIO=m
@@ -3201,13 +3202,13 @@
CONFIG_ECRYPT_FS=m
CONFIG_UNION_FS=m
# CONFIG_UNION_FS_XATTR is not set
+# CONFIG_UNION_FS_DEBUG is not set
#
# Miscellaneous filesystems
#
# CONFIG_ADFS_FS is not set
CONFIG_AFFS_FS=m
-CONFIG_ECRYPT_FS=m
CONFIG_HFS_FS=m
CONFIG_HFSPLUS_FS=m
CONFIG_BEFS_FS=m
@@ -3227,7 +3228,6 @@
CONFIG_SQUASHFS=m
# CONFIG_SQUASHFS_EMBEDDED is not set
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_SQUASHFS_VMALLOC is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
Index: core/base/kernel26/config.x86_64
diff -u core/base/kernel26/config.x86_64:1.38 core/base/kernel26/config.x86_64:1.39
--- core/base/kernel26/config.x86_64:1.38 Wed Nov 14 02:27:19 2007
+++ core/base/kernel26/config.x86_64 Sun Nov 18 08:26:08 2007
@@ -1,8 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.23
-# Sat Oct 27 09:26:04 2007
-
+# Sat Nov 17 13:51:22 2007
#
CONFIG_X86_64=y
CONFIG_64BIT=y
@@ -776,8 +775,6 @@
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
CONFIG_CONNECTOR=m
-# Memory Technology Devices (MTD)
-#
CONFIG_MTD=m
# CONFIG_MTD_DEBUG is not set
# CONFIG_MTD_CONCAT is not set
@@ -1652,7 +1649,6 @@
# CONFIG_INPUT_ATLAS_BTNS is not set
CONFIG_INPUT_ATI_REMOTE=m
CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_USB_APPLEIR=m
CONFIG_INPUT_KEYSPAN_REMOTE=m
# CONFIG_INPUT_POWERMATE is not set
# CONFIG_INPUT_YEALINK is not set
@@ -2901,13 +2897,6 @@
CONFIG_GENERIC_ACL=y
#
-# Layered filesystems
-#
-CONFIG_ECRYPT_FS=m
-CONFIG_UNION_FS=m
-CONFIG_UNION_FS_XATTR=y
-
-#
# CD-ROM/DVD Filesystems
#
CONFIG_ISO9660_FS=m
@@ -2942,12 +2931,18 @@
CONFIG_RAMFS=y
CONFIG_CONFIGFS_FS=m
+# Layered filesystems
+#
+CONFIG_ECRYPT_FS=m
+CONFIG_UNION_FS=m
+CONFIG_UNION_FS_XATTR=y
+# CONFIG_UNION_FS_DEBUG is not set
+
#
# Miscellaneous filesystems
#
# CONFIG_ADFS_FS is not set
CONFIG_AFFS_FS=m
-CONFIG_ECRYPT_FS=m
CONFIG_HFS_FS=m
CONFIG_HFSPLUS_FS=m
CONFIG_BEFS_FS=m
@@ -2964,6 +2959,9 @@
CONFIG_JFFS2_RTIME=y
# CONFIG_JFFS2_RUBIN is not set
CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
@@ -2971,10 +2969,6 @@
CONFIG_UFS_FS=m
# CONFIG_UFS_FS_WRITE is not set
# CONFIG_UFS_DEBUG is not set
-CONFIG_SQUASHFS=m
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_SQUASHFS_VMALLOC is not set
#
# Network File Systems
Index: core/base/kernel26/ipw2x00-2.6.23.patch
diff -u core/base/kernel26/ipw2x00-2.6.23.patch:1.1 core/base/kernel26/ipw2x00-2.6.23.patch:1.2
--- core/base/kernel26/ipw2x00-2.6.23.patch:1.1 Sat Oct 27 05:30:59 2007
+++ core/base/kernel26/ipw2x00-2.6.23.patch Sun Nov 18 08:26:08 2007
@@ -164,113 +164,4 @@
struct work_struct request_passive_scan;
struct work_struct adapter_restart;
struct delayed_work rf_kill;
-
-From: Dan Williams <dcbw at redhat.com>
-Date: Wed, 10 Oct 2007 16:28:07 +0000 (-0400)
-Subject: [PATCH] ipw2100: send WEXT scan events
-X-Git-Tag: v2.6.24-rc1~125^2^2~13
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Flinville%2Fwireless-2.6.git;a=commitdiff_plain;h=d20c678a450a25c1c12925f60c1b4cc040acc17d
-
-[PATCH] ipw2100: send WEXT scan events
-
-ipw2100 wasn't sending WEXT scan events at all on scan completion. And
-like ipw2200, the driver aggressively auto-scans, requiring
-non-user-requested scan events to be batched together and sent at
-specific intervals instead of many times per seconds.
-
-Signed-off-by: Dan Williams <dcbw at redhat.com>
-Signed-off-by: John W. Linville <linville at tuxdriver.com>
----
-
-diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
-index 2d46a16..2fa8eed 100644
---- a/drivers/net/wireless/ipw2100.c
-+++ b/drivers/net/wireless/ipw2100.c
-@@ -2105,12 +2105,46 @@ static void isr_indicate_rf_kill(struct ipw2100_priv *priv, u32 status)
- queue_delayed_work(priv->workqueue, &priv->rf_kill, round_jiffies(HZ));
- }
-
-+static void send_scan_event(void *data)
-+{
-+ struct ipw2100_priv *priv = data;
-+ union iwreq_data wrqu;
-+
-+ wrqu.data.length = 0;
-+ wrqu.data.flags = 0;
-+ wireless_send_event(priv->net_dev, SIOCGIWSCAN, &wrqu, NULL);
-+}
-+
-+static void ipw2100_scan_event_later(struct work_struct *work)
-+{
-+ send_scan_event(container_of(work, struct ipw2100_priv,
-+ scan_event_later.work));
-+}
-+
-+static void ipw2100_scan_event_now(struct work_struct *work)
-+{
-+ send_scan_event(container_of(work, struct ipw2100_priv,
-+ scan_event_now));
-+}
-+
- static void isr_scan_complete(struct ipw2100_priv *priv, u32 status)
- {
- IPW_DEBUG_SCAN("scan complete\n");
- /* Age the scan results... */
- priv->ieee->scans++;
- priv->status &= ~STATUS_SCANNING;
-+
-+ /* Only userspace-requested scan completion events go out immediately */
-+ if (!priv->user_requested_scan) {
-+ if (!delayed_work_pending(&priv->scan_event_later))
-+ queue_delayed_work(priv->workqueue,
-+ &priv->scan_event_later,
-+ round_jiffies(msecs_to_jiffies(4000)));
-+ } else {
-+ priv->user_requested_scan = 0;
-+ cancel_delayed_work(&priv->scan_event_later);
-+ queue_work(priv->workqueue, &priv->scan_event_now);
-+ }
- }
-
- #ifdef CONFIG_IPW2100_DEBUG
-@@ -4378,6 +4412,7 @@ static void ipw2100_kill_workqueue(struct ipw2100_priv *priv)
- cancel_delayed_work(&priv->wx_event_work);
- cancel_delayed_work(&priv->hang_check);
- cancel_delayed_work(&priv->rf_kill);
-+ cancel_delayed_work(&priv->scan_event_later);
- destroy_workqueue(priv->workqueue);
- priv->workqueue = NULL;
- }
-@@ -6121,6 +6156,8 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
- INIT_DELAYED_WORK(&priv->wx_event_work, ipw2100_wx_event_work);
- INIT_DELAYED_WORK(&priv->hang_check, ipw2100_hang_check);
- INIT_DELAYED_WORK(&priv->rf_kill, ipw2100_rf_kill);
-+ INIT_WORK(&priv->scan_event_now, ipw2100_scan_event_now);
-+ INIT_DELAYED_WORK(&priv->scan_event_later, ipw2100_scan_event_later);
-
- tasklet_init(&priv->irq_tasklet, (void (*)(unsigned long))
- ipw2100_irq_tasklet, (unsigned long)priv);
-@@ -7425,6 +7462,8 @@ static int ipw2100_wx_set_scan(struct net_device *dev,
- }
-
- IPW_DEBUG_WX("Initiating scan...\n");
-+
-+ priv->user_requested_scan = 1;
- if (ipw2100_set_scan_options(priv) || ipw2100_start_scan(priv)) {
- IPW_DEBUG_WX("Start scan failed.\n");
-
-diff --git a/drivers/net/wireless/ipw2100.h b/drivers/net/wireless/ipw2100.h
-index de7d384..1ee3348 100644
---- a/drivers/net/wireless/ipw2100.h
-+++ b/drivers/net/wireless/ipw2100.h
-@@ -588,6 +588,10 @@ struct ipw2100_priv {
- struct delayed_work wx_event_work;
- struct delayed_work hang_check;
- struct delayed_work rf_kill;
-+ struct work_struct scan_event_now;
-+ struct delayed_work scan_event_later;
-+
-+ int user_requested_scan;
-
- u32 interrupts;
- int tx_interrupts;
+
\ No newline at end of file
More information about the arch-commits
mailing list