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

[Tobias Powalowski]

    Date: Monday, April 6, 2009 @ 09:12:56
  Author: tpowa
Revision: 34072

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

........
  r34036 | tpowa | 2009-04-06 11:01:47 +0000 (Mo, 06 Apr 2009) | 1 line
  
  upgpkg: kernel26 2.6.29.1-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      |   10 +++++-----
 config        |   11 +++++++++++
 config.x86_64 |   11 +++++++++++
 3 files changed, 27 insertions(+), 5 deletions(-)


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

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-04-06 12:44:45 UTC (rev 34071)
+++ testing-i686/PKGBUILD	2009-04-06 13:12:56 UTC (rev 34072)
@@ -6,8 +6,8 @@
 _kernelname=${pkgname#kernel26}
 _basekernel=2.6.29
 pkgver=${_basekernel}.1
-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')
@@ -32,9 +32,9 @@
         kernel26.preset)
 optdepends=('crda: to set the correct wireless channels of your country')
 md5sums=('64921b5ff5cdadbccfcd3820f03be7d8'
-         '6c3c5b0cd085d46aba968f2d0b4ada01'
-         '15dde10a9023c2a7ba81c183b9ba452f'
-         '4c744f7742baddc7bc03327e416aa201'
+         '61b2c96aa87dce6075f228bd29151041'
+         'ea3999b363734e65e49eb15680f6f2d7'
+         '0eb27c7c58530293ca9fc1fd364741fa'
          '25584700a0a679542929c4bed31433b6')
 
 build() {

Modified: testing-i686/config
===================================================================
--- testing-i686/config	2009-04-06 12:44:45 UTC (rev 34071)
+++ testing-i686/config	2009-04-06 13:12:56 UTC (rev 34072)
@@ -3968,6 +3968,17 @@
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 # CONFIG_UFS_DEBUG is not set
+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 is not set
+# CONFIG_AUFS_EXPORT is not set
+# 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_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y

Modified: testing-i686/config.x86_64
===================================================================
--- testing-i686/config.x86_64	2009-04-06 12:44:45 UTC (rev 34071)
+++ testing-i686/config.x86_64	2009-04-06 13:12:56 UTC (rev 34072)
@@ -3750,6 +3750,17 @@
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 # CONFIG_UFS_DEBUG is not set
+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 is not set
+# CONFIG_AUFS_EXPORT is not set
+# 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_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y