kernel26-libre-2.6.37-5 moved from [libre-testing] to [libre]

1 files changed, 19 insertions, 33 deletions

diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD
index ddbd74bc7..d0e8d51d4 100644
--- a/libre/kernel26-libre/PKGBUILD
+++ b/libre/kernel26-libre/PKGBUILD
@@ -1,4 +1,4 @@
-## $Id: PKGBUILD 102753 2010-12-10 22:15:33Z tpowa $
+# $Id$
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
@@ -7,12 +7,14 @@ pkgname=('kernel26-libre' 'kernel26-libre-headers' 'kernel26-libre-docs') # Buil
 _kernelname=${pkgname#kernel26-libre}
 _basekernel=2.6.37
 pkgver=${_basekernel}
-pkgrel=4
+pkgrel=5
 makedepends=('xmlto' 'docbook-xsl')
-_patchname="patch-${pkgver}-${pkgrel}-LIBRE"
+#_patchname="patch-${pkgver}-${pkgrel}-LIBRE"
+_patchname="patch-${pkgver}-4-LIBRE"
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://linux-libre.fsfla.org/"
+options=(!strip)
 install=kernel26.install
 source=(http://linux-libre.fsfla.org/pub/linux-libre/releases/2.6.37-libre/linux-2.6.37-libre.tar.bz2
         http://repo.parabolagnulinux.org/other/kernel26/${_patchname}.bz2
@@ -59,7 +61,7 @@ build() {
   ####################
   yes "" | make config
   # build!
-  make ${MAKEFLAGS} bzImage modules || return 1
+  make ${MAKEFLAGS} bzImage modules
 }
 
 package_kernel26-libre() {
@@ -85,14 +87,14 @@ package_kernel26-libre() {
   # get kernel version
   _kernver="$(make kernelrelease)"
   mkdir -p ${pkgdir}/{lib/modules,lib/firmware,boot}
-  make INSTALL_MOD_PATH=${pkgdir} modules_install || return 1
+  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/kernel26${_kernelname}.preset || return 1
+  install -m644 -D ${srcdir}/kernel26.preset ${pkgdir}/etc/mkinitcpio.d/kernel26${_kernelname}.preset
   # set correct depmod command for install
   sed \
     -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \
@@ -109,7 +111,9 @@ package_kernel26-libre() {
   rm -f ${pkgdir}/lib/modules/${_kernver}/{source,build}
   # remove the firmware
   rm -rf ${pkgdir}/lib/firmware
- 
+  # gzip -9 all modules to safe 100MB of space
+  find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
+
 # this should trick external modules to find -ARCH while uname remains -LIBRE
   msg "Linking -LIBRE local version to -ARCH..."
   ln -s /lib/modules/${_kernver} ${pkgdir}/lib/modules/${_kernver%-LIBRE}-ARCH
@@ -132,7 +136,7 @@ package_kernel26-libre-headers() {
     ${pkgdir}/usr/src/linux-${_kernver}/.config
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include
 
-  for i in acpi asm-generic config generated linux math-emu media net pcmcia scsi sound trace video; do
+  for i in acpi asm-generic config generated linux math-emu media net pcmcia scsi sound trace video xen; do
     cp -a include/$i ${pkgdir}/usr/src/linux-${_kernver}/include/
   done
 
@@ -211,6 +215,10 @@ package_kernel26-libre-headers() {
   # in reference to:
   # http://bugs.archlinux.org/task/14568
   cp -a include/trace $pkgdir/usr/src/linux-${_kernver}/include/
+  # add headers for crypto modules
+  # in reference to:
+  # http://bugs.archlinux.org/task/22081
+  cp -a include/crypto $pkgdir/usr/src/linux-${_kernver}/include/
   # copy in Kconfig files
   for i in `find . -name "Kconfig*"`; do 
     mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/`echo $i | sed 's|/Kconfig.*||'`
@@ -227,22 +235,6 @@ package_kernel26-libre-headers() {
   ln -s /usr/src/${_kernver} ${pkgdir}/usr/src/${_kernver%-LIBRE}-ARCH
 }
 
-#package_kernel26-libre-manpages() {
-#pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the Linux kernel."
-#provides=("kernel26-manpages=$pkgver")
-#replaces=('kernel26-manpages')
-#conflicts=('kernel26-manpages')
-#
-#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/
-#
-#find ${pkgdir} -type f -exec chmod 644 {} \;
-#}
-
 package_kernel26-libre-docs() {
 pkgdesc="Kernel hackers manual - HTML documentation that comes with the Linux kernel."
 provides=("kernel26-docs=$pkgver")
@@ -258,14 +250,8 @@ find $pkgdir -type d -exec chmod 755 {} \;
 rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile
 }
 md5sums=('3e80c55a0927b4439f3aad4f973f05cc'
-         'e9ad91e5f11d71894adb624267a65eb6'
-         'e0adf1214045db007c5a4308325786d0'
-         '855c90dd52b1deef44a70ab3b2ebde1e'
-         '25584700a0a679542929c4bed31433b6'
-         '00122850abe36601f3be09f99e0ac0ab')
-md5sums=('3e80c55a0927b4439f3aad4f973f05cc'
          'b9eecbe905cc8db8dc1b408ae5e471da'
-         'ab3f8671ab29aeb29d8c8dc725894632'
-         '244c939a8159a78d124227d2ab2116a2'
+         'fcd0dd7a2148aec4d8b07dd01e99c0e1'
+         '52b1fd9c166c74fa3273b7d9a204fefb'
          '25584700a0a679542929c4bed31433b6'
-         '1b70cfc782e18bbb9467000f83110ce0')
+         '1bff12f1ba69206b1abee2bba4b7619c')