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

[Tobias Powalowski]

    Date: Monday, May 17, 2010 @ 15:34:49
  Author: tpowa
Revision: 80494

upgpkg: slmodem 2.9.11-51
rebuild against latest kernel

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

---------------------+
 PKGBUILD            |   30 +++++++++++++++++-------------
 kernel-2.6.34.patch |   22 ++++++++++++++++++++++
 slmodem.install     |    4 ++--
 3 files changed, 41 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-05-17 18:22:37 UTC (rev 80493)
+++ PKGBUILD	2010-05-17 19:34:49 UTC (rev 80494)
@@ -1,40 +1,44 @@
 # $Id$
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
-_kernver=2.6.33-ARCH;
+_kernver=2.6.34-ARCH;
 
 pkgname=slmodem
 pkgver=2.9.11
-pkgrel=50
+pkgrel=51
 
 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.33' 'kernel26<2.6.34' 'slmodem-utils')
-makedepends=('kernel26-headers>=2.6.33' 'kernel26-headers<2.6.34') 
+depends=('kernel26>=2.6.34' 'kernel26<2.6.35' 'slmodem-utils')
+makedepends=('kernel26-headers>=2.6.34' 'kernel26-headers<2.6.35') 
 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.33.patch
+  kernel-2.6.34.patch)
 
-build() { 
-  cd $startdir/src/ungrab-winmodem-20080126
+build() {
+  cd $srcdir/
+  patch -Np0 -i ../kernel-2.6.34.patch || return 1
+  cd $srcdir/ungrab-winmodem-20080126
   make KERNEL_DIR=/lib/modules/${_kernver}/build || return 1
-  install -D -m644 ungrab-winmodem.ko $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/net/ungrab-winmodem.ko
-  cd $startdir/src/$pkgname-$pkgver-20080126
+  install -D -m644 ungrab-winmodem.ko $pkgdir/lib/modules/${_kernver}/kernel/drivers/net/ungrab-winmodem.ko
+  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
+
   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 
+  make KERNEL_DIR=/lib/modules/${_kernver}/build SUPPORT_ALSA=1 DESTDIR=$pkgdir drivers || return 1
   # Install kernel modules
-  install -D -m 644 drivers/slamr.ko $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/net/slamr.ko
+  install -D -m 644 drivers/slamr.ko $pkgdir/lib/modules/${_kernver}/kernel/drivers/net/slamr.ko
   #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'
-         'c03b607c7c4819bf693da4fa71324691')
+         'c03b607c7c4819bf693da4fa71324691'
+         '4401b7353fa5894be28e217d4396af99')

Added: kernel-2.6.34.patch
===================================================================
--- kernel-2.6.34.patch	                        (rev 0)
+++ kernel-2.6.34.patch	2010-05-17 19:34:49 UTC (rev 80494)
@@ -0,0 +1,22 @@
+--- ungrab-winmodem-20080126/ungrab-winmodem.c~	2010-05-17 21:29:24.261834039 +0200
++++ ungrab-winmodem-20080126/ungrab-winmodem.c	2010-05-17 21:29:24.289770941 +0200
+@@ -76,7 +76,7 @@
+ {
+ 	struct pci_dev *dev = NULL;
+ 	struct device *reldev;
+-        while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
++        while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+ 		if(pci_match_id(softmodem_pci_tbl, dev) && pci_dev_driver(dev) &&
+ 		   (reldev = get_device(&dev->dev)) ) {
+ 			printk(KERN_INFO "device %04x:%04x is grabbed by driver %s: try to release\n",
+--- slmodem-2.9.11-20080126/drivers/amrmo_init.c~	2010-05-17 21:31:53.029933461 +0200
++++ slmodem-2.9.11-20080126/drivers/amrmo_init.c	2010-05-17 21:31:53.076443380 +0200
+@@ -749,7 +749,7 @@
+ #ifdef OLD_KERNEL
+ 	pci_for_each_dev(dev) {
+ #else
+-        while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
++        while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+ #endif
+ 		if(pci_match_id(amrmo_pci_tbl, dev) &&
+ 		   pci_dev_driver(dev)) {

Modified: slmodem.install
===================================================================
--- slmodem.install	2010-05-17 18:22:37 UTC (rev 80493)
+++ slmodem.install	2010-05-17 19:34:49 UTC (rev 80494)
@@ -21,7 +21,7 @@
 
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.33-ARCH
+  KERNEL_VERSION=2.6.34-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.33-ARCH
+  KERNEL_VERSION=2.6.34-ARCH
   depmod -v $KERNEL_VERSION   > /dev/null 2>&1	
 }