[arch-commits] Commit in slmodem/trunk (PKGBUILD kernel-2.6.33.patch slmodem.install)

[Tobias Powalowski]

    Date: Saturday, February 27, 2010 @ 10:27:59
  Author: tpowa
Revision: 70611

upgpkg: slmodem 2.9.11-50
rebuild against .33 kernel

Added:
  slmodem/trunk/kernel-2.6.33.patch
Modified:
  slmodem/trunk/PKGBUILD
  slmodem/trunk/slmodem.install

---------------------+
 PKGBUILD            |   16 ++++++++++------
 kernel-2.6.33.patch |   11 +++++++++++
 slmodem.install     |    4 ++--
 3 files changed, 23 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-02-27 15:24:51 UTC (rev 70610)
+++ PKGBUILD	2010-02-27 15:27:59 UTC (rev 70611)
@@ -1,22 +1,23 @@
 # $Id$
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
-_kernver=2.6.32-ARCH;
+_kernver=2.6.33-ARCH;
 
 pkgname=slmodem
 pkgver=2.9.11
-pkgrel=49
+pkgrel=50
 
 pkgdesc="Drivers for the Smartlink winmodems. For stock arch 2.6 kernel "
 arch=(i686)
 license=('custom:"Smartlink"')
 url="http://linmodems.technion.ac.il/packages/smartlink/" 
-depends=('kernel26>=2.6.32.3' 'kernel26<2.6.33' 'slmodem-utils')
-makedepends=('kernel26-headers>=2.6.32' 'kernel26-headers<2.6.33') 
+depends=('kernel26>=2.6.33' 'kernel26<2.6.34' 'slmodem-utils')
+makedepends=('kernel26-headers>=2.6.33' 'kernel26-headers<2.6.34') 
 install=slmodem.install 
 source=(http://linmodems.technion.ac.il/packages/smartlink/slmodem-2.9.11-20080126.tar.gz \
   http://linmodems.technion.ac.il/packages/smartlink/ungrab-winmodem-20080126.tar.gz
-  kernel-2.6.24.patch) 
+  kernel-2.6.24.patch
+  kernel-2.6.33.patch) 
 
 build() { 
   cd $startdir/src/ungrab-winmodem-20080126
@@ -24,6 +25,7 @@
   install -D -m644 ungrab-winmodem.ko $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/net/ungrab-winmodem.ko
   cd $startdir/src/$pkgname-$pkgver-20080126
   patch -Np0 -i ../kernel-2.6.24.patch || return 1
+  patch -Np0 -i ../kernel-2.6.33.patch || return 1
   sed 's|^obj-m := slamr.o slusb.o|obj-m := slamr.o|' -i drivers/Makefile
   make KERNEL_DIR=/lib/modules/${_kernver}/build SUPPORT_ALSA=1 DESTDIR=$startdir/pkg drivers || return 1 
   # Install kernel modules
@@ -31,6 +33,8 @@
   #install -D -m 644 drivers/slusb.ko $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/usb/net/slusb.ko 
   sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/slmodem.install
 }
+
 md5sums=('8670dd7e1e1a46296ac4c80f7ac0471d'
          '25244ef3924566866f4fae2feca78218'
-         '5a5e313a5040fcff7bf11c33f008e61e')
+         '5a5e313a5040fcff7bf11c33f008e61e'
+         'c03b607c7c4819bf693da4fa71324691')

Added: kernel-2.6.33.patch
===================================================================
--- kernel-2.6.33.patch	                        (rev 0)
+++ kernel-2.6.33.patch	2010-02-27 15:27:59 UTC (rev 70611)
@@ -0,0 +1,11 @@
+--- drivers/kernel-ver.c~	2010-02-27 16:26:26.000000000 +0100
++++ drivers/kernel-ver.c	2010-02-27 16:26:26.000000000 +0100
+@@ -6,7 +6,7 @@
+ #include <stdio.h>
+ #include <linux/version.h>
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
+-#include <linux/utsrelease.h>
++#include <generated/utsrelease.h>
+ #endif
+ 
+ int main()

Modified: slmodem.install
===================================================================
--- slmodem.install	2010-02-27 15:24:51 UTC (rev 70610)
+++ slmodem.install	2010-02-27 15:27:59 UTC (rev 70611)
@@ -21,7 +21,7 @@
 
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.32-ARCH
+  KERNEL_VERSION=2.6.33-ARCH
   depmod -v $KERNEL_VERSION   > /dev/null 2>&1	
 echo
 echo
@@ -39,7 +39,7 @@
 post_remove() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.32-ARCH
+  KERNEL_VERSION=2.6.33-ARCH
   depmod -v $KERNEL_VERSION   > /dev/null 2>&1	
 }