fix some driver compilings - kernel26-headers need a repack

acpi_call/PKGBUILD

@@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=acpi_call
 pkgver=20101109
-pkgrel=2
+pkgrel=3
 pkgdesc="A kernel module that enables you to call parameterless ACPI methods by writing the method name to /proc/acpi/call, e.g. to turn off discrete graphics card in a dual graphics environment (like NVIDIA Optimus)."
 arch=('i686' 'x86_64')
 url=("http://github.com/mkottman/acpi_call")

broadcom-wl/PKGBUILD

@@ -4,26 +4,30 @@
 # maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
+# 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.6
+pkgver=5.100.82.38
 pkgrel=1
-pkgdesc='Broadcom 802.11abg networking drivers'
+pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver'
 arch=('i686' 'x86_64')
 url='http://www.broadcom.com/support/802.11/linux_sta.php'
-license=('MIXED/Proprietary')
+license=('custom')
 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"
+
+[ "$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=('b4ecb6f82fe0f943d40fb85ef7c34eb16fe0abf2'
-                                     'ac57feff458bd03cd5b43a88fc264fcaa61bd156'
-                                     '50654c42a64c078c022148decdf897d586d3e6e0') \
-                        || sha1sums=('5aa9fd0707b1e597c5e0b78866a65d4bca687a0c'
-                                     'ac57feff458bd03cd5b43a88fc264fcaa61bd156'
-                                     '50654c42a64c078c022148decdf897d586d3e6e0')
+        'semaphore.patch'
+        'mutex-sema.patch')
+
+sha1sums=('3062830f86c5f1f41d8a4b26d6e0072dc989c7ba'
+          'ea7b67982ddc0f56fd3becb9914fd4458fe7d373'
+          '105f8e1d48ebe1f25d53859e5ab9326a27435c66'
+          'adf0138194ae204ad70ce44e98b2dc18ead4ae2a')
+[ "$CARCH" = 'x86_64' ] && sha1sums[0]='6076de3bd8206b3e7b8bfc2eadbe3a97eec4e735'
 
 install=install
 
@@ -31,10 +35,6 @@ build() {
 	cd "$srcdir"
 	patch -p1 < license.patch
 	patch -p1 < semaphore.patch
-	KBUILD_NOPEDANTIC=1 make -C /lib/modules/`uname -r`/build M=`pwd`
-}
-
-package() {
-	cd "$srcdir"
-	install -D -m 755 wl.ko "$pkgdir/lib/modules/`uname -r`/kernel/drivers/net/wireless/wl.ko"
-}
+	patch -p1 < mutex-sema.patch
+	make -C /lib/modules/$_kernver/build M=`pwd`
+}

broadcom-wl/license.patch

@@ -1,11 +1,11 @@
 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 @@
+--- old/src/wl/sys/wl_linux.c	2010-12-15 02:58:07.000000000 +0100
++++ new/src/wl/sys/wl_linux.c	2010-12-25 18:15:43.356676382 +0100
+@@ -240,6 +240,7 @@
  
  static int nompc = 0;
  module_param(nompc, int, 0);
-+MODULE_LICENSE("Mixed/Proprietary"); 
++MODULE_LICENSE("Mixed/Proprietary");
  
- static char name[IFNAMSIZ] = "eth%d";
- module_param_string(name, name, IFNAMSIZ, 0);
+ #ifdef quote_str
+ #undef quote_str

broadcom-wl/semaphore.patch

@@ -1,6 +1,6 @@
 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
+--- old/src/wl/sys/wl_iw.h	2010-12-15 02:58:07.000000000 +0100
++++ new/src/wl/sys/wl_iw.h	2010-12-25 18:17:01.826676379 +0100
 @@ -15,6 +15,7 @@
  #ifndef _wl_iw_h_
  #define _wl_iw_h_

kernel26/PKGBUILD

@@ -220,6 +220,11 @@ package_kernel26-headers() {
   rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
   # fix aufs
   # rm -rf ${pkgdir}/usr/src/linux-${_kernver}/include/linux/aufs_type.h
+
+  # fix io.h
+  sed \
+    -e  "s~#include <xen/xen.h>~~g" \
+    -i ${pkgdir}/usr/src/linux-${_kernver}/arch/x86/include/asm/io.h
 }
 
 

kernel26/kernel26.install

@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=2.6.36-CHAKRA
+KERNEL_VERSION=2.6.37-CHAKRA
 
 post_install () {
   # updating module dependencies