[arch-commits] Commit in intel-536ep/trunk (4 files)

[Tobias Powalowski]

    Date: Friday, September 11, 2009 @ 17:05:43
  Author: tpowa
Revision: 51799

upgpkg: intel-536ep 2.56.76.0-63
    bump to new major kernel version

Added:
  intel-536ep/trunk/kernel-2.6.31.patch
Modified:
  intel-536ep/trunk/PKGBUILD
  intel-536ep/trunk/intel-536EP.install
Deleted:
  intel-536ep/trunk/2.6.30.patch

---------------------+
 2.6.30.patch        |   10 ----------
 PKGBUILD            |   20 ++++++++++----------
 intel-536EP.install |    4 ++--
 kernel-2.6.31.patch |   20 ++++++++++++++++++++
 4 files changed, 32 insertions(+), 22 deletions(-)

Deleted: 2.6.30.patch
===================================================================
--- 2.6.30.patch	2009-09-11 21:02:55 UTC (rev 51798)
+++ 2.6.30.patch	2009-09-11 21:05:43 UTC (rev 51799)
@@ -1,10 +0,0 @@
---- coredrv/coredrv.c~	2009-06-11 20:02:24.000000000 +0000
-+++ coredrv/coredrv.c	2009-06-11 20:02:24.000000000 +0000
-@@ -782,7 +782,6 @@
-    if(hamproc == NULL) return -ENOMEM;
-    hamproc->read_proc = hamproc_read;
-    hamproc->write_proc = hamproc_write;
--   hamproc->owner = THIS_MODULE;
-    return 0;
- }
- void detach_hamproc(void)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-09-11 21:02:55 UTC (rev 51798)
+++ PKGBUILD	2009-09-11 21:05:43 UTC (rev 51799)
@@ -4,27 +4,27 @@
 pkgname=intel-536ep
 name=intel-536EP
 pkgver=2.56.76.0
-pkgrel=62
-_kernver=2.6.30-ARCH
+pkgrel=63
+_kernver=2.6.31-ARCH
 pkgdesc="Intel Modem Drivers for 536EP chipset. For stock arch 2.6 kernel "
 arch=(i686)
 license=('custom:"INTEL536"')
 url="http://linmodems.technion.ac.il/packages/Intel/"
-depends=('intel-536ep-utils' 'kernel26>=2.6.30' 'kernel26<2.6.31')
-source=(http://linmodems.technion.ac.il/packages/intel/Philippe.Vouters/intel-536EP-2.56.76.0_2009_02_08.tar.bz2
-	2.6.30.patch)
+depends=('intel-536ep-utils' 'kernel26>=2.6.31' 'kernel26<2.6.32')
+source=(http://linmodems.technion.ac.il/packages/intel/Philippe.Vouters/intel-536EP-537EP_2009_07_04.tar.bz2
+        kernel-2.6.31.patch)
 install=intel-536EP.install
 
 build() {
-  cd $startdir/src/intel-536EP-2.56.76.0
-  patch -Np0 -i ../2.6.30.patch || return 1
+  cd $startdir/src/intel-536-537
+  patch -Np0 -i ../kernel-2.6.31.patch || return 1
   # fix makefile
   sed -i -e "s/\`uname -r\`/${_kernver}/g" makefile
   sed -i -e "s/\`uname -r\`/${_kernver}/g" config_check
-  make KERNEL_SOURCE_PATH=/lib/modules/${_kernver}/build KDIR=/lib/modules/${_kernver}/build 536 || return 1 
+  make MODEM_TYPE=536 KERNEL_SOURCE_PATH=/lib/modules/${_kernver}/build KDIR=/lib/modules/${_kernver}/build 536 || return 1 
   #Install kernel module
   install -D -m 644  Intel536.ko $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/net/intel536.ko || return 1
   sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/intel-536EP.install
 }
-md5sums=('2c429c3ec7eab83a756dbdc611172474'
-         '475f999386f79638971382d2ed063e7a')
+md5sums=('dfea7456fd1b7a6cbf18cdd8ff69e1e7'
+         '0de9e6359610264a63754b39846aa178')

Modified: intel-536EP.install
===================================================================
--- intel-536EP.install	2009-09-11 21:02:55 UTC (rev 51798)
+++ intel-536EP.install	2009-09-11 21:05:43 UTC (rev 51799)
@@ -8,7 +8,7 @@
 
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.30-ARCH
+  KERNEL_VERSION=2.6.31-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 echo
 echo
@@ -30,7 +30,7 @@
   rm /etc/hamregistry.bin
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.30-ARCH
+  KERNEL_VERSION=2.6.31-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }
 

Added: kernel-2.6.31.patch
===================================================================
--- kernel-2.6.31.patch	                        (rev 0)
+++ kernel-2.6.31.patch	2009-09-11 21:05:43 UTC (rev 51799)
@@ -0,0 +1,20 @@
+--- coredrv/softserial.c~	2009-09-11 20:57:32.000000000 +0000
++++ coredrv/softserial.c	2009-09-11 20:57:32.000000000 +0000
+@@ -362,7 +362,7 @@
+    {
+       if( (ptty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26)
+-          (ptty->ldisc.ops->write_wakeup != NULL))
++          (ptty->ldisc->ops->write_wakeup != NULL))
+ #else
+           (ptty->ldisc.write_wakeup != NULL))
+ #endif
+@@ -371,7 +371,7 @@
+ 	 printk("ss_bg_eh:ldisc wakeup\n");
+ #endif
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26)
+-         (ptty->ldisc.ops->write_wakeup)(ptty);
++         (ptty->ldisc->ops->write_wakeup)(ptty);
+ #else
+          (ptty->ldisc.write_wakeup)(ptty);
+ #endif