[arch-commits] CVS update of extra/network/slmodem (5 files)
Tobias Powalowski
tpowa at archlinux.org
Thu Mar 6 08:32:25 UTC 2008
Date: Thursday, March 6, 2008 @ 03:32:25
Author: tpowa
Path: /home/cvs-extra/extra/network/slmodem
Modified: PKGBUILD (1.54 -> 1.55)
Removed: 2.6.16.patch (1.3) 2.6.18-devfs.patch (1.3)
2.6.18-utsrelease.patch (1.3) kernel-2.6.19.patch (1.2)
'upgpkg: update to new version'
-------------------------+
2.6.16.patch | 18 ---------------
2.6.18-devfs.patch | 54 ----------------------------------------------
2.6.18-utsrelease.patch | 11 ---------
PKGBUILD | 19 +++++++---------
kernel-2.6.19.patch | 20 -----------------
5 files changed, 9 insertions(+), 113 deletions(-)
Index: extra/network/slmodem/2.6.16.patch
diff -u extra/network/slmodem/2.6.16.patch:1.3 extra/network/slmodem/2.6.16.patch:removed
--- extra/network/slmodem/2.6.16.patch:1.3 Sat Feb 17 17:58:58 2007
+++ extra/network/slmodem/2.6.16.patch Thu Mar 6 03:32:25 2008
@@ -1,18 +0,0 @@
---- st7554.c~ 2005-11-01 16:31:45.000000000 +0100
-+++ st7554.c 2006-03-12 14:57:35.000000000 +0100
-@@ -982,7 +982,6 @@
-
-
- static struct file_operations st7554_fops = {
-- .owner = THIS_MODULE,
- .llseek = no_llseek,
- .read = st7554_read,
- .write = st7554_write,
-@@ -1150,7 +1149,6 @@
- MODULE_DEVICE_TABLE (usb, st7554_ids);
-
- static struct usb_driver st7554_usb_driver = {
-- .owner = THIS_MODULE,
- .name = "ST7554 USB Modem",
- .probe = st7554_probe,
- .disconnect = st7554_disconnect,
Index: extra/network/slmodem/2.6.18-devfs.patch
diff -u extra/network/slmodem/2.6.18-devfs.patch:1.3 extra/network/slmodem/2.6.18-devfs.patch:removed
--- extra/network/slmodem/2.6.18-devfs.patch:1.3 Sat Feb 17 17:58:58 2007
+++ extra/network/slmodem/2.6.18-devfs.patch Thu Mar 6 03:32:26 2008
@@ -1,54 +0,0 @@
---- drivers/amrmo_init.c~ 2006-07-07 11:58:31.000000000 +0200
-+++ drivers/amrmo_init.c 2006-07-07 12:00:13.000000000 +0200
-@@ -641,7 +641,6 @@
- #endif
- #else
- class_simple_device_add(amrmo_class, MKDEV(AMRMO_MAJOR, i), NULL, "slamr%d", i);
-- devfs_mk_cdev(MKDEV(AMRMO_MAJOR,i), S_IFCHR|S_IRUSR|S_IWUSR, "slamr%d", i);
- #endif
- return 0;
-
-@@ -673,7 +672,6 @@
- #endif
- #else
- class_simple_device_remove(MKDEV(AMRMO_MAJOR, amrmo->num));
-- devfs_remove("slamr%d", amrmo->num);
- #endif
- amrmo_table[amrmo->num] = NULL;
- amrmo_card_disable(amrmo->card);
---- drivers/amrmo_init.c~ 2006-07-07 12:02:49.000000000 +0200
-+++ drivers/amrmo_init.c 2006-07-07 12:03:11.000000000 +0200
-@@ -53,7 +53,6 @@
- #include <linux/poll.h>
- #include <linux/fs.h>
- #include <asm/uaccess.h>
--#include <linux/devfs_fs_kernel.h>
-
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
- #define OLD_KERNEL 1
---- drivers/st7554.c~ 2006-07-07 12:03:36.000000000 +0200
-+++ drivers/st7554.c 2006-07-07 12:04:32.000000000 +0200
-@@ -55,7 +55,6 @@
- #include <linux/poll.h>
- #include <linux/usb.h>
- #include <linux/device.h>
--#include <linux/devfs_fs_kernel.h>
-
- #include <modem_defs.h>
-
-@@ -1281,7 +1280,6 @@
-
- usb_set_intfdata(interface, s );
- class_simple_device_add(st7554_class, MKDEV(243, i), NULL, "slusb%d", i);
-- devfs_mk_cdev(MKDEV(243,i),S_IFCHR|S_IRUSR|S_IWUSR,"slusb%d",i);
-
- USB_INFO(KERN_INFO "slusb: slusb%d is found.\n", s->minor);
-
-@@ -1310,7 +1308,6 @@
- }
-
- class_simple_device_remove(MKDEV(243, s->minor));
-- devfs_remove("slusb%d",s->minor);
-
- st7554_stop(s);
- down(&open_sem);
Index: extra/network/slmodem/2.6.18-utsrelease.patch
diff -u extra/network/slmodem/2.6.18-utsrelease.patch:1.3 extra/network/slmodem/2.6.18-utsrelease.patch:removed
--- extra/network/slmodem/2.6.18-utsrelease.patch:1.3 Sat Feb 17 17:58:58 2007
+++ extra/network/slmodem/2.6.18-utsrelease.patch Thu Mar 6 03:32:26 2008
@@ -1,11 +0,0 @@
---- drivers/kernel-ver.c~ 2003-09-23 19:38:40.000000000 +0200
-+++ drivers/kernel-ver.c 2006-07-07 11:56:55.000000000 +0200
-@@ -4,7 +4,7 @@
- */
-
- #include <stdio.h>
--#include <linux/version.h>
-+#include <linux/utsrelease.h>
-
- int main()
- {
Index: extra/network/slmodem/PKGBUILD
diff -u extra/network/slmodem/PKGBUILD:1.54 extra/network/slmodem/PKGBUILD:1.55
--- extra/network/slmodem/PKGBUILD:1.54 Fri Jan 25 12:46:21 2008
+++ extra/network/slmodem/PKGBUILD Thu Mar 6 03:32:25 2008
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.54 2008/01/25 17:46:21 tpowa Exp $
+# $Id: PKGBUILD,v 1.55 2008/03/06 08:32:25 tpowa Exp $
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
@@ -6,7 +6,7 @@
pkgname=slmodem
pkgver=2.9.11
-pkgrel=38
+pkgrel=39
pkgdesc="Drivers for the Smartlink winmodems. For stock arch 2.6 kernel "
arch=(i686)
@@ -14,15 +14,15 @@
url="http://linmodems.technion.ac.il/packages/smartlink/"
depends=('kernel26>=2.6.24-1' 'kernel26<=2.6.25-0' 'slmodem-utils')
install=slmodem.install
-source=(http://linmodems.technion.ac.il/packages/smartlink/slmodem-2.9.11-20070505.tar.gz \
- http://linmodems.technion.ac.il/packages/smartlink/ungrab-winmodem-20070505.tar.gz kernel-2.6.21.patch
+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)
build() {
- cd $startdir/src/ungrab-winmodem-20070505
+ cd $startdir/src/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-20070505
+ cd $startdir/src/$pkgname-$pkgver-20080126
patch -Np0 -i ../kernel-2.6.24.patch || return 1
make KERNEL_DIR=/lib/modules/${_kernver}/build SUPPORT_ALSA=1 DESTDIR=$startdir/pkg drivers || return 1
# Install kernel modules
@@ -30,7 +30,6 @@
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=('150c089024501e93e640c898aba2debf'
- '748bfc7387006293f9eddde119fa9d6f'
- 'f21346b0b75747e319b53f162c255bfc')
+md5sums=('8670dd7e1e1a46296ac4c80f7ac0471d'
+ '25244ef3924566866f4fae2feca78218'
+ '5a5e313a5040fcff7bf11c33f008e61e')
Index: extra/network/slmodem/kernel-2.6.19.patch
diff -u extra/network/slmodem/kernel-2.6.19.patch:1.2 extra/network/slmodem/kernel-2.6.19.patch:removed
--- extra/network/slmodem/kernel-2.6.19.patch:1.2 Thu Jan 11 15:14:22 2007
+++ extra/network/slmodem/kernel-2.6.19.patch Thu Mar 6 03:32:26 2008
@@ -1,20 +0,0 @@
---- ungrab-winmodem/ungrab-winmodem.c~ 2005-10-09 22:54:03.000000000 +0200
-+++ ungrab-winmodem/ungrab-winmodem.c 2006-10-17 19:07:57.000000000 +0200
-@@ -11,7 +11,6 @@
- *
- */
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/version.h>
- #include <linux/init.h>
---- slmodem-2.9.11-20061021/drivers/amrmo_init.c~ 2006-10-17 19:08:16.000000000 +0200
-+++ slmodem-2.9.11-20061021/drivers/amrmo_init.c 2006-10-17 19:08:27.000000000 +0200
-@@ -43,7 +43,6 @@
-
- /*****************************************************************************/
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/version.h>
- #include <linux/init.h>
More information about the arch-commits
mailing list