[arch-commits] Commit in intel-536ep/repos (6 files)
Tobias Powalowski
tpowa at archlinux.org
Sun Mar 1 17:57:44 UTC 2009
Date: Sunday, March 1, 2009 @ 12:57:44
Author: tpowa
Revision: 28597
Merged revisions 28596 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/intel-536ep/trunk
........
r28596 | tpowa | 2009-03-01 17:54:37 +0000 (So, 01 M?\195?\164r 2009) | 1 line
upgpkg: intel-536ep 2.56.76.0-60
........
Modified:
intel-536ep/repos/extra-i686/ (properties)
intel-536ep/repos/extra-i686/PKGBUILD
Deleted:
intel-536ep/repos/extra-i686/intel-536EP.rc.d
intel-536ep/repos/extra-i686/kernel-2.6.26.patch
intel-536ep/repos/extra-i686/kernel-2.6.27.patch
intel-536ep/repos/extra-i686/kernel-2.6.28.patch
---------------------+
PKGBUILD | 17 ++--------
intel-536EP.rc.d | 35 ---------------------
kernel-2.6.26.patch | 80 --------------------------------------------------
kernel-2.6.27.patch | 36 ----------------------
kernel-2.6.28.patch | 11 ------
5 files changed, 4 insertions(+), 175 deletions(-)
Property changes on: intel-536ep/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /intel-536ep/trunk:1-22531
+ /intel-536ep/trunk:1-28596
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-03-01 17:54:37 UTC (rev 28596)
+++ extra-i686/PKGBUILD 2009-03-01 17:57:44 UTC (rev 28597)
@@ -4,24 +4,18 @@
pkgname=intel-536ep
name=intel-536EP
pkgver=2.56.76.0
-pkgrel=59
+pkgrel=60
_kernver=2.6.28-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.28-1' 'kernel26<2.6.29')
-source=(http://linmodems.technion.ac.il/packages/intel/Philippe.Vouters/intel-536EP-2.56.76.0_2008_03_22.tar.bz2
- kernel-2.6.26.patch
- kernel-2.6.27.patch
- kernel-2.6.28.patch)
+source=(http://linmodems.technion.ac.il/packages/intel/Philippe.Vouters/intel-536EP-2.56.76.0_2009_02_08.tar.bz2)
install=intel-536EP.install
build() {
cd $startdir/src/intel-536EP-2.56.76.0
- patch -Np1 -i ../kernel-2.6.26.patch || return 1
- patch -Np1 -i ../kernel-2.6.27.patch || return 1
- patch -Np0 -i ../kernel-2.6.28.patch || return 1
# fix makefile
sed -i -e "s/\`uname -r\`/${_kernver}/g" makefile
sed -i -e "s/\`uname -r\`/${_kernver}/g" config_check
@@ -29,8 +23,5 @@
#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=('4813466b1c96a4e34a32a4115ca67d82'
- '5689d2005f7bd13da40bdb075af16fb2'
- '73c6669953dafdb6456409de4ae3cb89'
- 'b7814a775985b457e9383ca0578bd56a')
+}
+md5sums=('2c429c3ec7eab83a756dbdc611172474')
Deleted: extra-i686/intel-536EP.rc.d
===================================================================
--- extra-i686/intel-536EP.rc.d 2009-03-01 17:54:37 UTC (rev 28596)
+++ extra-i686/intel-536EP.rc.d 2009-03-01 17:57:44 UTC (rev 28597)
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Loading Intel Modem Driver"
- hamregistry &
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon intel-536EP
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Intel Modem Driver"
- killall -9 hamregistry
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon intel-536EP
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "Usage $0 {start|stop|restart}"
- ;;
-esac
\ No newline at end of file
Deleted: extra-i686/kernel-2.6.26.patch
===================================================================
--- extra-i686/kernel-2.6.26.patch 2009-03-01 17:54:37 UTC (rev 28596)
+++ extra-i686/kernel-2.6.26.patch 2009-03-01 17:57:44 UTC (rev 28597)
@@ -1,80 +0,0 @@
-diff -ruN intel-536EP-2.56.76.0/coredrv/coredrv.c intel-536EP-2.56.76.0.patched/coredrv/coredrv.c
---- intel-536EP-2.56.76.0/coredrv/coredrv.c 2007-02-23 09:49:06.000000000 +0100
-+++ intel-536EP-2.56.76.0.patched/coredrv/coredrv.c 2008-08-05 11:26:09.000000000 +0200
-@@ -740,7 +740,7 @@
-
- int create_hamproc(void)
- {
-- hamproc = create_proc_entry("ham", S_IFREG | S_IRUGO, &proc_root);
-+ hamproc = create_proc_entry("ham", S_IFREG | S_IRUGO, NULL);
- if(hamproc == NULL) return -ENOMEM;
- hamproc->read_proc = hamproc_read;
- hamproc->write_proc = hamproc_write;
-@@ -748,7 +748,7 @@
- }
- void detach_hamproc(void)
- {
-- remove_proc_entry("ham", &proc_root);
-+ remove_proc_entry("ham", NULL);
- }
-
-
-diff -ruN intel-536EP-2.56.76.0/coredrv/softserial.c intel-536EP-2.56.76.0.patched/coredrv/softserial.c
---- intel-536EP-2.56.76.0/coredrv/softserial.c 2007-02-23 10:04:22.000000000 +0100
-+++ intel-536EP-2.56.76.0.patched/coredrv/softserial.c 2008-08-05 11:37:22.000000000 +0200
-@@ -119,6 +119,7 @@
- G.softserial_tty_driver.termios = softserial_termios;
- G.softserial_tty_driver.termios_locked = softserial_termios_locked;
- G.softserial_tty_driver.init_termios = tty_std_termios;
-+
- //TODO verify unknown flags
- //all already set except clocal, dont know what clocal stands for
- G.softserial_tty_driver.init_termios.c_cflag = B115200 |\
-@@ -128,25 +129,28 @@
- CLOCAL;
- G.softserial_tty_driver.magic = TTY_DRIVER_MAGIC;
-
-- G.softserial_tty_driver.open = softserial_open;
-- G.softserial_tty_driver.close = softserial_close;
-- G.softserial_tty_driver.write = softserial_write;
-- G.softserial_tty_driver.put_char = softserial_put_char;
-- G.softserial_tty_driver.flush_chars = softserial_flush_chars;
-- G.softserial_tty_driver.write_room = softserial_write_room;
-- G.softserial_tty_driver.chars_in_buffer = softserial_chars_in_buffer;
-- G.softserial_tty_driver.flush_buffer = softserial_flush_buffer;
-- G.softserial_tty_driver.ioctl = softserial_ioctl;
-- G.softserial_tty_driver.throttle = softserial_throttle;
-- G.softserial_tty_driver.unthrottle = softserial_unthrottle;
-- G.softserial_tty_driver.send_xchar = softserial_send_xchar;
-- G.softserial_tty_driver.set_termios = softserial_set_termios;
-- G.softserial_tty_driver.stop = softserial_stop;
-- G.softserial_tty_driver.start = softserial_start;
-- G.softserial_tty_driver.hangup = softserial_hangup;
-- G.softserial_tty_driver.break_ctl = softserial_break;
-- G.softserial_tty_driver.wait_until_sent = softserial_wait_until_sent;
-- G.softserial_tty_driver.set_ldisc = softserial_set_ldisc;
-+ static struct tty_operations ops = {
-+ .open = softserial_open,
-+ .close = softserial_close,
-+ .write = softserial_write,
-+ .put_char = softserial_put_char,
-+ .flush_chars = softserial_flush_chars,
-+ .write_room = softserial_write_room,
-+ .chars_in_buffer = softserial_chars_in_buffer,
-+ .flush_buffer = softserial_flush_buffer,
-+ .ioctl = softserial_ioctl,
-+ .throttle = softserial_throttle,
-+ .unthrottle = softserial_unthrottle,
-+ .send_xchar = softserial_send_xchar,
-+ .set_termios = softserial_set_termios,
-+ .stop = softserial_stop,
-+ .start = softserial_start,
-+ .hangup = softserial_hangup,
-+ .break_ctl = softserial_break,
-+ .wait_until_sent = softserial_wait_until_sent,
-+ .set_ldisc = softserial_set_ldisc,
-+ };
-+ tty_set_operations(&(G.softserial_tty_driver), &ops);
- rc = tty_register_driver(&(G.softserial_tty_driver));
- if(rc)
- {
Deleted: extra-i686/kernel-2.6.27.patch
===================================================================
--- extra-i686/kernel-2.6.27.patch 2009-03-01 17:54:37 UTC (rev 28596)
+++ extra-i686/kernel-2.6.27.patch 2009-03-01 17:57:44 UTC (rev 28597)
@@ -1,36 +0,0 @@
---- intel-536EP-2.56.76.0/coredrv/locks.c~ 2008-10-11 13:22:47.000000000 +0000
-+++ intel-536EP-2.56.76.0/coredrv/locks.c 2008-10-11 13:22:47.000000000 +0000
-@@ -43,7 +43,7 @@
- #include<linux/interrupt.h>
- #include<linux/irq.h>
- #include<linux/spinlock.h>
--#include<asm/semaphore.h>
-+#include<linux/semaphore.h>
- #define LOCK_DEFINED
- #include"lock_lin.h"
-
---- intel-536EP-2.56.76.0/coredrv/softserial.c~ 2008-10-11 14:29:23.000000000 +0000
-+++ intel-536EP-2.56.76.0/coredrv/softserial.c 2008-10-11 14:29:23.000000000 +0000
-@@ -341,21 +341,7 @@
-
- ptty = p_async_struct->tty;
-
-- if(test_and_clear_bit(RS_EVENT_WRITE_WAKEUP, &p_async_struct->event))
-- {
-- if( (ptty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
-- (ptty->ldisc.write_wakeup != NULL))
-- {
--#if defined (DEBUG_LINUX)
-- printk("ss_bg_eh:ldisc wakeup\n");
--#endif
-- (ptty->ldisc.write_wakeup)(ptty);
-- }
--#if defined (DEBUG_LINUX)
-- printk("ss_bg_eh: wakeup write_wait\n");
--#endif
-- wake_up_interruptible(&ptty->write_wait);
-- }
-+ tty_wakeup(ptty);
- }
-
- //=============================================================================
Deleted: extra-i686/kernel-2.6.28.patch
===================================================================
--- extra-i686/kernel-2.6.28.patch 2009-03-01 17:54:37 UTC (rev 28596)
+++ extra-i686/kernel-2.6.28.patch 2009-03-01 17:57:44 UTC (rev 28597)
@@ -1,11 +0,0 @@
---- coredrv/softserial_ioctl.c~ 2008-12-26 23:35:56.000000000 +0000
-+++ coredrv/softserial_ioctl.c 2008-12-26 23:35:56.000000000 +0000
-@@ -109,7 +109,7 @@
- case TIOCGSOFTCAR:
- case TIOCSSOFTCAR:
- // return (-ENOIOCTLCMD);
-- return(n_tty_ioctl(ptty,pfile,ioctl,ioctl_parameter));
-+ return(n_tty_ioctl_helper(ptty,pfile,ioctl,ioctl_parameter));
- //CASES FOR ONLY 2.1 KERNEL, IGNORE, RETURN AS DEFALUT
- case TCSBRK:
- case TCSBRKP:
More information about the arch-commits
mailing list