[arch-commits] Commit in fcpcmcia/trunk (3 files)
Tobias Powalowski
tpowa at archlinux.org
Fri Dec 26 23:19:08 UTC 2008
Date: Friday, December 26, 2008 @ 18:19:08
Author: tpowa
Revision: 22524
upgpkg: fcpcmcia 31107-44
Added:
fcpcmcia/trunk/kernel-2.6.28.patch
Modified:
fcpcmcia/trunk/PKGBUILD
fcpcmcia/trunk/fcpcmcia.install
---------------------+
PKGBUILD | 40 +++++++++++------
fcpcmcia.install | 4 -
kernel-2.6.28.patch | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 144 insertions(+), 16 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-12-26 23:05:22 UTC (rev 22523)
+++ PKGBUILD 2008-12-26 23:19:08 UTC (rev 22524)
@@ -3,15 +3,15 @@
pkgname=fcpcmcia
pkgver=31107
-pkgrel=43
-_kernver=2.6.27-ARCH
+pkgrel=44
+_kernver=2.6.28-ARCH
pkgdesc="AVM ISDN driver for FRITZ PCMCIA isdn cards. For stock arch 2.6 kernel"
arch=(i686 x86_64)
license=('custom:"AVM"' 'LPGL')
url="http://www.avm.de"
-depends=('capi4k-utils' 'kernel26>=2.6.27' 'kernel26<2.6.28')
+depends=('capi4k-utils' 'kernel26>=2.6.28' 'kernel26<2.6.29')
if [ "$CARCH" = "i686" ]; then source=(ftp://ftp.avm.de/cardware/fritzcrd.pcm/linux/suse.93/fcpcmcia-suse93-3.11-07.tar.gz
- pcmcia-2.6.17.patch atomic.patch kernel-2.6.19.patch kernel-2.6.20.patch kernel-2.6.22.patch kernel-2.6.24.patch kernel-2.6.27.patch)
+ pcmcia-2.6.17.patch atomic.patch kernel-2.6.19.patch kernel-2.6.20.patch kernel-2.6.22.patch kernel-2.6.24.patch kernel-2.6.27.patch kernel-2.6.28.patch)
md5sums=('96fc3e72afdc2087b4dafe41c069ec18'
'ec21dee3a5a09203dc55b399c29bc58c'
'258b13bb2ac46960b9c91635f02cd080'
@@ -19,10 +19,11 @@
'890ec6e1219a3a4bae77f5815c3ed40d'
'4f4f03630ed994b16b4cd167f090a116'
'21bfa466b1fb94663ed1f265948dba5e'
- 'e32439084b62ee7975ae45a443b6eba9')
+ 'e32439084b62ee7975ae45a443b6eba9'
+ 'e953a90fe3d08ebbd8736f66902414dc)
fi
if [ "$CARCH" = "x86_64" ]; then source=(ftp://ftp.avm.de/cardware/fritzcrd.pcm/linux_64bit/suse.10.0/fcpcmcia-suse10.0-64bit-3.11-07.tar.gz
- pcmcia-2.6.17.patch atomic.patch kernel-2.6.19.patch kernel-2.6.20.patch kernel-2.6.22.patch kernel-2.6.24.patch kernel-2.6.27.patch)
+ pcmcia-2.6.17.patch atomic.patch kernel-2.6.19.patch kernel-2.6.20.patch kernel-2.6.22.patch kernel-2.6.24.patch kernel-2.6.27.patch kernel-2.6.28.patch)
md5sums=('4f461710cf57ebf50b3c4f2842288752'
'ec21dee3a5a09203dc55b399c29bc58c'
'258b13bb2ac46960b9c91635f02cd080'
@@ -30,12 +31,13 @@
'890ec6e1219a3a4bae77f5815c3ed40d'
'4f4f03630ed994b16b4cd167f090a116'
'21bfa466b1fb94663ed1f265948dba5e'
- 'e32439084b62ee7975ae45a443b6eba9')
+ 'e32439084b62ee7975ae45a443b6eba9'
+ 'e953a90fe3d08ebbd8736f66902414dc)
fi
install=(fcpcmcia.install)
options=(!makeflags)
build() {
- cd $startdir/src/fritz/src
+ cd $srcdir/fritz/src
[ "$CARCH" = "i686" ] && (patch -Np0 -i ../../atomic.patch || return 1)
patch -Np0 -i ../../pcmcia-2.6.17.patch || return 1
patch -Np0 -i ../../kernel-2.6.19.patch || return 1
@@ -43,6 +45,7 @@
patch -Np0 -i ../../kernel-2.6.22.patch || return 1
patch -Np0 -i ../../kernel-2.6.24.patch || return 1
patch -Np2 -i ../../kernel-2.6.27.patch || return 1
+ patch -Np1 -i ../../kernel-2.6.28.patch || return 1
cd ..
# fix from Karsten Keil <kkeil at suse.de>
@@ -62,12 +65,21 @@
-L strncpy \
$i.old $i
done
- cd $startdir/src/fritz
- make KDIR=/lib/modules/${_kernver}/build LIBDIR=$startdir/pkg/var/lib/fritz all || return 1
- mkdir -p $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/isdn/hardware/avm/
- cp $startdir/src/fritz/src/fcpcmcia.ko $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/isdn/hardware/avm/
- cp $startdir/src/fritz/src/fcpcmcia_cs.ko $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/isdn/hardware/avm/
- rm -r $startdir/pkg/var/lib/fritz
+ cd $srcdir/fritz
+ make KDIR=/lib/modules/${_kernver}/build LIBDIR=$pkgdir/var/lib/fritz all || return 1
+ mkdir -p $pkgdir/lib/modules/${_kernver}/kernel/drivers/isdn/hardware/avm/
+ cp $srcdir/fritz/src/fcpcmcia.ko $pkgdir/lib/modules/${_kernver}/kernel/drivers/isdn/hardware/avm/
+ cp $srcdir/fritz/src/fcpcmcia_cs.ko $pkgdir/lib/modules/${_kernver}/kernel/drivers/isdn/hardware/avm/
+ rm -r $pkgdir/var/lib/fritz
sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/fcpcmcia.install
}
+md5sums=('4f461710cf57ebf50b3c4f2842288752'
+ 'ec21dee3a5a09203dc55b399c29bc58c'
+ '258b13bb2ac46960b9c91635f02cd080'
+ '5c63dc9df0810bb1ba85f3425abaa0ed'
+ '890ec6e1219a3a4bae77f5815c3ed40d'
+ '4f4f03630ed994b16b4cd167f090a116'
+ '21bfa466b1fb94663ed1f265948dba5e'
+ 'e32439084b62ee7975ae45a443b6eba9'
+ 'e953a90fe3d08ebbd8736f66902414dc')
Modified: fcpcmcia.install
===================================================================
--- fcpcmcia.install 2008-12-26 23:05:22 UTC (rev 22523)
+++ fcpcmcia.install 2008-12-26 23:19:08 UTC (rev 22524)
@@ -9,7 +9,7 @@
sed -i -e 's/#fcpcmcia - - - - - -/fcpcmcia - - - - - -/g' /etc/capi.conf
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.27-ARCH
+ KERNEL_VERSION=2.6.28-ARCH
depmod -v $KERNEL_VERSION > /dev/null 2>&1
}
@@ -24,7 +24,7 @@
sed -i -e 's/fcpcmcia - - - - - -/#fcpcmcia - - - - - -/g' /etc/capi.conf
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.27-ARCH
+ KERNEL_VERSION=2.6.28-ARCH
depmod -v $KERNEL_VERSION > /dev/null 2>&1
}
Added: kernel-2.6.28.patch
===================================================================
--- kernel-2.6.28.patch (rev 0)
+++ kernel-2.6.28.patch 2008-12-26 23:19:08 UTC (rev 22524)
@@ -0,0 +1,116 @@
+--- src/fcpcmcia_cs.c~ 2008-12-26 23:07:01.000000000 +0000
++++ src/fcpcmcia_cs.c 2008-12-26 23:07:01.000000000 +0000
+@@ -236,7 +236,7 @@
+ cisparse_t *parse)
+ {
+ int i = pcmcia_get_tuple_data(handle, tuple);
+- if (i != CS_SUCCESS) return i;
++ if (i != 0) return i;
+ return pcmcia_parse_tuple(handle, tuple, parse);
+ }
+
+@@ -244,7 +244,7 @@
+ cisparse_t *parse)
+ {
+ int i = pcmcia_get_first_tuple(handle, tuple);
+- if (i != CS_SUCCESS) return i;
++ if (i != 0) return i;
+ return get_tuple(handle, tuple, parse);
+ }
+
+@@ -252,7 +252,7 @@
+ cisparse_t *parse)
+ {
+ int i = pcmcia_get_next_tuple(handle, tuple);
+- if (i != CS_SUCCESS) return i;
++ if (i != 0) return i;
+ return get_tuple(handle, tuple, parse);
+ }
+
+@@ -274,17 +274,17 @@
+ do {
+ tuple.DesiredTuple = CISTPL_CONFIG;
+ i = pcmcia_get_first_tuple(link, &tuple);
+- if (i != CS_SUCCESS) break;
++ if (i != 0) break;
+ tuple.TupleData = buf;
+ tuple.TupleDataMax = 64;
+ tuple.TupleOffset = 0;
+ i = pcmcia_get_tuple_data(link, &tuple);
+- if (i != CS_SUCCESS) break;
++ if (i != 0) break;
+ i = pcmcia_parse_tuple(link, &tuple, &parse);
+- if (i != CS_SUCCESS) break;
++ if (i != 0) break;
+ link->conf.ConfigBase = parse.config.base;
+ } while (0);
+- if (i != CS_SUCCESS) {
++ if (i != 0) {
+ cs_error(link, ParseTuple, i);
+ return -ENODEV;
+ }
+@@ -310,7 +310,7 @@
+ tuple.Attributes = 0;
+ tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+ i = first_tuple(link, &tuple, &parse);
+- while (i == CS_SUCCESS) {
++ while (i == 0) {
+ if (cf->io.nwin > 0) {
+ link->conf.ConfigIndex = cf->index;
+ link->io.BasePort1 = cf->io.win[0].base;
+@@ -320,13 +320,13 @@
+ link->io.BasePort1,
+ link->io.BasePort1+link->io.NumPorts1-1);
+ i = pcmcia_request_io(link, &link->io);
+- if (i == CS_SUCCESS) goto found_port;
++ if (i == 0) goto found_port;
+ }
+ i = next_tuple(link, &tuple, &parse);
+ }
+
+ found_port:
+- if (i != CS_SUCCESS) {
++ if (i != 0) {
+ cs_error(link, RequestIO, i);
+ break;
+ }
+@@ -335,7 +335,7 @@
+ * allocate an interrupt line
+ */
+ i = pcmcia_request_irq(link, &link->irq);
+- if (i != CS_SUCCESS) {
++ if (i != 0) {
+ cs_error(link, RequestIRQ, i);
+ /* undo */
+ pcmcia_disable_device(link);
+@@ -346,7 +346,7 @@
+ * configure the PCMCIA socket
+ */
+ i = pcmcia_request_configuration(link, &link->conf);
+- if (i != CS_SUCCESS) {
++ if (i != 0) {
+ cs_error(link, RequestConfiguration, i);
+ pcmcia_disable_device(link);
+ break;
+--- src/fcpcmcia_cs.c~ 2008-12-26 23:15:23.000000000 +0000
++++ src/fcpcmcia_cs.c 2008-12-26 23:15:23.000000000 +0000
+@@ -237,7 +237,7 @@
+ {
+ int i = pcmcia_get_tuple_data(handle, tuple);
+ if (i != 0) return i;
+- return pcmcia_parse_tuple(handle, tuple, parse);
++ return pcmcia_parse_tuple(tuple, parse);
+ }
+
+ static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple,
+--- src/fcpcmcia_cs.c~ 2008-12-26 23:18:12.000000000 +0000
++++ src/fcpcmcia_cs.c 2008-12-26 23:18:12.000000000 +0000
+@@ -280,7 +280,7 @@
+ tuple.TupleOffset = 0;
+ i = pcmcia_get_tuple_data(link, &tuple);
+ if (i != 0) break;
+- i = pcmcia_parse_tuple(link, &tuple, &parse);
++ i = pcmcia_parse_tuple(&tuple, &parse);
+ if (i != 0) break;
+ link->conf.ConfigBase = parse.config.base;
+ } while (0);
More information about the arch-commits
mailing list