Date: Wednesday, January 26, 2011 @ 07:23:44 Author: tpowa Revision: 107509
upgpkg: intel-537 2.60.80.0-71 bump to .37 kernel Added: intel-537/trunk/kernel-2.6.37.patch Modified: intel-537/trunk/PKGBUILD intel-537/trunk/intel-537.install ---------------------+ PKGBUILD | 19 +++++++++++++------ intel-537.install | 4 ++-- kernel-2.6.37.patch | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-01-26 12:16:23 UTC (rev 107508) +++ PKGBUILD 2011-01-26 12:23:44 UTC (rev 107509) @@ -1,34 +1,41 @@ # $Id$ # Maintainer : Tobias Powalowski <[email protected]> -_kernver=2.6.36-ARCH; +_kernver=2.6.37-ARCH; pkgname=intel-537 pkgver=2.60.80.0 -pkgrel=70 +pkgrel=71 pkgdesc="Intel Modem Drivers for 537 chipsets. For stock arch 2.6 kernel" arch=(i686) license=('custom:"INTEL537"') url="http://linmodems.technion.ac.il/packages/Intel/"; -depends=('intel-537-utils' 'kernel26>=2.6.36' 'kernel26<2.6.37') -makedepends=('kernel26-headers>=2.6.36' 'kernel26-headers<2.6.37') +depends=('intel-537-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-537.install build() { cd $srcdir/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 KDIR=/lib/modules/${_kernver}/build KERNEL_SOURCE_PATH=/lib/modules/${_kernver}/build MODEM_TYPE=537 537 +} + +package() { + cd $srcdir/intel-536-537 # Install kernel module install -D -m 644 Intel537.ko $pkgdir/lib/modules/${_kernver}/kernel/drivers/net/intel537.ko sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/intel-537.install } md5sums=('dfea7456fd1b7a6cbf18cdd8ff69e1e7' '0de9e6359610264a63754b39846aa178' - 'c23dbe78cc43064628d2b6599a0827e8') + 'c23dbe78cc43064628d2b6599a0827e8' + 'e75ac5426300ab97e6752d0bc3ad6c25') Modified: intel-537.install =================================================================== --- intel-537.install 2011-01-26 12:16:23 UTC (rev 107508) +++ intel-537.install 2011-01-26 12:23:44 UTC (rev 107509) @@ -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:23:44 UTC (rev 107509) @@ -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);
