[arch-commits] Commit in intel-537/trunk (3 files)
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
===
--- PKGBUILD2011-01-26 12:16:23 UTC (rev 107508)
+++ PKGBUILD2011-01-26 12:23:44 UTC (rev 107509)
@@ -1,34 +1,41 @@
# $Id$
# Maintainer : Tobias Powalowski tp...@archlinux.org
-_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' 'kernel262.6.37')
-makedepends=('kernel26-headers=2.6.36' 'kernel26-headers2.6.37')
+depends=('intel-537-utils' 'kernel26=2.6.37' 'kernel262.6.38')
+makedepends=('kernel26-headers=2.6.37' 'kernel26-headers2.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 21
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 21
}
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 +
coredrv/locks.c2011-01-26 12:12:00.873342198 +
+@@ -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 +
coredrv/softserial_io.c2011-01-26 12:16:55.763342199 +
+@@ -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 +
coredrv/coredrv.c 2011-01-26 12:15:54.726675572 +
+@@ -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);
[arch-commits] Commit in intel-537/trunk (3 files)
Date: Saturday, February 27, 2010 @ 10:24:06
Author: tpowa
Revision: 70609
upgpkg: intel-537 2.60.80.0-66
rebuild against .33 kernel
Added:
intel-537/trunk/kernel-2.6.33.patch
Modified:
intel-537/trunk/PKGBUILD
intel-537/trunk/intel-537.install
-+
PKGBUILD| 15 +--
intel-537.install |4 ++--
kernel-2.6.33.patch | 40
3 files changed, 51 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-02-27 15:22:34 UTC (rev 70608)
+++ PKGBUILD2010-02-27 15:24:06 UTC (rev 70609)
@@ -1,24 +1,26 @@
# $Id$
# Maintainer : Tobias Powalowski tp...@archlinux.org
-_kernver=2.6.32-ARCH;
+_kernver=2.6.33-ARCH;
pkgname=intel-537
pkgver=2.60.80.0
-pkgrel=65
+pkgrel=66
pkgdesc=Intel Modem Drivers for 537 chipsets. For stock arch 2.6 kernel
arch=(i686 x86_64)
license=('custom:INTEL537')
url=http://linmodems.technion.ac.il/packages/Intel/;
-depends=('intel-537-utils' 'kernel26=2.6.32.3' 'kernel262.6.33')
-makedepends=('kernel26-headers=2.6.32' 'kernel26-headers2.6.33')
+depends=('intel-537-utils' 'kernel26=2.6.33' 'kernel262.6.34')
+makedepends=('kernel26-headers=2.6.33' 'kernel26-headers2.6.34')
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.31.patch
+kernel-2.6.33.patch)
install=intel-537.install
build() {
cd $srcdir/intel-536-537
patch -Np0 -i ../kernel-2.6.31.patch || return 1
+ patch -Np0 -i ../kernel-2.6.33.patch || return 1
# fix makefile
sed -i -e s/\`uname -r\`/${_kernver}/g makefile
sed -i -e s/\`uname -r\`/${_kernver}/g config_check
@@ -28,4 +30,5 @@
sed -i -e s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g
$startdir/intel-537.install
}
md5sums=('dfea7456fd1b7a6cbf18cdd8ff69e1e7'
- '0de9e6359610264a63754b39846aa178')
+ '0de9e6359610264a63754b39846aa178'
+ 'c23dbe78cc43064628d2b6599a0827e8')
Modified: intel-537.install
===
--- intel-537.install 2010-02-27 15:22:34 UTC (rev 70608)
+++ intel-537.install 2010-02-27 15:24:06 UTC (rev 70609)
@@ -8,7 +8,7 @@
# updating module dependencies
echo Updating module dependencies. Please wait ...
- KERNEL_VERSION=2.6.32-ARCH
+ KERNEL_VERSION=2.6.33-ARCH
depmod -v $KERNEL_VERSION /dev/null 21
echo
echo
@@ -30,7 +30,7 @@
rm /etc/hamregistry.bin
# updating module dependencies
echo Updating module dependencies. Please wait ...
- KERNEL_VERSION=2.6.32-ARCH
+ KERNEL_VERSION=2.6.33-ARCH
depmod -v $KERNEL_VERSION /dev/null 21
}
Added: kernel-2.6.33.patch
===
--- kernel-2.6.33.patch (rev 0)
+++ kernel-2.6.33.patch 2010-02-27 15:24:06 UTC (rev 70609)
@@ -0,0 +1,40 @@
+--- config_check~ 2010-02-27 16:18:10.0 +0100
config_check 2010-02-27 16:18:10.0 +0100
+@@ -36,7 +36,7 @@
+ echoCurrent running kernel is: $KERNVER
+
+
+-if [ -a /lib/modules/$KERNVER/build/include/linux/autoconf.h ]; then
++if [ -a /lib/modules/$KERNVER/build/include/generated/autoconf.h ]; then
+echo/lib/modules... autoconf.h exists
+ else
+echo/lib/modules... autoconf.h does not exist
+@@ -44,7 +44,7 @@
+exit 1
+ fi
+
+-if [ `diff /boot/vmlinuz.autoconf.h
/lib/modules/$KERNVER/build/include/linux/autoconf.h` \
++if [ `diff /boot/vmlinuz.autoconf.h
/lib/modules/$KERNVER/build/include/generated/autoconf.h` \
+ == ]; then
+echoautoconf.h matches running kernel
+ else
+@@ -61,7 +61,7 @@
+echo configurations to create a functional driver for this kernel.
+echo call \make config_sync\ and this script will
+echo copy the file /boot/vmlinuz.autoconf.h to
+- echo /lib/modules/$KERNVER/build/include/linux/autoconf.h
++ echo /lib/modules/$KERNVER/build/include/generated/autoconf.h
+echo and backup the original autoconf.h as autoconf.bak
+echo The same will be done for version.h
+echo Then repeat the build and installation procedure over again.
+--- coredrv/hamdefs.h~ 2010-02-27 16:20:58.0 +0100
coredrv/hamdefs.h 2010-02-27 16:20:58.0 +0100
+@@ -51,7 +51,7 @@
+#define EXPORT_SYMTAB
+#includelinux/version.h
+ #if LINUX_VERSION_CODE = KERNEL_VERSION(2,6,18)
+- #includelinux/autoconf.h
++ #includegenerated/autoconf.h
+ #else
+#includelinux/config.h
+ #endif
