[arch-commits] CVS update of extra/system/lirc-suspend2 (4 files)
Thomas Baechler
thomas at archlinux.org
Tue May 8 21:57:34 UTC 2007
Date: Tuesday, May 8, 2007 @ 17:57:34
Author: thomas
Path: /home/cvs-extra/extra/system/lirc-suspend2
Added: kernel-2.6.20.patch (1.1)
Modified: PKGBUILD (1.3 -> 1.4) lirc.install (1.2 -> 1.3)
Removed: kernel-2.6.19.patch (1.1)
upgpkg: lirc-suspend2 0.8.1-1
---------------------+
PKGBUILD | 18 +++---
kernel-2.6.19.patch | 148 --------------------------------------------------
kernel-2.6.20.patch | 145 ++++++++++++++++++++++++++++++++++++++++++++++++
lirc.install | 6 +-
4 files changed, 157 insertions(+), 160 deletions(-)
Index: extra/system/lirc-suspend2/PKGBUILD
diff -u extra/system/lirc-suspend2/PKGBUILD:1.3 extra/system/lirc-suspend2/PKGBUILD:1.4
--- extra/system/lirc-suspend2/PKGBUILD:1.3 Sat Dec 2 10:56:13 2006
+++ extra/system/lirc-suspend2/PKGBUILD Tue May 8 17:57:34 2007
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD,v 1.3 2006/12/02 15:56:13 thomas Exp $
+# $Id: PKGBUILD,v 1.4 2007/05/08 21:57:34 thomas Exp $
# Maintainer: Paul Mattal <paul at archlinux.org>
pkgname=lirc-suspend2
-pkgver=0.8.0.20061009
-pkgrel=2
-_kernver=2.6.19-suspend2
+pkgver=0.8.1
+pkgrel=1
+_kernver=2.6.21-suspend2
pkgdesc="Linux Infrared Remote Control kernel modules for kernel26suspend2"
arch=(i686 x86_64)
depends=('lirc-utils' 'kernel26suspend2')
makedepends=(help2man)
-source=(http://gerolde.archlinux.org/~paul/lirc-$pkgver.tar.gz kernel-2.6.19.patch)
-md5sums=('8fdefa0963888a02b05b85947b9f490e' '16e9316d2178aee37c3aa25c57aee20d')
+
+source=(http://umn.dl.sourceforge.net/sourceforge/lirc/lirc-$pkgver.tar.bz2 kernel-2.6.20.patch)
+md5sums=('3a42083fc6c54797351e52c77537c586' '5922c346bbc946a25aa6bdc3f9383308')
url="http://www.lirc.org/"
install=lirc.install
build() {
# configure
- cd $startdir/src/lirc || return 1
- patch -Np1 -i ../kernel-2.6.19.patch || return 1
- ./autogen.sh || return 1
+ cd $startdir/src/lirc-$pkgver || return 1
+ patch -Np0 -i ../kernel-2.6.20.patch || return 1
./configure --enable-sandboxed --prefix=/usr \
--with-driver=all --with-kerneldir=/usr/src/linux-${_kernver} \
--with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \
Index: extra/system/lirc-suspend2/kernel-2.6.19.patch
diff -u extra/system/lirc-suspend2/kernel-2.6.19.patch:1.1 extra/system/lirc-suspend2/kernel-2.6.19.patch:removed
--- extra/system/lirc-suspend2/kernel-2.6.19.patch:1.1 Sat Dec 2 10:56:13 2006
+++ extra/system/lirc-suspend2/kernel-2.6.19.patch Tue May 8 17:57:34 2007
@@ -1,148 +0,0 @@
---- lirc-old/drivers/lirc_dev/lirc_dev.c 2006-07-24 01:24:35.000000000 +0200
-+++ lirc/drivers/lirc_dev/lirc_dev.c 2006-10-17 18:22:24.000000000 +0200
-@@ -32,7 +32,6 @@
- #error "**********************************************************"
- #endif
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/sched.h>
---- lirc-old/drivers/lirc_sir/lirc_sir.c 2006-01-21 18:43:36.000000000 +0100
-+++ lirc/drivers/lirc_sir/lirc_sir.c 2006-10-17 18:22:24.000000000 +0200
-@@ -46,7 +46,6 @@
- # include <config.h>
- #endif
-
--#include <linux/config.h>
-
- #if !defined(LIRC_ON_SA1100) && !defined(CONFIG_SERIAL_MODULE)
- #warning "******************************************"
---- lirc-old/drivers/lirc_serial/lirc_serial.c 2006-01-21 18:43:36.000000000 +0100
-+++ lirc/drivers/lirc_serial/lirc_serial.c 2006-10-17 18:22:24.000000000 +0200
-@@ -61,7 +61,6 @@
- #error "**********************************************************"
- #endif
-
--#include <linux/config.h>
-
- #if defined(CONFIG_SERIAL) || defined(CONFIG_SERIAL_8250)
- #warning "******************************************"
---- lirc-old/drivers/lirc_bt829/lirc_bt829.c 2005-11-27 12:03:01.000000000 +0100
-+++ lirc/drivers/lirc_bt829/lirc_bt829.c 2006-10-17 18:22:24.000000000 +0200
-@@ -23,7 +23,6 @@
- #error "This driver needs kernel version 2.4.0 or higher"
- #endif
-
--#include <linux/config.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/threads.h>
---- lirc-old/drivers/lirc_cmdir/lirc_cmdir.c 2005-09-25 14:03:39.000000000 +0200
-+++ lirc/drivers/lirc_cmdir/lirc_cmdir.c 2006-10-17 18:22:24.000000000 +0200
-@@ -35,7 +35,6 @@
- #error "**********************************************************"
- #endif
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/errno.h>
- #include <linux/signal.h>
---- lirc-old/drivers/lirc_sasem/lirc_sasem.c 2006-07-24 01:24:35.000000000 +0200
-+++ lirc/drivers/lirc_sasem/lirc_sasem.c 2006-10-17 18:22:24.000000000 +0200
-@@ -58,7 +58,6 @@
- #error "*** Sorry, this driver requires kernel version 2.4.22 or higher"
- #endif
-
--#include <linux/config.h>
-
- #include <linux/errno.h>
- #include <linux/init.h>
---- lirc-old/drivers/lirc_igorplugusb/lirc_igorplugusb.c 2006-03-04 23:36:38.000000000 +0100
-+++ lirc/drivers/lirc_igorplugusb/lirc_igorplugusb.c 2006-10-17 18:22:24.000000000 +0200
-@@ -47,7 +47,6 @@
- #error "*******************************************************"
- #endif
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/kmod.h>
---- lirc-old/drivers/lirc_imon/lirc_imon.c 2006-07-24 01:24:35.000000000 +0200
-+++ lirc/drivers/lirc_imon/lirc_imon.c 2006-10-17 18:22:24.000000000 +0200
-@@ -49,7 +49,6 @@
- #error "*** Sorry, this driver requires kernel version 2.4.22 or higher"
- #endif
-
--#include <linux/config.h>
-
- #include <linux/errno.h>
- #include <linux/init.h>
---- lirc-old/drivers/lirc_it87/lirc_it87.c 2006-01-21 18:43:36.000000000 +0100
-+++ lirc/drivers/lirc_it87/lirc_it87.c 2006-10-17 18:22:25.000000000 +0200
-@@ -38,7 +38,6 @@
- # include <config.h>
- #endif
-
--#include <linux/config.h>
-
-
- #include <linux/sched.h>
---- lirc-old/drivers/lirc_streamzap/lirc_streamzap.c 2006-03-04 23:36:39.000000000 +0100
-+++ lirc/drivers/lirc_streamzap/lirc_streamzap.c 2006-10-17 18:22:25.000000000 +0200
-@@ -38,7 +38,6 @@
- #error "*******************************************************"
- #endif
-
--#include <linux/config.h>
- #include <linux/kernel.h>
- #include <linux/errno.h>
- #include <linux/init.h>
---- lirc-old/drivers/lirc_mceusb2/lirc_mceusb2.c 2006-07-25 14:56:30.000000000 +0200
-+++ lirc/drivers/lirc_mceusb2/lirc_mceusb2.c 2006-10-17 18:22:25.000000000 +0200
-@@ -37,7 +37,6 @@
- #error "*******************************************************"
- #endif
-
--#include <linux/config.h>
-
- #include <linux/kernel.h>
- #include <linux/errno.h>
---- lirc-old/drivers/lirc_atiusb/lirc_atiusb.c 2006-03-04 23:36:38.000000000 +0100
-+++ lirc/drivers/lirc_atiusb/lirc_atiusb.c 2006-10-17 18:22:25.000000000 +0200
-@@ -39,7 +39,6 @@
- #error "*******************************************************"
- #endif
-
--#include <linux/config.h>
-
- #include <linux/kernel.h>
- #include <linux/errno.h>
---- lirc-old/drivers/lirc_parallel/lirc_parallel.c 2005-09-22 22:10:37.000000000 +0200
-+++ lirc/drivers/lirc_parallel/lirc_parallel.c 2006-10-17 18:22:25.000000000 +0200
-@@ -40,7 +40,6 @@
- #error "**********************************************************"
- #endif
-
--#include <linux/config.h>
-
- #ifdef CONFIG_SMP
- #error "--- Sorry, this driver is not SMP safe. ---"
-@@ -50,7 +49,6 @@
- #include <linux/sched.h>
- #include <linux/errno.h>
- #include <linux/signal.h>
--#include <linux/config.h>
- #include <linux/fs.h>
- #include <linux/kernel.h>
- #include <linux/ioport.h>
---- lirc-old/drivers/lirc_mceusb/lirc_mceusb.c 2006-03-04 23:36:39.000000000 +0100
-+++ lirc/drivers/lirc_mceusb/lirc_mceusb.c 2006-10-17 18:22:25.000000000 +0200
-@@ -88,7 +88,6 @@
- *
- */
-
--#include <linux/config.h>
- #include <linux/kernel.h>
- #include <linux/errno.h>
- #include <linux/init.h>
Index: extra/system/lirc-suspend2/kernel-2.6.20.patch
diff -u /dev/null extra/system/lirc-suspend2/kernel-2.6.20.patch:1.1
--- /dev/null Tue May 8 17:57:34 2007
+++ extra/system/lirc-suspend2/kernel-2.6.20.patch Tue May 8 17:57:34 2007
@@ -0,0 +1,145 @@
+--- drivers/lirc_atiusb/lirc_atiusb.c 2006/10/20 05:03:38 1.55
++++ drivers/lirc_atiusb/lirc_atiusb.c 2007/01/16 08:45:04 1.56
+@@ -251,7 +251,7 @@
+ add_wait_queue(&oep->wait, &wait);
+
+ #ifdef KERNEL_2_5
+- if (usb_submit_urb(oep->urb, SLAB_ATOMIC)) {
++ if (usb_submit_urb(oep->urb, GFP_ATOMIC)) {
+ #else
+ if (usb_submit_urb(oep->urb)) {
+ #endif
+@@ -323,7 +323,7 @@
+ iep->urb->dev = ir->usbdev;
+ dprintk(DRIVER_NAME "[%d]: linking iep 0x%02x (%p)\n", ir->devnum, iep->ep->bEndpointAddress, iep);
+ #ifdef KERNEL_2_5
+- if ((rtn = usb_submit_urb(iep->urb, SLAB_ATOMIC)) < 0) {
++ if ((rtn = usb_submit_urb(iep->urb, GFP_ATOMIC)) < 0) {
+ #else
+ if ((rtn = usb_submit_urb(iep->urb)) < 0) {
+ #endif
+@@ -659,7 +659,7 @@
+
+ /* resubmit urb */
+ #ifdef KERNEL_2_5
+- usb_submit_urb(urb, SLAB_ATOMIC);
++ usb_submit_urb(urb, GFP_ATOMIC);
+ #endif
+ }
+
+@@ -775,7 +775,7 @@
+ iep->len = len;
+
+ #ifdef KERNEL_2_5
+- if ( !(iep->buf = usb_buffer_alloc(dev, len, SLAB_ATOMIC, &iep->dma)) ) {
++ if ( !(iep->buf = usb_buffer_alloc(dev, len, GFP_ATOMIC, &iep->dma)) ) {
+ mem_failure = 2;
+ } else if ( !(iep->urb = usb_alloc_urb(0, GFP_KERNEL)) ) {
+ mem_failure = 3;
+@@ -856,7 +856,7 @@
+ init_waitqueue_head(&oep->wait);
+
+ #ifdef KERNEL_2_5
+- if ( !(oep->buf = usb_buffer_alloc(dev, USB_OUTLEN, SLAB_ATOMIC, &oep->dma)) ) {
++ if ( !(oep->buf = usb_buffer_alloc(dev, USB_OUTLEN, GFP_ATOMIC, &oep->dma)) ) {
+ mem_failure = 2;
+ } else if ( !(oep->urb = usb_alloc_urb(0, GFP_KERNEL)) ) {
+ mem_failure = 3;
+--- drivers/lirc_igorplugusb/lirc_igorplugusb.c 2006/10/20 05:03:38 1.9
++++ drivers/lirc_igorplugusb/lirc_igorplugusb.c 2007/01/16 08:45:04 1.10
+@@ -484,7 +484,7 @@
+ #if defined(KERNEL_2_5)
+ } else if (!(ir->buf_in = usb_buffer_alloc(dev,
+ DEVICE_BUFLEN+DEVICE_HEADERLEN,
+- SLAB_ATOMIC, &ir->dma_in))) {
++ GFP_ATOMIC, &ir->dma_in))) {
+ mem_failure = 5;
+ #else
+ } else if (!(ir->buf_in = kmalloc(
+--- drivers/lirc_mceusb/lirc_mceusb.c 2006/10/20 05:03:38 1.13
++++ drivers/lirc_mceusb/lirc_mceusb.c 2007/01/16 08:45:04 1.14
+@@ -768,7 +768,7 @@
+ dev->bulk_in_endpointAddr = endpoint->bEndpointAddress;
+ #ifdef KERNEL_2_5
+ dev->bulk_in_buffer = usb_buffer_alloc
+- (udev, buffer_size, SLAB_ATOMIC, &dev->dma_in);
++ (udev, buffer_size, GFP_ATOMIC, &dev->dma_in);
+ #else
+ dev->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
+ #endif
+@@ -795,7 +795,7 @@
+ dev->bulk_out_size = buffer_size;
+ dev->bulk_out_endpointAddr = endpoint->bEndpointAddress;
+ #ifdef KERNEL_2_5
+- dev->bulk_out_buffer = usb_buffer_alloc(udev, buffer_size, SLAB_ATOMIC, &dev->dma_out);
++ dev->bulk_out_buffer = usb_buffer_alloc(udev, buffer_size, GFP_ATOMIC, &dev->dma_out);
+ #else
+ dev->bulk_out_buffer = kmalloc (buffer_size, GFP_KERNEL);
+ #endif
+--- drivers/lirc_mceusb2/lirc_mceusb2.c 2007/01/16 06:05:27 1.22
++++ drivers/lirc_mceusb2/lirc_mceusb2.c 2007/01/16 08:45:04 1.23
+@@ -264,7 +264,7 @@
+ async_urb->transfer_buffer_length = size;
+ async_urb->dev = ir->usbdev;
+
+- if ((res=usb_submit_urb(async_urb, SLAB_ATOMIC))) {
++ if ((res=usb_submit_urb(async_urb, GFP_ATOMIC))) {
+ dprintk(DRIVER_NAME "[%d]: receive request FAILED! (res=%d)\n", ir->devnum, res);
+ return;
+ }
+@@ -467,7 +467,7 @@
+ }
+
+ /* resubmit urb */
+- usb_submit_urb(urb, SLAB_ATOMIC);
++ usb_submit_urb(urb, GFP_ATOMIC);
+ }
+
+
+@@ -703,7 +703,7 @@
+ mem_failure = 3;
+ } else if (lirc_buffer_init(rbuf, sizeof(lirc_t), LIRCBUF_SIZE)) {
+ mem_failure = 4;
+- } else if (!(ir->buf_in = usb_buffer_alloc(dev, maxp, SLAB_ATOMIC, &ir->dma_in))) {
++ } else if (!(ir->buf_in = usb_buffer_alloc(dev, maxp, GFP_ATOMIC, &ir->dma_in))) {
+ mem_failure = 5;
+ } else if (!(ir->urb_in = usb_alloc_urb(0, GFP_KERNEL))) {
+ mem_failure = 7;
+--- drivers/lirc_streamzap/lirc_streamzap.c 2006/12/01 04:11:52 1.18
++++ drivers/lirc_streamzap/lirc_streamzap.c 2007/01/16 08:45:04 1.19
+@@ -458,7 +458,7 @@
+
+ #ifdef KERNEL_2_5
+ /* resubmit only for 2.6 */
+- usb_submit_urb( urb, SLAB_ATOMIC );
++ usb_submit_urb( urb, GFP_ATOMIC );
+ #endif
+
+ return;
+@@ -556,7 +556,7 @@
+ sz->buf_in_len = sz->endpoint->wMaxPacketSize;
+ #ifdef KERNEL_2_5
+ if((sz->buf_in = usb_buffer_alloc(sz->udev, sz->buf_in_len,
+- SLAB_ATOMIC, &sz->dma_in)) == NULL )
++ GFP_ATOMIC, &sz->dma_in)) == NULL )
+ {
+ goto error;
+ }
+@@ -715,7 +715,7 @@
+
+ sz->urb_in->dev = sz->udev;
+ #ifdef KERNEL_2_5
+- if (usb_submit_urb(sz->urb_in, SLAB_ATOMIC))
++ if (usb_submit_urb(sz->urb_in, GFP_ATOMIC))
+ #else
+ if (usb_submit_urb(sz->urb_in))
+ #endif
+@@ -866,7 +866,7 @@
+
+ sz->urb_in->dev = sz->udev;
+ #ifdef KERNEL_2_5
+- if (usb_submit_urb(sz->urb_in, SLAB_ATOMIC))
++ if (usb_submit_urb(sz->urb_in, GFP_ATOMIC))
+ #else
+ if (usb_submit_urb(sz->urb_in))
+ #endif
Index: extra/system/lirc-suspend2/lirc.install
diff -u extra/system/lirc-suspend2/lirc.install:1.2 extra/system/lirc-suspend2/lirc.install:1.3
--- extra/system/lirc-suspend2/lirc.install:1.2 Sat Dec 2 10:56:13 2006
+++ extra/system/lirc-suspend2/lirc.install Tue May 8 17:57:34 2007
@@ -10,7 +10,7 @@
post_install() {
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.19-suspend2
+ KERNEL_VERSION=2.6.21-suspend2
depmod -v $KERNEL_VERSION > /dev/null 2>&1
/bin/true
}
@@ -26,7 +26,7 @@
post_upgrade() {
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.19-suspend2
+ KERNEL_VERSION=2.6.21-suspend2
depmod -v $KERNEL_VERSION > /dev/null 2>&1
/bin/true
}
@@ -40,7 +40,7 @@
post_remove() {
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.19-suspend2
+ KERNEL_VERSION=2.6.21-suspend2
depmod -v $KERNEL_VERSION > /dev/null 2>&1
/bin/true
}
More information about the arch-commits
mailing list