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

[Tobias Powalowski]

    Date: Monday, November 1, 2010 @ 05:03:02
  Author: tpowa
Revision: 97680

upgpkg: slmodem 2.9.11-54
bump to latest kernel version

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

---------------------+
 PKGBUILD            |   16 +++++++++-------
 kernel-2.6.36.patch |   25 +++++++++++++++++++++++++
 slmodem.install     |    4 ++--
 3 files changed, 36 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-01 08:21:04 UTC (rev 97679)
+++ PKGBUILD	2010-11-01 09:03:02 UTC (rev 97680)
@@ -1,24 +1,25 @@
 # $Id$
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
-_kernver=2.6.35-ARCH;
+_kernver=2.6.36-ARCH;
 
 pkgname=slmodem
 pkgver=2.9.11
-pkgrel=53
+pkgrel=54
 
 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.35' 'kernel26<2.6.36' 'slmodem-utils')
-makedepends=('kernel26-headers>=2.6.35' 'kernel26-headers<2.6.36') 
+depends=('kernel26>=2.6.36' 'kernel26<2.6.37' 'slmodem-utils')
+makedepends=('kernel26-headers>=2.6.36' 'kernel26-headers<2.6.37') 
 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.33.patch
-  kernel-2.6.34.patch)
+  kernel-2.6.34.patch
+  kernel-2.6.36.patch)
 
 build() {
   cd $srcdir/
@@ -29,7 +30,7 @@
   cd $srcdir/$pkgname-$pkgver-20080126
   patch -Np0 -i ../kernel-2.6.24.patch || return 1
   patch -Np0 -i ../kernel-2.6.33.patch || return 1
-
+  patch -Np0 -i ../kernel-2.6.36.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=$pkgdir drivers || return 1
   # Install kernel modules
@@ -41,4 +42,5 @@
          '25244ef3924566866f4fae2feca78218'
          '5a5e313a5040fcff7bf11c33f008e61e'
          'c03b607c7c4819bf693da4fa71324691'
-         '4401b7353fa5894be28e217d4396af99')
+         '4401b7353fa5894be28e217d4396af99'
+         '1cd248732b9bca04fcd73734ab701047')

Added: kernel-2.6.36.patch
===================================================================
--- kernel-2.6.36.patch	                        (rev 0)
+++ kernel-2.6.36.patch	2010-11-01 09:03:02 UTC (rev 97680)
@@ -0,0 +1,25 @@
+--- drivers/amrmo_init.c~	2010-11-01 09:59:31.253338565 +0100
++++ drivers/amrmo_init.c	2010-11-01 10:02:56.413334268 +0100
+@@ -430,11 +430,11 @@
+ 
+ 
+ 
+-static int amrmo_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
++static long amrmo_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+ {
+ 	struct amrmo_struct *amrmo = (struct amrmo_struct *)file->private_data;
+         unsigned long flags;
+-	int ret;
++	long ret;
+ 	unsigned stat;
+ 	AMRMO_DBG("amrmo_ioctl: cmd %x, arg %lx...\n",cmd,arg);
+         switch (cmd) 
+@@ -502,7 +502,7 @@
+         .read =    amrmo_read,
+         .write =   amrmo_write,
+         .poll =    amrmo_poll,
+-        .ioctl =   amrmo_ioctl,
++        .unlocked_ioctl =   amrmo_unlocked_ioctl,
+         .open =    amrmo_open,
+         .release = amrmo_release,
+ };

Modified: slmodem.install
===================================================================
--- slmodem.install	2010-11-01 08:21:04 UTC (rev 97679)
+++ slmodem.install	2010-11-01 09:03:02 UTC (rev 97680)
@@ -21,7 +21,7 @@
 
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.35-ARCH
+  KERNEL_VERSION=2.6.36-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.35-ARCH
+  KERNEL_VERSION=2.6.36-ARCH
   depmod -v $KERNEL_VERSION   > /dev/null 2>&1	
 }