Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD.git

Conflicts:
	abs/core-testing/LinHES-config/PKGBUILD

1 files changed, 65 insertions, 68 deletions

diff --git a/abs/core-testing/kernel26/PKGBUILD b/abs/core-testing/kernel26/PKGBUILD
index b96120c..3966ee1 100644
--- a/abs/core-testing/kernel26/PKGBUILD
+++ b/abs/core-testing/kernel26/PKGBUILD
@@ -1,12 +1,11 @@
-# $Id: PKGBUILD 10337 2008-08-26 21:10:56Z tpowa $
+# $Id: PKGBUILD 22035 2008-12-21 10:00:17Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 pkgname=kernel26
-_basekernel=2.6.26
-pkgver=2.6.26.3
-pkgrel=10
-#_patchname="patch-${pkgver}-${pkgrel}-ARCH"
-_patchname="patch-${pkgver}-1-ARCH"
+_basekernel=2.6.27
+pkgver=2.6.27.10
+pkgrel=1
+_patchname="patch-${pkgver}-${pkgrel}-ARCH"
 pkgdesc="The Linux Kernel and modules"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -20,7 +19,8 @@ depends=('coreutils' 'module-init-tools' 'mkinitcpio>=0.5.18')
 replaces=('kernel24' 'kernel24-scsi' 'kernel26-scsi'
           'alsa-driver' 'ieee80211' 'hostap-driver26'
           'pwc' 'nforce' 'squashfs' 'unionfs' 'ivtv'
-	  'zd1211' 'kvm-modules' 'iwlwifi' 'rt2x00-cvs')
+          'zd1211' 'kvm-modules' 'iwlwifi' 'rt2x00-cvs'
+          'gspcav1')
 install=kernel26.install
 source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2
         ftp://ftp.archlinux.org/other/kernel26/${_patchname}.bz2
@@ -31,22 +31,22 @@ source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2
 	logo_linux_clut224.ppm
 	logo_linux_mono.pbm
 	logo_linux_vga16.ppm)
-md5sums=('5169d01c405bc3f866c59338e217968c'
-         '003e89dd71b32ae9b93cd1601da3b1b0'
-	 '4fd1071a8dc2ea993aed81d5920de18d'
-         'd5ad1f296356d159a2616a49d98b3434'
-	 '25584700a0a679542929c4bed31433b6'
+md5sums=('b3e78977aa79d3754cb7f8143d7ddabd'
+         '05083482b71bc6c364a96d318e5b49fe'
+         '56ca3800d4567ba728382d02417152af'
+         '5e96d95aec10471017e8b7c12d11a2d3'
+         '25584700a0a679542929c4bed31433b6'
 	 '7bdfe2e1daedb324fdfdfa95ba4e2430'
-	 'a88d90384e50bd061a81fcc6573fc3bb'
-	 'f536292192a69d590b2ffd4700c14185')
+	 '3cc08afb1575b4c79d3f9c3410260ce2'
+	 'a54b65186d0922f3890f9716cdb4f4a5')
 
 build() {
   KARCH=x86
 
-  cd $startdir/src/linux-$_basekernel
+  cd ${srcdir}/linux-$_basekernel
   # Add -ARCH patches
   # See http://projects.archlinux.org/git/?p=linux-2.6-ARCH.git;a=summary
-  patch -Np1 -i $startdir/src/${_patchname} || return 1
+  patch -Np1 -i ${srcdir}/${_patchname} || return 1
 
   if [ "$CARCH" = "x86_64" ]; then
     cat ../config.x86_64 >./.config
@@ -54,13 +54,11 @@ build() {
     cat ../config >./.config
   fi
   cp ../logo_linux_clut224.ppm drivers/video/logo/
-  cp ../logo_linux_mono.ppm drivers/video/logo/
-  cp ../logo_linux_vga16.ppm drivers/video/logo/
-  # build the full kernel version to use in pathnames
-  . ./.config
-  ### next line is only needed for rc kernels
-  #_kernver="2.6.25${CONFIG_LOCALVERSION}"
-  _kernver="${_basekernel}${CONFIG_LOCALVERSION}"
+#  cp ../logo_linux_mono.pbm drivers/video/logo/
+#  cp ../logo_linux_vga16.ppm drivers/video/logo
+  # get kernel version  
+  make prepare
+  _kernver="$(make kernelrelease)"
   # load configuration
   yes "" | make config
   # build!
@@ -71,89 +69,88 @@ build() {
   #return 1
   ####################
   make bzImage modules || return 1
-  mkdir -p $startdir/pkg/{lib/modules,boot}
-  make INSTALL_MOD_PATH=$startdir/pkg modules_install || return 1
-  cp System.map $startdir/pkg/boot/System.map26
-  cp arch/$KARCH/boot/bzImage $startdir/pkg/boot/vmlinuz26
+  mkdir -p ${pkgdir}/{lib/modules,boot}
+  make INSTALL_MOD_PATH=${pkgdir} modules_install || return 1
+  cp System.map ${pkgdir}/boot/System.map26
+  cp arch/$KARCH/boot/bzImage ${pkgdir}/boot/vmlinuz26
   install -D -m644 Makefile \
-    $startdir/pkg/usr/src/linux-${_kernver}/Makefile
+    ${pkgdir}/usr/src/linux-${_kernver}/Makefile
   install -D -m644 kernel/Makefile \
-    $startdir/pkg/usr/src/linux-${_kernver}/kernel/Makefile
+    ${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile
   install -D -m644 .config \
-    $startdir/pkg/usr/src/linux-${_kernver}/.config
-  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/include
+    ${pkgdir}/usr/src/linux-${_kernver}/.config
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include
 
   for i in acpi asm-{generic,x86} config linux math-emu media net pcmcia scsi sound video; do
-    cp -a include/$i $startdir/pkg/usr/src/linux-${_kernver}/include/
+    cp -a include/$i ${pkgdir}/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}
+  cp Module.symvers ${pkgdir}/usr/src/linux-${_kernver}
+  cp -a scripts ${pkgdir}/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
+  chmod og-w -R ${pkgdir}/usr/src/linux-${_kernver}/scripts
+  #mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions
 
-  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/kernel
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/kernel
 
-  cp arch/$KARCH/Makefile $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/
+  cp arch/$KARCH/Makefile ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/
   if [ "$CARCH" = "i686" ]; then
-    cp arch/$KARCH/Makefile_32.cpu $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/
+    cp arch/$KARCH/Makefile_32.cpu ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/
   fi
-  cp arch/$KARCH/kernel/asm-offsets.s $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/kernel/
+  cp arch/$KARCH/kernel/asm-offsets.s ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/kernel/
 
   # add headers for lirc package
-  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/drivers/media/video
-  cp drivers/media/video/*.h  $startdir/pkg/usr/src/linux-${_kernver}/drivers/media/video/
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video
+  cp drivers/media/video/*.h  ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/
   for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102 usbvideo zc0301; do
-   mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/drivers/media/video/$i
-   cp -a drivers/media/video/$i/*.h $startdir/pkg/usr/src/linux-${_kernver}/drivers/media/video/$i
+   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/$i
+   cp -a drivers/media/video/$i/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/$i
   done
   # add dm headers
-  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/drivers/md
-  cp drivers/md/*.h  $startdir/pkg/usr/src/linux-${_kernver}/drivers/md
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/md
+  cp drivers/md/*.h  ${pkgdir}/usr/src/linux-${_kernver}/drivers/md
   # add inotify.h
-  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/include/linux
-  cp include/linux/inotify.h $startdir/pkg/usr/src/linux-${_kernver}/include/linux/
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include/linux
+  cp include/linux/inotify.h ${pkgdir}/usr/src/linux-${_kernver}/include/linux/
   # add CLUSTERIP file for iptables
-  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/net/ipv4/netfilter/
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/net/ipv4/netfilter/
   # add wireless headers
-  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/net/mac80211/
-  cp net/mac80211/*.h $startdir/pkg/usr/src/linux-${_kernver}/net/mac80211/
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/
+  cp net/mac80211/*.h ${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/
   # add dvb headers for external modules
   # in reference to:
   # http://bugs.archlinux.org/task/9912
-  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core
-  cp drivers/media/dvb/dvb-core/*.h $startdir/pkg/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core
+  cp drivers/media/dvb/dvb-core/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/
   # add dvb headers for external modules
   # in reference to:
   # http://bugs.archlinux.org/task/11194
-  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/include/config/dvb/
-  cp include/config/dvb/*.h $startdir/pkg/usr/src/linux-${_kernver}/include/config/dvb/
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/
+  cp include/config/dvb/*.h ${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/
   # add xfs and shmem for aufs building
-  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/fs/xfs
-  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/mm
-  cp fs/xfs/xfs_sb.h $startdir/pkg/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/mm
+  cp fs/xfs/xfs_sb.h ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h
   # add vmlinux
-  cp vmlinux $startdir/pkg/usr/src/linux-${_kernver}
+  cp vmlinux ${pkgdir}/usr/src/linux-${_kernver}
   # copy in Kconfig files
   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
+    mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/`echo $i | sed 's|/Kconfig.*||'`
+    cp $i ${pkgdir}/usr/src/linux-${_kernver}/$i
   done
 
-  cd $startdir/pkg/usr/src/linux-${_kernver}/include && ln -s asm-$KARCH asm
+  cd ${pkgdir}/usr/src/linux-${_kernver}/include && ln -s asm-$KARCH asm
 
-  chown -R root.root $startdir/pkg/usr/src/linux-${_kernver}
-  find $startdir/pkg/usr/src/linux-${_kernver} -type d -exec chmod 755 {} \;
-  cd $startdir/pkg/lib/modules/${_kernver} && \
+  chown -R root.root ${pkgdir}/usr/src/linux-${_kernver}
+  find ${pkgdir}/usr/src/linux-${_kernver} -type d -exec chmod 755 {} \;
+  cd ${pkgdir}/lib/modules/${_kernver} && \
     (rm -f source build; ln -sf ../../../usr/src/linux-${_kernver} build)
   # install fallback mkinitcpio.conf file and preset file for kernel
-  install -m644 -D $startdir/src/${pkgname}.preset $startdir/pkg/etc/mkinitcpio.d/${pkgname}.preset || return 1
+  install -m644 -D ${srcdir}/${pkgname}.preset ${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset || return 1
   # 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}
+  rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
 }
-