kernel26-libre-2.6.37.1-1

4 files changed, 15 insertions, 17 deletions

diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD
index 56046bbc1..af73d75e9 100644
--- a/libre/kernel26-libre/PKGBUILD
+++ b/libre/kernel26-libre/PKGBUILD
@@ -6,16 +6,15 @@ pkgbase="kernel26-libre"
 pkgname=('kernel26-libre' 'kernel26-libre-headers' 'kernel26-libre-docs') # Build stock -LIBRE kernel
 _kernelname=${pkgname#kernel26-libre}
 _basekernel=2.6.37
-pkgver=${_basekernel}
-pkgrel=5
+pkgver=${_basekernel}.1
+pkgrel=1
 makedepends=('xmlto' 'docbook-xsl')
-#_patchname="patch-${pkgver}-${pkgrel}-LIBRE"
-_patchname="patch-${pkgver}-4-LIBRE"
+_patchname="patch-${pkgver}-${pkgrel}-LIBRE"
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://linux-libre.fsfla.org/"
 options=(!strip)
-source=(http://linux-libre.fsfla.org/pub/linux-libre/releases/2.6.37-libre/linux-2.6.37-libre.tar.bz2
+source=(http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/linux-${pkgver}-libre.tar.bz2
         http://repo.parabolagnulinux.org/other/kernel26/${_patchname}.bz2
         # the main kernel config files
         config.i686 config.x86_64
@@ -24,7 +23,7 @@ source=(http://linux-libre.fsfla.org/pub/linux-libre/releases/2.6.37-libre/linux
         kernel26.install)
 
 build() {
-  cd ${srcdir}/linux-$_basekernel
+  cd ${srcdir}/linux-$pkgver
   # Add -LIBRE patches
   # See http://projects.parabolagnulinux.org/linux-libre-2.6-LIBRE.git/
   patch -Np1 -i ${srcdir}/${_patchname} || return 1
@@ -82,7 +81,7 @@ package_kernel26-libre() {
   optdepends=('crda: to set the correct wireless channels of your country')
 
   KARCH=x86
-  cd ${srcdir}/linux-$_basekernel
+  cd ${srcdir}/linux-$pkgver
   # get kernel version
   _kernver="$(make kernelrelease)"
   mkdir -p ${pkgdir}/{lib/modules,lib/firmware,boot}
@@ -126,7 +125,7 @@ package_kernel26-libre-headers() {
   mkdir -p ${pkgdir}/lib/modules/${_kernver}
   cd ${pkgdir}/lib/modules/${_kernver}
   ln -sf ../../../usr/src/linux-${_kernver} build
-  cd ${srcdir}/linux-$_basekernel
+  cd ${srcdir}/linux-$pkgver
   install -D -m644 Makefile \
     ${pkgdir}/usr/src/linux-${_kernver}/Makefile
   install -D -m644 kernel/Makefile \
@@ -240,7 +239,7 @@ provides=("kernel26-docs=$pkgver")
 replaces=('kernel26-docs')
 conflicts=('kernel26-docs')
 
-cd ${srcdir}/linux-$_basekernel
+cd ${srcdir}/linux-$pkgver
 mkdir -p $pkgdir/usr/src/linux-$_kernver
 mv Documentation $pkgdir/usr/src/linux-$_kernver
 find $pkgdir -type f -exec chmod 444 {} \;
@@ -248,9 +247,9 @@ 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=('3e80c55a0927b4439f3aad4f973f05cc'
-         'b9eecbe905cc8db8dc1b408ae5e471da'
-         'fcd0dd7a2148aec4d8b07dd01e99c0e1'
-         '52b1fd9c166c74fa3273b7d9a204fefb'
+md5sums=('e88329f0b1a8c8527b5cab36530b2d57'
+         'e5b28b5bed7ef1a898d528cf0d75220d'
+         '5266c8554fe93d3dbfb1699f0d86f129'
+         'bdc02636e0acc27b942898a4fc66163f'
          '25584700a0a679542929c4bed31433b6'
          '1bff12f1ba69206b1abee2bba4b7619c')
diff --git a/libre/kernel26-libre/config.i686 b/libre/kernel26-libre/config.i686
index 00e138c67..50ad703a0 100644
--- a/libre/kernel26-libre/config.i686
+++ b/libre/kernel26-libre/config.i686
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/i386 2.6.37 Kernel Configuration
-# Sat Jan 29 19:26:29 2011
+# Fri Feb 18 16:45:06 2011
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
diff --git a/libre/kernel26-libre/config.x86_64 b/libre/kernel26-libre/config.x86_64
index c38956c3d..a4c1457b1 100644
--- a/libre/kernel26-libre/config.x86_64
+++ b/libre/kernel26-libre/config.x86_64
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/x86_64 2.6.37 Kernel Configuration
-# Sat Jan 29 19:46:24 2011
+# Fri Feb 18 18:18:04 2011
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
diff --git a/libre/kernel26-libre/get_configs b/libre/kernel26-libre/get_configs
index 09e408b8b..624ea1048 100755
--- a/libre/kernel26-libre/get_configs
+++ b/libre/kernel26-libre/get_configs
@@ -1,10 +1,9 @@
 #!/bin/bash
 
 source PKGBUILD
-source *.install
 
 pkgname=${pkgname/-libre/}
-KERNEL_VERSION=${KERNEL_VERSION/-LIBRE/}
+KERNEL_VERSION=${2:-${_basekernel}-ARCH}
 from=${1:-core}
 
 for pkgarch in ${arch[@]}; do