[arch-commits] CVS update of arch/build/kernels/kernel26 (PKGBUILD)

[andyrtr at archlinux.org]

    Date: Friday, August 31, 2007 @ 15:15:34
  Author: andyrtr
    Path: /home/cvs-arch/arch/build/kernels/kernel26

Modified: PKGBUILD (1.252 -> 1.253)

updatepkg 2.6.22.6; minor pkgbuild cleanup for crossheaders and remove unneeded architectures


----------+
 PKGBUILD |   28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)


Index: arch/build/kernels/kernel26/PKGBUILD
diff -u arch/build/kernels/kernel26/PKGBUILD:1.252 arch/build/kernels/kernel26/PKGBUILD:1.253
--- arch/build/kernels/kernel26/PKGBUILD:1.252	Thu Aug 23 14:30:38 2007
+++ arch/build/kernels/kernel26/PKGBUILD	Fri Aug 31 15:15:34 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.252 2007/08/23 18:30:38 thomas Exp $
+# $Id: PKGBUILD,v 1.253 2007/08/31 19:15:34 andyrtr 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.5
-pkgrel=1
+pkgver=2.6.22.6
+pkgrel=1.1
 pkgdesc="The Linux Kernel and modules"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -45,7 +45,7 @@
 	squashfs3.2-patch.bz2
 	ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-2.0/linux-2.6.22.1-u4.diff.gz)
 md5sums=('2e230d005c002fb3d38a3ca07c0200d0'
-         '27544a58763bbd4ce497a77658af744a'
+         'f2948e364ab3e4736b9e34f02173472f'
          'e88d9070d404cd4136588e4d4f33bb26'
          '549ac31fbb886d3811adbb65ae026e48'
          '5a62bcc7e96601052c7405459b483826'
@@ -143,8 +143,7 @@
   install -D -m644 .config $startdir/pkg/boot/kconfig26
   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
 
@@ -153,8 +152,9 @@
   cp -a scripts $startdir/pkg/usr/src/linux-${_kernver}
   # fix permissions on scripts dir
   chmod og-w -R $startdir/pkg/usr/src/linux-${_kernver}/scripts
-  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/.tmp_versions
-  
+#  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/.tmp_versions
+
+  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/kernel  
   cp arch/$KARCH/Makefile $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/
   if [ "$CARCH" = "i686" ]; then
     cp arch/$KARCH/Makefile.cpu $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/
@@ -188,14 +188,6 @@
     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,msr-index,processor-flags}.h ${startdir}/pkg/usr/src/linux-${_kernver}/include/asm-i386
-  fi
-
   cd $startdir/pkg/usr/src/linux-${_kernver}/include && ln -s asm-$KARCH asm
 
   chown -R root.root $startdir/pkg/usr/src/linux-${_kernver}
@@ -211,4 +203,8 @@
   # set correct depmod command for install
   sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/kernel26.install
   echo -e "# DO NOT EDIT THIS FILE\nALL_kver='${_kernver}'" > ${startdir}/pkg/etc/mkinitcpio.d/${pkgname}.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}
 }
+