[arch-commits] CVS update of core/base/kernel26 (PKGBUILD config kernel26.install)

[Tobias Powalowski]

    Date: Thursday, September 20, 2007 @ 14:11:57
  Author: tpowa
    Path: /home/cvs-core/core/base/kernel26

Modified: PKGBUILD (1.255 -> 1.256) config (1.103 -> 1.104)
          kernel26.install (1.33 -> 1.34)

'upgpgk: removed toshiba-acpi patch cleaned up .install file, added beos fs support'


------------------+
 PKGBUILD         |   12 +++++-------
 config           |    3 ++-
 kernel26.install |   15 ---------------
 3 files changed, 7 insertions(+), 23 deletions(-)


Index: core/base/kernel26/PKGBUILD
diff -u core/base/kernel26/PKGBUILD:1.255 core/base/kernel26/PKGBUILD:1.256
--- core/base/kernel26/PKGBUILD:1.255	Mon Sep 17 12:48:33 2007
+++ core/base/kernel26/PKGBUILD	Thu Sep 20 14:11:57 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.255 2007/09/17 16:48:33 thomas Exp $
+# $Id: PKGBUILD,v 1.256 2007/09/20 18:11:57 tpowa Exp $
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 # Maintainer: Thomas Baechler <thomas at archlinux.org>
 pkgname=kernel26
 _basekernel=2.6.22
 pkgver=2.6.22.6
-pkgrel=1
+pkgrel=2
 pkgdesc="The Linux Kernel and modules"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -32,7 +32,7 @@
         mkinitcpio-$pkgname.conf
         acpi-dsdt-initrd-v0.8.4-2.6.21.patch
         toshiba-bluetooth.patch
-	toshiba-acpi.patch
+	#toshiba-acpi.patch
         usb-storage-unusual-devs.patch
         mactel-linux-2.6.22.patch
 	#atkbd.patch
@@ -47,7 +47,7 @@
 	ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-2.0/linux-2.6.22.1-u4.diff.gz)
 md5sums=('2e230d005c002fb3d38a3ca07c0200d0'
          'f2948e364ab3e4736b9e34f02173472f'
-         'e88d9070d404cd4136588e4d4f33bb26'
+         'd7f4a46ccc1311c2c60996001887deae'
          '549ac31fbb886d3811adbb65ae026e48'
          '5a62bcc7e96601052c7405459b483826'
          'ed6b42fea2f5d27f7eb920746ccc1ebb'
@@ -56,7 +56,6 @@
          '36858bd6a0bca63d2aa901b2e42d4a05'
          '493137566bc397ec762c86e64bd96849'
          '695d8578a0334fa9bb140917561f03d4'
-         '276f81528448a6f86b4935a8c38acdad'
          '3ed791c3af3099489faf0d22cbcc55a8'
          '50ba275e9796ac034bfdfd7b27c71eb3'
          '98aa4f307ff657a26dfc24b1ae583804'
@@ -81,7 +80,7 @@
   # fix enabling of bluetooth on some toshiba notebooks
   patch -Np1 -i ../toshiba-bluetooth.patch || return 1
   #fix hotkeys on some toshiba notebooks
-  patch -Np1 -i ../toshiba-acpi.patch || return 1
+  #patch -Np1 -i ../toshiba-acpi.patch || return 1
   # fix I/O errors with Teac HD-35PU devices
   patch -Np1 -i ../usb-storage-unusual-devs.patch || return 1
   # add mactel patch
@@ -208,4 +207,3 @@
   # remove unneeded architectures
   rm -rf $startdir/pkg/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
 }
-
Index: core/base/kernel26/config
diff -u core/base/kernel26/config:1.103 core/base/kernel26/config:1.104
--- core/base/kernel26/config:1.103	Tue Aug 21 11:56:52 2007
+++ core/base/kernel26/config	Thu Sep 20 14:11:57 2007
@@ -3200,7 +3200,8 @@
 CONFIG_AFFS_FS=m
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
-# CONFIG_BEFS_FS is not set
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
 CONFIG_CRAMFS=m
Index: core/base/kernel26/kernel26.install
diff -u core/base/kernel26/kernel26.install:1.33 core/base/kernel26/kernel26.install:1.34
--- core/base/kernel26/kernel26.install:1.33	Mon Jul  9 16:15:54 2007
+++ core/base/kernel26/kernel26.install	Thu Sep 20 14:11:57 2007
@@ -16,22 +16,7 @@
   echo ">>> http://wiki.archlinux.org/index.php/Mkinitcpio"
   echo ""
   echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-if [ "`vercmp $2 2.6.19`" -lt 0 ]; then
-  /sbin/mkinitcpio -p kernel26 -m "ATTENTION:\nIf you get a kernel panic below
-and are using an Intel chipset, append 'earlymodules=piix' to the
-kernel commandline"
-else
   /sbin/mkinitcpio -p kernel26
-fi
-if [ "`vercmp $2 2.6.21`" -lt 0 ]; then
-  echo ""
-  echo "Important ACPI Information:"
-  echo ">>> Since 2.6.20.7 all possible ACPI parts are modularized."
-  echo ">>> The modules are located at:"
-  echo ">>> /lib/modules/$(uname -r)/kernel/drivers/acpi"
-  echo ">>> For more information about ACPI modules check this wiki page:"
-  echo ">>> 'http://wiki.archlinux.org/index.php/ACPI_modules'"
-fi
 }
 
 post_upgrade() {