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

[Tobias Powalowski]

    Date: Thursday, March 26, 2009 @ 16:40:45
  Author: tpowa
Revision: 31406

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

........
  r31397 | tpowa | 2009-03-26 19:38:37 +0000 (Do, 26 M?\195?\164r 2009) | 1 line
  
  upgpkg: kernel26 2.6.29-3
........

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

---------------+
 PKGBUILD      |   10 +++++-----
 config        |    2 +-
 config.x86_64 |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)


Property changes on: kernel26/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /kernel26/trunk:1-31386
   + /kernel26/trunk:1-31405

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-03-26 20:33:11 UTC (rev 31405)
+++ testing-x86_64/PKGBUILD	2009-03-26 20:40:45 UTC (rev 31406)
@@ -6,8 +6,8 @@
 _kernelname=${pkgname#kernel26}
 _basekernel=2.6.29
 pkgver=${_basekernel}
-pkgrel=2
-_patchname="patch-${pkgver}-${pkgrel}-ARCH"
+pkgrel=3
+_patchname="patch-${pkgver}-2-ARCH"
 pkgdesc="The Linux Kernel and modules"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -26,15 +26,15 @@
 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
-        # the main kernel config files
+	# the main kernel config files
         config config.x86_64
         # standard config files for mkinitcpio ramdisk
         kernel26.preset)
 optdepends=('crda: to set the correct wireless channels of your country')
 md5sums=('64921b5ff5cdadbccfcd3820f03be7d8'
          '89ed09627bc54b1de11ca533615a8837'
-         '8c308a5016ca528aa8360a180eaa5570'
-         '0af971f70ad9eb88b41e678952cdf146'
+         '11b7b36fe3656c075e7c95a3270cf2cd'
+         'bc8d83d727a379ac214f1bedfb5943ce'
          '25584700a0a679542929c4bed31433b6')
 
 build() {

Modified: testing-x86_64/config
===================================================================
--- testing-x86_64/config	2009-03-26 20:33:11 UTC (rev 31405)
+++ testing-x86_64/config	2009-03-26 20:40:45 UTC (rev 31406)
@@ -4200,7 +4200,7 @@
 CONFIG_SECURITY_FILE_CAPABILITIES=y
 CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0
 # CONFIG_SECURITY_SELINUX is not set
-CONFIG_SECURITY_SMACK=y
+# CONFIG_SECURITY_SMACK is not set
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m

Modified: testing-x86_64/config.x86_64
===================================================================
--- testing-x86_64/config.x86_64	2009-03-26 20:33:11 UTC (rev 31405)
+++ testing-x86_64/config.x86_64	2009-03-26 20:40:45 UTC (rev 31406)
@@ -3980,7 +3980,7 @@
 CONFIG_SECURITY_FILE_CAPABILITIES=y
 CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0
 # CONFIG_SECURITY_SELINUX is not set
-CONFIG_SECURITY_SMACK=y
+# CONFIG_SECURITY_SMACK is not set
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m