update kernel26 drivers

2025-02-03 09:27:13 +08:00 · 2010-11-15 21:12:18 +00:00 · 2010-11-15 21:12:18 +00:00 · c054c5df26
commit c054c5df26
parent 5ed6d58004
7 changed files with 32 additions and 43 deletions
--- a/broadcom-wl/PKGBUILD
+++ b/broadcom-wl/PKGBUILD
@ -4,32 +4,26 @@
 # maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
-# Find the kernel name inside the chroot
-_kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
-
 pkgname=broadcom-wl
-pkgver=5.60.246.2
+pkgver=5.60.246.6
 pkgrel=1
 pkgdesc='Broadcom 802.11abg networking drivers'
 arch=('i686' 'x86_64')
 url='http://www.broadcom.com/support/802.11/linux_sta.php'
 license=('MIXED/Proprietary')
-depends=('kernel26>=2.6.36' 'kernel26<2.6.37')
+depends=('kernel26')
 makedepends=('kernel26-headers')
 [ "$CARCH" = 'x86_64' ] && ARCH=x86-64 \
                        || ARCH=x86-32
 source=("http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${ARCH}_v${pkgver}.tar.gz"
        'license.patch'
        'semaphore.patch')
-[ "$CARCH" = 'x86_64' ] && sha1sums=('6d82434d8087aba9cbea6b46bcf97f14c4e6c1f0'
-                                     '994f58cdec61165313e1386d6c7e88723e6f27bf'
-                                     '1cc0c33199403f881f1a9947669ad0cf83342592') \
-                        || sha1sums=('53d0a3cbc7c7f5b0b75f8da0480a4069dfc66281'
-                                     '994f58cdec61165313e1386d6c7e88723e6f27bf'
-                                     '1cc0c33199403f881f1a9947669ad0cf83342592')
+[ "$CARCH" = 'x86_64' ] && sha1sums=('b4ecb6f82fe0f943d40fb85ef7c34eb16fe0abf2'
+                                     'ac57feff458bd03cd5b43a88fc264fcaa61bd156'
+                                     '50654c42a64c078c022148decdf897d586d3e6e0') \
+                        || sha1sums=('5aa9fd0707b1e597c5e0b78866a65d4bca687a0c'
+                                     'ac57feff458bd03cd5b43a88fc264fcaa61bd156'
+                                     '50654c42a64c078c022148decdf897d586d3e6e0')

 install=install

@ -37,10 +31,10 @@ build() {
 	cd "$srcdir"
 	patch -p1 < license.patch
 	patch -p1 < semaphore.patch
-	KBUILD_NOPEDANTIC=1 make -C /lib/modules/${_kernver}/build M=`pwd` || return 1
+	KBUILD_NOPEDANTIC=1 make -C /lib/modules/`uname -r`/build M=`pwd`
 }

 package() {
 	cd "$srcdir"
-	install -D -m 755 wl.ko ${pkgdir}/lib/modules/${_kernver}/kernel/drivers/net/wireless/wl.ko || return 1
+	install -D -m 755 wl.ko "$pkgdir/lib/modules/`uname -r`/kernel/drivers/net/wireless/wl.ko"
 }
--- a/broadcom-wl/install
+++ b/broadcom-wl/install
@ -1,18 +1,14 @@
-post_install() {
-  KERNEL_VERSION=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
-  #KERNEL_VERSION=$(uname -r)
-  depmod $KERNEL_VERSION
-
-  echo ""
-  echo "==> NOTE:"
-  echo "==> If the modules do not load at boot, remember add in your rc.conf:"
-  echo "==> MODULES=(lib80211 wl !b43 !ssb ...)"
-  echo ""
-  echo "==> And if you have problems with interfaces swapped, read the wiki:"
-  echo "==> http://wiki.archlinux.org/index.php/Broadcom_BCM4312#Interfaces_swapped_every_time"
-
-}
-
 post_upgrade() {
-  post_install
+	depmod `uname -r`
+}
+
+post_install() {
+	cat <<EOF
+==> If the modules do not load at boot, add to your /etc/rc.conf:
+==> MODULES=(lib80211 wl !b43 !ssb ...)
+==>
+==> If you have problems with interfaces swapped, read:
+==> http://wiki.archlinux.org/index.php/Broadcom_BCM4312#Interfaces_swapped_every_time
+EOF
+	post_upgrade
 }
--- a/broadcom-wl/license.patch
+++ b/broadcom-wl/license.patch
@ -1,12 +1,11 @@
-diff -aur bla/src/wl/sys/wl_linux.c bla.new/src/wl/sys/wl_linux.c
--- bla/src/wl/sys/wl_linux.c	2010-02-06 02:59:15.000000000 +0100
-+++ bla.new/src/wl/sys/wl_linux.c	2010-08-07 23:17:35.368641722 +0200
-@@ -187,6 +187,8 @@
+diff -aur old/src/wl/sys/wl_linux.c new/src/wl/sys/wl_linux.c
+--- old/src/wl/sys/wl_linux.c	2010-10-22 04:18:57.000000000 +0200
+++ new/src/wl/sys/wl_linux.c	2010-11-13 12:58:40.680049542 +0100
+@@ -186,6 +186,7 @@
 
 static int nompc = 0;
 module_param(nompc, int, 0);
 +MODULE_LICENSE("Mixed/Proprietary"); 
-+
 
 static char name[IFNAMSIZ] = "eth%d";
 module_param_string(name, name, IFNAMSIZ, 0);
--- a/broadcom-wl/semaphore.patch
+++ b/broadcom-wl/semaphore.patch
@ -1,6 +1,6 @@
-diff -aur bla/src/wl/sys/wl_iw.h bla.new/src/wl/sys/wl_iw.h
--- bla/src/wl/sys/wl_iw.h	2010-02-06 02:59:15.000000000 +0100
-+++ bla.new/src/wl/sys/wl_iw.h	2010-08-07 23:17:35.368641722 +0200
+diff -aur old/src/wl/sys/wl_iw.h new/src/wl/sys/wl_iw.h
+--- old/src/wl/sys/wl_iw.h	2010-02-06 02:59:15.000000000 +0100
+++ new/src/wl/sys/wl_iw.h	2010-08-07 23:17:35.368641722 +0200
@@ -15,6 +15,7 @@
 #ifndef _wl_iw_h_
 #define _wl_iw_h_
--- a/ndiswrapper/PKGBUILD
+++ b/ndiswrapper/PKGBUILD
@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=ndiswrapper
 pkgver=1.56
-pkgrel=9
+pkgrel=10

 # Find the kernel name inside the chroot
 _kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
--- a/tiacx/PKGBUILD
+++ b/tiacx/PKGBUILD
@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=tiacx
 pkgver=20080210
-pkgrel=21
+pkgrel=22
 pkgdesc="OpenSource module for Texas Instruments ACX100/ACX111 wireless chips. For stock chakra 2.6 kernel"
 arch=(i686 x86_64)
 url="http://acx100.sourceforge.net/"
--- a/vhba-module/PKGBUILD
+++ b/vhba-module/PKGBUILD
@ -10,7 +10,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 pkgname=vhba-module
 pkgver=1.2.1
 _kernver='2.6.36-CHAKRA'
-pkgrel=14
+pkgrel=15
 pkgdesc="Kernel26 module that emulates SCSI devices"
 arch=('i686' 'x86_64')
 url="http://cdemu.sourceforge.net/"