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

[Tobias Powalowski]

    Date: Wednesday, April 8, 2009 @ 10:21:33
  Author: tpowa
Revision: 34248

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

........
  r34240 | tpowa | 2009-04-08 13:23:21 +0000 (Mi, 08 Apr 2009) | 1 line
  
  upgpkg: kernel26 2.6.29.1-3
........

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

---------------+
 PKGBUILD      |   12 ++++++------
 config        |    4 +---
 config.x86_64 |    5 +----
 3 files changed, 8 insertions(+), 13 deletions(-)


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

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-04-08 14:19:37 UTC (rev 34247)
+++ testing-i686/PKGBUILD	2009-04-08 14:21:33 UTC (rev 34248)
@@ -6,8 +6,8 @@
 _kernelname=${pkgname#kernel26}
 _basekernel=2.6.29
 pkgver=${_basekernel}.1
-pkgrel=2
-_patchname="patch-${pkgver}-2-ARCH"
+pkgrel=3
+_patchname="patch-${pkgver}-3-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')
+          'gspcav1' 'atl2' 'wlan-ng26' 'aufs')
 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=('64921b5ff5cdadbccfcd3820f03be7d8'
-         '61b2c96aa87dce6075f228bd29151041'
-         'ea3999b363734e65e49eb15680f6f2d7'
-         '0eb27c7c58530293ca9fc1fd364741fa'
+         '3058813cd7b697844fe603efa43f9b1a'
+         '20ca0fb8bca4ca82030d2bc9e4358a9a'
+         'ac0aee5e260d1990189bebe44c40ba3e'
          '25584700a0a679542929c4bed31433b6')
 
 build() {

Modified: testing-i686/config
===================================================================
--- testing-i686/config	2009-04-08 14:19:37 UTC (rev 34247)
+++ testing-i686/config	2009-04-08 14:21:33 UTC (rev 34248)
@@ -3930,9 +3930,6 @@
 #
 # Layered filesystems
 #
-CONFIG_UNION_FS=m
-CONFIG_UNION_FS_XATTR=y
-# CONFIG_UNION_FS_DEBUG is not set
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=m
@@ -3968,6 +3965,7 @@
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 # CONFIG_UFS_DEBUG is not set
+# CONFIG_AUFS_FS is not set
 CONFIG_AUFS_FS=m
 CONFIG_AUFS_BRANCH_MAX_127=y
 # CONFIG_AUFS_BRANCH_MAX_511 is not set

Modified: testing-i686/config.x86_64
===================================================================
--- testing-i686/config.x86_64	2009-04-08 14:19:37 UTC (rev 34247)
+++ testing-i686/config.x86_64	2009-04-08 14:21:33 UTC (rev 34248)
@@ -3712,9 +3712,6 @@
 #
 # Layered filesystems
 #
-CONFIG_UNION_FS=m
-CONFIG_UNION_FS_XATTR=y
-# CONFIG_UNION_FS_DEBUG is not set
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=m
@@ -3760,7 +3757,7 @@
 # CONFIG_AUFS_BR_RAMFS is not set
 # CONFIG_AUFS_DEBUG is not set
 CONFIG_AUFS_BDEV_LOOP=y
-CONFIG_AUFS_INO_T_64=y
+CONFIG_AUFS_INO_T_
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y