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

[Tobias Powalowski]

    Date: Wednesday, January 26, 2011 @ 07:13:56
  Author: tpowa
Revision: 107504

upgpkg: intel-536ep 2.56.76.0-69
bump to latest .37 series

Added:
  intel-536ep/trunk/kernel-2.6.37.patch
Modified:
  intel-536ep/trunk/PKGBUILD
  intel-536ep/trunk/intel-536EP.install

---------------------+
 PKGBUILD            |   19 +++++++++++++------
 intel-536EP.install |    4 ++--
 kernel-2.6.37.patch |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-26 11:36:49 UTC (rev 107503)
+++ PKGBUILD	2011-01-26 12:13:56 UTC (rev 107504)
@@ -4,31 +4,38 @@
 pkgname=intel-536ep
 name=intel-536EP
 pkgver=2.56.76.0
-pkgrel=68
-_kernver=2.6.36-ARCH
+pkgrel=69
+_kernver=2.6.37-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.36' 'kernel26<2.6.37')
-makedepends=('kernel26-headers>=2.6.36' 'kernel26-headers<2.6.37')
+depends=('intel-536ep-utils' 'kernel26>=2.6.37' 'kernel26<2.6.38')
+makedepends=('kernel26-headers>=2.6.37' 'kernel26-headers<2.6.38')
 source=(http://linmodems.technion.ac.il/packages/intel/Philippe.Vouters/intel-536EP-537EP_2009_07_04.tar.bz2
         kernel-2.6.31.patch
-        kernel-2.6.33.patch)
+        kernel-2.6.33.patch
+        kernel-2.6.37.patch)
 install=intel-536EP.install
 
 build() {
   cd $startdir/src/intel-536-537
   patch -Np0 -i ../kernel-2.6.31.patch
   patch -Np0 -i ../kernel-2.6.33.patch
+  patch -Np0 -i ../kernel-2.6.37.patch
   # fix makefile
   sed -i -e "s/\`uname -r\`/${_kernver}/g" makefile
   sed -i -e "s/\`uname -r\`/${_kernver}/g" config_check
   make MODEM_TYPE=536 KERNEL_SOURCE_PATH=/lib/modules/${_kernver}/build KDIR=/lib/modules/${_kernver}/build 536
+}
+
+package() {
+  cd $startdir/src/intel-536-537
   #Install kernel module
   install -D -m 644  Intel536.ko $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/net/intel536.ko
   sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/intel-536EP.install
 }
 md5sums=('dfea7456fd1b7a6cbf18cdd8ff69e1e7'
          '0de9e6359610264a63754b39846aa178'
-         'c23dbe78cc43064628d2b6599a0827e8')
+         'c23dbe78cc43064628d2b6599a0827e8'
+         'e75ac5426300ab97e6752d0bc3ad6c25')

Modified: intel-536EP.install
===================================================================
--- intel-536EP.install	2011-01-26 11:36:49 UTC (rev 107503)
+++ intel-536EP.install	2011-01-26 12:13:56 UTC (rev 107504)
@@ -8,7 +8,7 @@
 
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.36-ARCH
+  KERNEL_VERSION=2.6.37-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 echo
 echo
@@ -30,6 +30,6 @@
   rm /etc/hamregistry.bin
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.36-ARCH
+  KERNEL_VERSION=2.6.37-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }

Added: kernel-2.6.37.patch
===================================================================
--- kernel-2.6.37.patch	                        (rev 0)
+++ kernel-2.6.37.patch	2011-01-26 12:13:56 UTC (rev 107504)
@@ -0,0 +1,49 @@
+--- coredrv/locks.c~	2011-01-26 12:12:00.856675530 +0000
++++ coredrv/locks.c	2011-01-26 12:12:00.873342198 +0000
+@@ -141,15 +141,15 @@
+ #endif
+ } 
+ 
+-DECLARE_MUTEX(sem0);
+-DECLARE_MUTEX(sem1);
+-DECLARE_MUTEX(sem2);
+-DECLARE_MUTEX(sem3);
+-DECLARE_MUTEX(sem4);
+-DECLARE_MUTEX(sem5);
+-DECLARE_MUTEX(sem6);
+-DECLARE_MUTEX(sem7);
+-DECLARE_MUTEX(sem8);
++DEFINE_SEMAPHORE(sem0);
++DEFINE_SEMAPHORE(sem1);
++DEFINE_SEMAPHORE(sem2);
++DEFINE_SEMAPHORE(sem3);
++DEFINE_SEMAPHORE(sem4);
++DEFINE_SEMAPHORE(sem5);
++DEFINE_SEMAPHORE(sem6);
++DEFINE_SEMAPHORE(sem7);
++DEFINE_SEMAPHORE(sem8);
+ 
+ asmlinkage void linux_RSAGetExclusive(int Resource, unsigned char *Indicator) 
+ {
+--- coredrv/softserial_io.c~	2011-01-26 12:16:55.753342197 +0000
++++ coredrv/softserial_io.c	2011-01-26 12:16:55.763342199 +0000
+@@ -65,7 +65,7 @@
+ }
+ 
+ //=============================================================================
+-static DECLARE_MUTEX(softserial_write_sem);
++static DEFINE_SEMAPHORE(softserial_write_sem);
+ int softserial_write(struct tty_struct* ptty,
+                       //int from_user_space,
+                       const unsigned char* input_buffer,
+--- coredrv/coredrv.c~	2011-01-26 12:15:54.713342038 +0000
++++ coredrv/coredrv.c	2011-01-26 12:15:54.726675572 +0000
+@@ -765,7 +765,7 @@
+ extern void do_schedule(void);
+ #endif
+ 
+-   DECLARE_MUTEX(exec_reg_sem);
++   DEFINE_SEMAPHORE(exec_reg_sem);
+    DECLARE_WAIT_QUEUE_HEAD(persistWriteQ);
+    DECLARE_WAIT_QUEUE_HEAD(persistReadQ);
+    DECLARE_WAIT_QUEUE_HEAD(persistShutdownQ);