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

[Thomas Bächler]

    Date: Monday, October 5, 2009 @ 19:57:46
  Author: thomas
Revision: 54009

Merged revisions 53793,54008 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/kernel26/trunk

........
  r53793 | roman | 2009-10-03 13:06:12 +0200 (Sa, 03 Okt 2009) | 5 lines
  
  Skip commented /boot when deciding if a warning is needed
  
  Fixes bug #16185.
........
  r54008 | thomas | 2009-10-06 01:18:59 +0200 (Di, 06 Okt 2009) | 2 lines
  
  Linux 2.6.31.2 release + added more serial ports and ATI KMS to config
........

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
  kernel26/repos/testing-x86_64/kernel26.install

------------------+
 PKGBUILD         |    8 ++++----
 config           |    4 ++--
 config.x86_64    |    4 ++--
 kernel26.install |    2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)


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

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-10-05 23:18:59 UTC (rev 54008)
+++ testing-x86_64/PKGBUILD	2009-10-05 23:57:46 UTC (rev 54009)
@@ -5,7 +5,7 @@
 # pkgname=kernel26-custom       # Build kernel with a different name
 _kernelname=${pkgname#kernel26}
 _basekernel=2.6.31
-pkgver=${_basekernel}.1
+pkgver=${_basekernel}.2
 pkgrel=1
 _patchname="patch-${pkgver}-${pkgrel}-ARCH"
 pkgdesc="The Linux Kernel and modules"
@@ -32,9 +32,9 @@
         kernel26.preset)
 optdepends=('crda: to set the correct wireless channels of your country')
 md5sums=('84c077a37684e4cbfa67b18154390d8a'
-         '29ca470c25d86850db7ff188ddd8da95'
-         '128df067c46dc96fc184efdb822bb9ec'
-         '5e777ff68d871106d9bfa203f5e92750'
+         '5940fa20ba9cd709e0d7240cb9b03013'
+         '07ceb97ba958bb99792a5edabe65629a'
+         '604e3014eff40b0304422c53129d6de7'
          '25584700a0a679542929c4bed31433b6')
 
 build() {

Modified: testing-x86_64/config
===================================================================
--- testing-x86_64/config	2009-10-05 23:18:59 UTC (rev 54008)
+++ testing-x86_64/config	2009-10-05 23:57:46 UTC (rev 54009)
@@ -2315,7 +2315,7 @@
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_PNP=y
 CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
 
@@ -3945,7 +3945,7 @@
 CONFIG_PLAN9AUTH=m
 CONFIG_HECI=m
 CONFIG_LINE6_USB=m
-# CONFIG_DRM_RADEON_KMS is not set
+CONFIG_DRM_RADEON_KMS=y
 CONFIG_USB_SERIAL_QUATECH2=m
 CONFIG_VT6655=m
 CONFIG_USB_CPC=m

Modified: testing-x86_64/config.x86_64
===================================================================
--- testing-x86_64/config.x86_64	2009-10-05 23:18:59 UTC (rev 54008)
+++ testing-x86_64/config.x86_64	2009-10-05 23:57:46 UTC (rev 54009)
@@ -2170,7 +2170,7 @@
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_PNP=y
 CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
 
@@ -3723,7 +3723,7 @@
 CONFIG_PLAN9AUTH=m
 CONFIG_HECI=m
 CONFIG_LINE6_USB=m
-# CONFIG_DRM_RADEON_KMS is not set
+CONFIG_DRM_RADEON_KMS=y
 CONFIG_USB_SERIAL_QUATECH2=m
 CONFIG_VT6655=m
 CONFIG_USB_CPC=m

Modified: testing-x86_64/kernel26.install
===================================================================
--- testing-x86_64/kernel26.install	2009-10-05 23:18:59 UTC (rev 54008)
+++ testing-x86_64/kernel26.install	2009-10-05 23:57:46 UTC (rev 54009)
@@ -39,7 +39,7 @@
     echo ">>>"
   fi
 
-  if grep "/boot" /etc/fstab 2>&1 >/dev/null; then
+  if grep "^[^#]*/boot" /etc/fstab 2>&1 >/dev/null; then
     if ! grep "/boot" /etc/mtab 2>&1 >/dev/null; then
       echo "WARNING: /boot appears to be a seperate partition but is not mounted"
       echo "         This is most likely not what you want.  Please mount your /boot"