[arch-commits] CVS update of extra/kernels/kernel26ck (PKGBUILD config)

[Tom Killian]

    Date: Tuesday, September 25, 2007 @ 12:07:50
  Author: tom
    Path: /home/cvs-extra/extra/kernels/kernel26ck

Modified: PKGBUILD (1.38 -> 1.39) config (1.13 -> 1.14)

upgpkg: kernel26ck 2.6.22.7.ck1-1


----------+
 PKGBUILD |   33 ++++++++++++---------------------
 config   |    3 ++-
 2 files changed, 14 insertions(+), 22 deletions(-)


Index: extra/kernels/kernel26ck/PKGBUILD
diff -u extra/kernels/kernel26ck/PKGBUILD:1.38 extra/kernels/kernel26ck/PKGBUILD:1.39
--- extra/kernels/kernel26ck/PKGBUILD:1.38	Sat Aug 25 07:19:54 2007
+++ extra/kernels/kernel26ck/PKGBUILD	Tue Sep 25 12:07:50 2007
@@ -3,7 +3,7 @@
 
 pkgname=kernel26ck
 basekernel=2.6.22
-_kpatch=2.6.22.5
+_kpatch=2.6.22.7
 _patchver=ck1
 pkgver=${_kpatch}.${_patchver}
 pkgrel=1
@@ -23,7 +23,7 @@
         http://www.archlinux.org/~tpowa/alsa-patches/alsa-20070818.patch.bz2
         http://www.archlinux.org/~tpowa/alsa-patches/alsa-include-20070818.patch.bz2
       	#http://heanet.dl.sourceforge.net/sourceforge/squashfs/squashfs3.2-r2.tar.gz
-      	ftp://ftp.filesystems.org/pub/unionfs/unionfs-2.1/unionfs-2.1.2_for_2.6.22.4.diff.gz
+      	ftp://ftp.filesystems.org/pub/unionfs/unionfs-2.1/unionfs-2.1.4_for_2.6.22.6.diff.gz
 	config config.x86_64
 	logo_arch_ck_224.ppm
 	logo_linux_mono.pbm
@@ -31,7 +31,6 @@
 	kernel26ck.preset
 	kernel26ck-fallback.conf
         toshiba-bluetooth.patch
-        toshiba-acpi.patch
         usb-storage-unusual-devs.patch
         mactel-linux-2.6.22.patch
         acpi-buggy-bios.patch
@@ -54,8 +53,6 @@
   patch -Np1 -i ../acpi-dsdt-initrd-v0.8.4-2.6.21.patch || return 1
   # 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
   # fix I/O errors with Teac HD-35PU devices
   patch -Np1 -i ../usb-storage-unusual-devs.patch || return 1
   # add mactel patch
@@ -72,7 +69,7 @@
   # add squashfs
   patch -Np1 -i ../squashfs3.2-patch || return 1
   # add unionfs
-  patch -Np1 -i ../unionfs-2.1.2_for_2.6.22.4.diff || return 1
+  patch -Np1 -i ../unionfs-2.1.4_for_2.6.22.6.diff || return 1
 
   #remove the extraversion from Makefile
   sed -i 's|^EXTRAVERSION =.*$|EXTRAVERSION =|' Makefile  
@@ -111,10 +108,10 @@
   mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/include
 
   mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/kernel
-  for i in acpi asm-generic asm-$KARCH config linux math-emu media net pcmcia scsi sound video; do
+  for i in acpi asm-{generic,i386,x86_64} config linux math-emu media net pcmcia scsi sound video; do
     cp -a include/$i $startdir/pkg/usr/src/linux-${_kernver}/include/
   done
-
+        
   # copy files necessary for later builds, like nvidia and vmware
   cp Module.symvers $startdir/pkg/usr/src/linux-${_kernver}
   cp -a scripts $startdir/pkg/usr/src/linux-${_kernver}
@@ -151,15 +148,7 @@
   for i in `find . -name "Kconfig*"`; do 
     mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/`echo $i | sed 's|/Kconfig.*||'`
     cp $i $startdir/pkg/usr/src/linux-${_kernver}/$i
-  done
-  
-  if [ "${KARCH}" = "i386" ]; then
-    mkdir ${startdir}/pkg/usr/src/linux-${_kernver}/include/asm-x86_64
-    cp -a include/asm-x86_64/tsc.h ${startdir}/pkg/usr/src/linux-${_kernver}/include/asm-x86_64
-  else
-    mkdir ${startdir}/pkg/usr/src/linux-${_kernver}/include/asm-i386
-    cp -a include/asm-i386/tsc.h ${startdir}/pkg/usr/src/linux-${_kernver}/include/asm-i386
-  fi
+  done  
 
   cd $startdir/pkg/usr/src/linux-${_kernver}/include && ln -s asm-$KARCH asm
 
@@ -172,15 +161,18 @@
   # set correct depmod command for install
   sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/kernel26ck.install
   echo -e "# NEVER EDIT THIS FILE\nALL_kver='${_kernver}'" > ${startdir}/pkg/etc/mkinitcpio.d/kernel26ck.kver
+  
+  # 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}
 }
 md5sums=('2e230d005c002fb3d38a3ca07c0200d0'
          '66b0085338f446bf42b407adb099517a'
-         '27544a58763bbd4ce497a77658af744a'
+         '11d56c9918810694f32a172ba4788a83'
          '493137566bc397ec762c86e64bd96849'
          '98aa4f307ff657a26dfc24b1ae583804'
          '0bde89ee0301d7dd5b204bf625e08a38'
-         '8399ed3673434943ad1294738e4831fd'
-         '8a5359e5517cbe490f609d3c12cd9bf5'
+         '38cdfade945f77412afca37ffcdc8742'
+         'e3e0533065155705a291b3dd2bcb5c97'
          '1f1f4db73c98eace9c0d7c61c544bee5'
          '5cbbc19b02fa96e614877da9e7833a0d'
          'ed6b42fea2f5d27f7eb920746ccc1ebb'
@@ -188,7 +180,6 @@
          '3b333625635413a8e1466f764785e58a'
          '8c579c72a4f7187de6b496aec88250ed'
          '695d8578a0334fa9bb140917561f03d4'
-         '276f81528448a6f86b4935a8c38acdad'
          '3ed791c3af3099489faf0d22cbcc55a8'
          '50ba275e9796ac034bfdfd7b27c71eb3'
          'bbc730a590d4e09b3d937b257e5a4bfe'
Index: extra/kernels/kernel26ck/config
diff -u extra/kernels/kernel26ck/config:1.13 extra/kernels/kernel26ck/config:1.14
--- extra/kernels/kernel26ck/config:1.13	Wed Aug 22 16:04:00 2007
+++ extra/kernels/kernel26ck/config	Tue Sep 25 12:07:50 2007
@@ -3219,7 +3219,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