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

[Tobias Powalowski]

    Date: Sunday, January 4, 2009 @ 13:23:17
  Author: tpowa
Revision: 23171

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

........
  r23169 | tpowa | 2009-01-04 18:01:13 +0000 (So, 04 Jan 2009) | 1 line
  
  upgpkg: kernel26 2.6.28-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      |    8 ++++----
 config        |    4 ++--
 config.x86_64 |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)


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

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-01-04 18:01:50 UTC (rev 23170)
+++ testing-i686/PKGBUILD	2009-01-04 18:23:17 UTC (rev 23171)
@@ -4,7 +4,7 @@
 pkgname=kernel26
 _basekernel=2.6.28
 pkgver=2.6.28
-pkgrel=1
+pkgrel=2
 _patchname="patch-${pkgver}-${pkgrel}-ARCH"
 pkgdesc="The Linux Kernel and modules"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@
 groups=('base')
 url="http://www.kernel.org"
 backup=(etc/mkinitcpio.d/${pkgname}.preset)
-depends=('coreutils' 'module-init-tools' 'mkinitcpio>=0.5.18')
+depends=('coreutils' 'module-init-tools' 'mkinitcpio>=0.5.20')
 # pwc, ieee80211 and hostap-driver26 modules are included in kernel26 now
 # nforce package support was abandoned by nvidia, kernel modules should cover everything now.
 # kernel24 support is dropped since glibc24
@@ -30,8 +30,8 @@
         kernel26.preset)
 md5sums=('d351e44709c9810b85e29b877f50968a'
          '0f9b07b78488a21df23e9cef5e3c4c64'
-         '00fa54c1d0f850abff28eafbccba947e'
-         '60f0a8b306b1d39aac6d5e4dad41fb64'
+         '817a3ae21ce441c5cfcff28a453354a6'
+         '959b317feb974d8906c5e15e7c76ad8f'
          '25584700a0a679542929c4bed31433b6')
 
 build() {

Modified: testing-i686/config
===================================================================
--- testing-i686/config	2009-01-04 18:01:50 UTC (rev 23170)
+++ testing-i686/config	2009-01-04 18:23:17 UTC (rev 23171)
@@ -3806,7 +3806,7 @@
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
 # CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
+CONFIG_OMFS_FS=m
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -3877,7 +3877,7 @@
 # CONFIG_SGI_PARTITION is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
+CONFIG_KARMA_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 CONFIG_NLS=y

Modified: testing-i686/config.x86_64
===================================================================
--- testing-i686/config.x86_64	2009-01-04 18:01:50 UTC (rev 23170)
+++ testing-i686/config.x86_64	2009-01-04 18:23:17 UTC (rev 23171)
@@ -3581,7 +3581,7 @@
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
 # CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
+CONFIG_OMFS_FS=m
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -3652,7 +3652,7 @@
 # CONFIG_SGI_PARTITION is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
+CONFIG_KARMA_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 CONFIG_NLS=y