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

[daniel at archlinux.org]

    Date: Saturday, September 1, 2007 @ 08:18:10
  Author: daniel
    Path: /home/cvs-extra/extra/kernels/kernel26suspend2

Modified: PKGBUILD (1.23 -> 1.24)

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


----------+
 PKGBUILD |   26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)


Index: extra/kernels/kernel26suspend2/PKGBUILD
diff -u extra/kernels/kernel26suspend2/PKGBUILD:1.23 extra/kernels/kernel26suspend2/PKGBUILD:1.24
--- extra/kernels/kernel26suspend2/PKGBUILD:1.23	Thu Aug 23 18:08:41 2007
+++ extra/kernels/kernel26suspend2/PKGBUILD	Sat Sep  1 08:18:10 2007
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.23 2007/08/23 22:08:41 daniel Exp $
+# $Id: PKGBUILD,v 1.24 2007/09/01 12:18:10 daniel Exp $
 # Maintainer: Daniel Isenmann <daniel [at] archlinux.org>
 pkgname=kernel26suspend2
 _basekernel=2.6.22
-pkgver=2.6.22.5
+pkgver=2.6.22.6
 pkgrel=1
 pkgdesc="The Linux Kernel with suspend2 (http://www.suspend2.net) support"
 _suspend2ver=2.2.10-for-2.6.22
@@ -34,7 +34,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'
          '346a464eb6a3114a3a2e04f96ca761bf'
          'd2874ebdab7c47c40b1c2724fbeb549d'
          '5a62bcc7e96601052c7405459b483826'
@@ -119,8 +119,7 @@
   install -D -m644 .config $startdir/pkg/boot/kconfig26suspend2
   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
 
@@ -129,8 +128,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/
@@ -164,14 +164,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}
@@ -186,6 +178,10 @@
   # set correct depmod command for install
   sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/kernel26.install
   echo -e "# NEVER EDIT THIS FILE\nALL_kver='${_kernver}'" > ${startdir}/pkg/etc/mkinitcpio.d/${pkgname}.kver || return 1
+  
+  # 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}
+
   # fix potentionally broken permissions
   chmod og-w -R $startdir/pkg/usr/src/linux-${_kernver}
   find $startdir/pkg/usr/src/linux-${_kernver} -type d -exec chmod 755 {} \;