Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing

1 files changed, 44 insertions, 66 deletions

diff --git a/abs/core/kernel26/PKGBUILD b/abs/core/kernel26/PKGBUILD
index 01f2398..69cb6af 100644
--- a/abs/core/kernel26/PKGBUILD
+++ b/abs/core/kernel26/PKGBUILD
@@ -1,52 +1,36 @@
-# $Id: PKGBUILD 86792 2010-08-04 14:39:45Z thomas $
+# $Id: PKGBUILD 97522 2010-10-31 08:36:16Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Maintainer: Heiko Baums <heiko@baums-on-web.de>
-# pkgbase="kernel26"
-pkgname=('kernel26' 'kernel26-headers' 'kernel26-manpages' 'kernel26-docs') # Build stock -ARCH kernel
-#pkgname=kernel26-fbcondecor       # Build kernel with a different name
+pkgbase="kernel26"
+pkgname=('kernel26' 'kernel26-headers' 'kernel26-docs') # Build stock -ARCH kernel
+#pkgname=kernel26-LINHES       # Build kernel with a different name
 _kernelname=${pkgname#kernel26}
-_basekernel=2.6.34
-pkgver=${_basekernel}.2
-pkgrel=2
+_basekernel=2.6.36
+pkgver=${_basekernel}
+pkgrel=3
+makedepends=('xmlto' 'docbook-xsl')
 _patchname="patch-${pkgver}-${pkgrel}-ARCH"
-_fbpatchname="fbcondecor-0.9.6-2.6.33-rc7.patch"
-pkgdesc="The Linux Kernel and modules"
+#_patchname="patch-${pkgver}-1-ARCH"
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://www.kernel.org"
-backup=(etc/mkinitcpio.d/${pkgname}.preset)
-depends=('coreutils' 'linux-firmware' 'module-init-tools' 'mkinitcpio>=0.5.20')
-# pwc, ieee80211 and hostap-driver26 modules are included in kernel26 now
-# nforce package support was abandoned by nvidia, kernel modules should cover everything now.
-# kernel24 support is dropped since glibc24
-replaces=('kernel24' 'kernel24-scsi' 'kernel26-scsi'
-          'alsa-driver' 'ieee80211' 'hostap-driver26'
-          'pwc' 'nforce' 'squashfs' 'unionfs' 'ivtv'
-          'zd1211' 'kvm-modules' 'iwlwifi' 'rt2x00-cvs'
-          'gspcav1' 'atl2' 'wlan-ng26' 'rt2500' 'nouveau-drm')
-install=kernel26.install
-optdepends=('crda: to set the correct wireless channels of your country')
 source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2
         ftp://ftp.archlinux.org/other/kernel26/${_patchname}.bz2
-        http://dev.gentoo.org/~spock/projects/fbcondecor/archive/${_fbpatchname}
-        fbcondecor-2.6.34-fix.patch
         # the main kernel config files
         config config.x86_64
         # standard config files for mkinitcpio ramdisk
         kernel26.preset)
+md5sums=('61f3739a73afb6914cb007f37fb09b62'
+         '5b3c66f93c0de79aacd986a545f863b6'
+         '1ed53b9b64b8889563502177b0b428b5'
+         '89ba24b9c346a930378ca22cf377c75f'
+         '25584700a0a679542929c4bed31433b6')
 
 build() {
-  KARCH=x86
-
-  cd ${srcdir}
-  patch -Np0 -i fbcondecor-2.6.34-fix.patch || return 1
-
   cd ${srcdir}/linux-$_basekernel
   # Add -ARCH patches
   # See http://projects.archlinux.org/linux-2.6-ARCH.git/
-  patch -Np1 -i ${srcdir}/${_patchname} || return 1
-  patch -Np1 -i ${srcdir}/${_fbpatchname} || return 1
+  patch -Np1 -i ${srcdir}/${_patchname}
 
   if [ "$CARCH" = "x86_64" ]; then
     cat ../config.x86_64 >./.config
@@ -56,16 +40,12 @@ build() {
   if [ "${_kernelname}" != "" ]; then
     sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
   fi
-## A hack to prevent output kernel from being marked as dirty or git
-  sed 's/head=$(git rev-parse --verify --short HEAD 2>\/dev\/null)/0/' \
-      ${srcdir}/linux-$_basekernel/scripts/setlocalversion \
-      > ${srcdir}/linux-$_basekernel/scripts/setlocalversion
-##
   # get kernel version  
   make prepare
   # load configuration
   # Configure the kernel. Replace the line below with one of your choice.
   #make menuconfig # CLI menu for configuration
+  #make nconfig # new CLI menu for configuration
   #make xconfig # X-based configuration
   #make oldconfig # using old config from previous kernel version
   # ... or manually edit .config
@@ -77,8 +57,8 @@ build() {
   ####################
   yes "" | make config
   # build!
-  make bzImage modules || return 1
-  }
+  make ${MAKEFLAGS} bzImage modules
+}
 
 package_kernel26() {
   pkgdesc="The Linux Kernel and modules"
@@ -100,15 +80,15 @@ package_kernel26() {
   cd ${srcdir}/linux-$_basekernel
   # get kernel version
   _kernver="$(make kernelrelease)"
-  mkdir -p ${pkgdir}/{lib/modules,boot}
-  make INSTALL_MOD_PATH=${pkgdir} modules_install || return 1
+  mkdir -p ${pkgdir}/{lib/modules,lib/firmware,boot}
+  make INSTALL_MOD_PATH=${pkgdir} modules_install
   cp System.map ${pkgdir}/boot/System.map26${_kernelname}
   cp arch/$KARCH/boot/bzImage ${pkgdir}/boot/vmlinuz26${_kernelname}
   #  # add vmlinux
   install -m644 -D vmlinux ${pkgdir}/usr/src/linux-${_kernver}/vmlinux
 
   # install fallback mkinitcpio.conf file and preset file for kernel
-  install -m644 -D ${srcdir}/kernel26.preset ${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset || return 1
+  install -m644 -D ${srcdir}/kernel26.preset ${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset
   # set correct depmod command for install
   sed \
     -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \
@@ -167,7 +147,7 @@ package_kernel26-headers() {
   # add headers for lirc package
   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
+  for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102 usbvideo; do
    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
@@ -199,6 +179,15 @@ package_kernel26-headers() {
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/
   cp drivers/media/dvb/frontends/lgdt330x.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/
   cp drivers/media/video/msp3400-driver.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/
+  # add dvb headers  
+  # in reference to:
+  # http://bugs.archlinux.org/task/20402
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb
+  cp drivers/media/dvb/dvb-usb/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends
+  cp drivers/media/dvb/frontends/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners
+  cp drivers/media/common/tuners/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/
   # add xfs and shmem for aufs building
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/mm
@@ -223,27 +212,18 @@ package_kernel26-headers() {
   rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
 }
 
-#package_kernel26-firmware() {
-#  pkgdesc="The included firmware files of the Linux Kernel"
-#  groups=('base')
-#
-#  cd ${srcdir}/linux-$_basekernel
-#  make firmware || return 1
-#  make INSTALL_MOD_PATH=${pkgdir} firmware_install || return 1
-#}
-
-package_kernel26-manpages() {
-pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the Linux kernel."
+#package_kernel26-manpages() {
+#pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the Linux kernel."
 
-cd ${srcdir}/linux-$_basekernel
-make mandocs || return 1
+#cd ${srcdir}/linux-$_basekernel
+#make mandocs || return 1
 
-install -d ${pkgdir}/usr/share/man/man9/
-install ${srcdir}/linux-${_basekernel}/Documentation/DocBook/man/*.9.gz \
-${pkgdir}/usr/share/man/man9/
+#install -d ${pkgdir}/usr/share/man/man9/
+#install ${srcdir}/linux-${_basekernel}/Documentation/DocBook/man/*.9.gz \
+#${pkgdir}/usr/share/man/man9/
 
-find ${pkgdir} -type f -exec chmod 644 {} \;
-}
+#find ${pkgdir} -type f -exec chmod 644 {} \;
+#}
 
 package_kernel26-docs() {
 pkgdesc="Kernel hackers manual - HTML documentation that comes with the Linux kernel."
@@ -256,10 +236,8 @@ find $pkgdir -type d -exec chmod 755 {} \;
 # remove a file already in kernel26 package
 rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile
 }
-md5sums=('10eebcb0178fb4540e2165bfd7efc7ad'
-         '2a8f0f455395296a1678b226ae63c5a7'
-         'c72c30fc2787e6d5d72ffae3cfb5341b'
-         'ed65c8f0da0d8159ce4bfc198657ea83'
-         '6f37aeab713a3d59185a53066c923092'
-         'c81068add4917fca813417e8aa6c4f22'
+md5sums=('61f3739a73afb6914cb007f37fb09b62'
+         '5b3c66f93c0de79aacd986a545f863b6'
+         'ccfe0d9145188eaee4aa956e01fb92f7'
+         '89ba24b9c346a930378ca22cf377c75f'
          '25584700a0a679542929c4bed31433b6')