Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2624.git;a=commitdiff;h=de1016690aca8926a919d2f86399ec5d283e6465
commit de1016690aca8926a919d2f86399ec5d283e6465
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Mon Jan 28 15:08:09 2008 +0100
acx100-20071003-7-i686
update to newer svn snapshot and add kernel-2.6.24.patch to build with
kernel-2.6.24
diff --git a/source/network-extra/acx100/FrugalBuild
b/source/network-extra/acx100/FrugalBuild
index 9ee0d10..a8dd384 100644
--- a/source/network-extra/acx100/FrugalBuild
+++ b/source/network-extra/acx100/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=acx100
origname=acx-mac80211
pkgver=20071003
-pkgrel=6
+pkgrel=7
pkgdesc="The ACX100/ACX111 wireless network driver."
_F_sourceforge_ext=".tar.bz2"
_F_sourceforge_dirname=${pkgname}
@@ -15,9 +15,9 @@ groups=('network-extra')
archs=('i686' 'x86_64')
_F_archive_name=${origname}
up2date="lynx -dump http://acx100.sourceforge.net/wiki/Main_Page |Flasttarbz2"
-source=([EMAIL PROTECTED] enable_pci_usb.diff \
- http://195.66.192.167/linux/acx_patches/fw.tar.bz2 \
-
http://195.66.192.167/linux/acx_patches/acx_fw/acx100usb_dlink_dwl120+/fw1/ACX100_USB.bin)
+source=([EMAIL PROTECTED] \
+
http://ftp.frugalware.org/pub/other/sources/$pkgname/{fw.tar.bz2,ACX100_USB.bin,svn-20071112.patch}
\
+ kernel-2.6.24.patch)
build() {
# no Fcheckkernel, crosscompilation verified
@@ -25,7 +25,7 @@ build() {
Fpatchall
make -C $_F_kernelmod_dir/build M=`pwd` CONFIG_ACX_MAC80211=m
CONFIG_ACX_MAC80211_PCI=y CONFIG_ACX_MAC80211_USB=y || Fdie
Fmkdir $_F_kernelmod_dir/net
- Ffilerel $_F_kernelmod_dir/net/${origname}.ko
+ Ffilerel $_F_kernelmod_dir/net/acx.ko
Ffile /lib/firmware/ACX100_USB.bin
Ffile fw/acx111_1.2.1.34/tiacx111 /lib/firmware
Ffile fw/acx111_2.3.1.31/* /lib/firmware
@@ -40,6 +40,7 @@ build() {
# optimalization OK - uses the kernel's option
sha1sums=('5e62f70cd84c6c0ecb78358585e7e44901d2ce30' \
- 'fb00fa540e2eb43246cca48817fb03c80310771f' \
'5b5ef1a9d6441f5f8345e1957cd7686e730897f6' \
- '6446b0736b6b08e6dc25620f7584e4f7a1a11cb4')
+ '6446b0736b6b08e6dc25620f7584e4f7a1a11cb4' \
+ 'eb3a1ceb2e204a7dc80eb4802a2f1628c212d61f' \
+ 'e3e96ee12a564ba033f4def6760b2a975b273765')
diff --git a/source/network-extra/acx100/enable_pci_usb.diff
b/source/network-extra/acx100/enable_pci_usb.diff
deleted file mode 100644
index 2835c4c..0000000
--- a/source/network-extra/acx100/enable_pci_usb.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur acx-mac80211-20071003/acx_config.h
fw_acx-mac80211-20071003/acx_config.h
---- acx-mac80211-20071003/acx_config.h 2007-10-03 17:42:39.000000000 +0200
-+++ fw_acx-mac80211-20071003/acx_config.h 2007-11-01 20:06:21.000000000
+0100
-@@ -1,6 +1,6 @@
- /* temporary hack until proper Kconfig integration */
--//#define CONFIG_ACX_MAC80211_PCI 1
--//#define CONFIG_ACX_MAC80211_USB 1
-+#define CONFIG_ACX_MAC80211_PCI 1
-+#define CONFIG_ACX_MAC80211_USB 1
-
- #define ACX_RELEASE "v0.3.36-mac80211"
-
diff --git a/source/network-extra/acx100/kernel-2.6.24.patch
b/source/network-extra/acx100/kernel-2.6.24.patch
new file mode 100644
index 0000000..4e70628
--- /dev/null
+++ b/source/network-extra/acx100/kernel-2.6.24.patch
@@ -0,0 +1,21 @@
+--- pci.c
++++ pci.c 2007/11/11 23:41:12
+@@ -2116,7 +2116,7 @@
+ /* TODO: pci_set_power_state(pdev, PCI_D0); ? */
+
+ /* request shared IRQ handler */
+- if (request_irq(ndev->irq, acxpci_i_interrupt, SA_SHIRQ, ndev->name,
ndev)) {
++ if (request_irq(ndev->irq, acxpci_i_interrupt, IRQF_SHARED, ndev->name,
ndev)) {
+ printk("%s: request_irq FAILED\n", ndev->name);
+ result = -EAGAIN;
+ goto done;
+--- usb.c
++++ usb.c 2007/11/11 23:48:50
+@@ -859,7 +859,6 @@
+ ndev->watchdog_timeo = 4 * HZ;
+ #endif
+ ndev->change_mtu = &acx_e_change_mtu;
+- SET_MODULE_OWNER(ndev);
+
+ /* Setup private driver context */
+
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
