[arch-commits] Commit in kernel26/repos (4 files)

[Tobias Powalowski]

    Date: Friday, June 12, 2009 @ 05:54:15
  Author: tpowa
Revision: 42284

Merged revisions 42216,42278 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/kernel26/trunk

........
  r42216 | tpowa | 2009-06-11 19:56:35 +0000 (Do, 11 Jun 2009) | 2 lines
  
  'add replace rt2500'
........
  r42278 | tpowa | 2009-06-12 09:32:10 +0000 (Fr, 12 Jun 2009) | 1 line
  
  upgpkg: kernel26 2.6.30-2
........

Modified:
  kernel26/repos/testing-i686/	(properties)
  kernel26/repos/testing-i686/PKGBUILD
  kernel26/repos/testing-i686/config
  kernel26/repos/testing-i686/config.x86_64

---------------+
 PKGBUILD      |   13 +++++++------
 config        |   12 ++++++++++++
 config.x86_64 |   12 ++++++++++++
 3 files changed, 31 insertions(+), 6 deletions(-)


Property changes on: kernel26/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /kernel26/trunk:1-42152
   + /kernel26/trunk:1-42283

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-06-12 09:36:08 UTC (rev 42283)
+++ testing-i686/PKGBUILD	2009-06-12 09:54:15 UTC (rev 42284)
@@ -6,8 +6,8 @@
 _kernelname=${pkgname#kernel26}
 _basekernel=2.6.30
 pkgver=${_basekernel}
-pkgrel=1
-_patchname="patch-${pkgver}-1-ARCH"
+pkgrel=2
+_patchname="patch-${pkgver}-2-ARCH"
 pkgdesc="The Linux Kernel and modules"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -22,7 +22,7 @@
           'alsa-driver' 'ieee80211' 'hostap-driver26'
           'pwc' 'nforce' 'squashfs' 'unionfs' 'ivtv'
           'zd1211' 'kvm-modules' 'iwlwifi' 'rt2x00-cvs'
-          'gspcav1' 'atl2' 'wlan-ng26' 'aufs')
+          'gspcav1' 'atl2' 'wlan-ng26' 'aufs' 'rt2500')
 install=kernel26.install
 source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2
         ftp://ftp.archlinux.org/other/kernel26/${_patchname}.bz2
@@ -32,9 +32,9 @@
         kernel26.preset)
 optdepends=('crda: to set the correct wireless channels of your country')
 md5sums=('7a80058a6382e5108cdb5554d1609615'
-         'e010e759c4ece244345aa00e6cfe0b0f'
-         '9b6b3912459b73af685b48bbffc91b3f'
-         'bf3635badbab8cdc0f725f67a142f901'
+         'fbd34383c58d890f847afa71f17eddbb'
+         '008d7fbbbf7cad976579f9a160024215'
+         '120929395e90ac29b2c6dea26a78b081'
          '25584700a0a679542929c4bed31433b6')
 
 build() {
@@ -186,3 +186,4 @@
   # remove the firmware
   rm -rf ${pkgdir}/lib/firmware
 }
+

Modified: testing-i686/config
===================================================================
--- testing-i686/config	2009-06-12 09:36:08 UTC (rev 42283)
+++ testing-i686/config	2009-06-12 09:54:15 UTC (rev 42284)
@@ -4024,6 +4024,18 @@
 CONFIG_EXOFS_FS=m
 # CONFIG_EXOFS_DEBUG is not set
 CONFIG_NILFS2_FS=m
+CONFIG_AUFS_FS=m
+CONFIG_AUFS_BRANCH_MAX_127=y
+# CONFIG_AUFS_BRANCH_MAX_511 is not set
+# CONFIG_AUFS_BRANCH_MAX_1023 is not set
+# CONFIG_AUFS_BRANCH_MAX_32767 is not set
+CONFIG_AUFS_HINOTIFY=y
+CONFIG_AUFS_EXPORT=y
+CONFIG_AUFS_SHWH=y
+CONFIG_AUFS_BR_RAMFS=y
+# CONFIG_AUFS_DEBUG is not set
+CONFIG_AUFS_BDEV_LOOP=y
+CONFIG_AUFS_INO_T_64=y
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y

Modified: testing-i686/config.x86_64
===================================================================
--- testing-i686/config.x86_64	2009-06-12 09:36:08 UTC (rev 42283)
+++ testing-i686/config.x86_64	2009-06-12 09:54:15 UTC (rev 42284)
@@ -3801,6 +3801,18 @@
 CONFIG_EXOFS_FS=m
 # CONFIG_EXOFS_DEBUG is not set
 CONFIG_NILFS2_FS=m
+CONFIG_AUFS_FS=m
+CONFIG_AUFS_BRANCH_MAX_127=y
+# CONFIG_AUFS_BRANCH_MAX_511 is not set
+# CONFIG_AUFS_BRANCH_MAX_1023 is not set
+# CONFIG_AUFS_BRANCH_MAX_32767 is not set
+CONFIG_AUFS_HINOTIFY=y
+CONFIG_AUFS_EXPORT=y
+CONFIG_AUFS_SHWH=y
+CONFIG_AUFS_BR_RAMFS=y
+# CONFIG_AUFS_DEBUG is not set
+CONFIG_AUFS_BDEV_LOOP=y
+CONFIG_AUFS_INO_T_64=y
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y