broadcom & acpi_call rebuild for 3.4.1 + clean-up

This commit is contained in:
abveritas 2012-06-07 03:00:15 +00:00
parent 38569cd1c5
commit a818055a65
3 changed files with 33 additions and 29 deletions

View File

@ -1,24 +1,22 @@
#
# Core Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# maintainer abveritas@chakra-project.org
# Find the kernel name inside the chroot
_extramodules=extramodules-`pacman -Q linux | cut -c7-9 | sed 's/linux //g'`-CHAKRA
_extramodules=extramodules-3.4.1-CHAKRA
_kver="$(cat /lib/modules/${_extramodules}/version)"
pkgname=acpi_call
pkgver=20120115
pkgrel=4
pkgrel=5
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")
license=('GPL')
depends=('linux>=3.2' 'linux<3.3' 'linux-headers')
depends=('linux>=3.4' 'linux<3.5' 'linux-headers')
makedepends=('git')
install=acpi_call.install
source=(http://chakra.sourceforge.net/sources/${pkgname}/${pkgname}-${pkgver}.tar.xz)
source=(http://chakra-linux.org/sources/${pkgname}/${pkgname}-${pkgver}.tar.xz)
md5sums=('129841dd806887492609214462792413')
@ -40,20 +38,17 @@ build() {
cp -r ${srcdir}/$pkgname ${srcdir}/$pkgname-build
cd ${srcdir}/$pkgname-build
sed \
-e 's/$(shell uname -r)/3.2-CHAKRA/g' \
-i Makefile
make
}
package() {
cd ${srcdir}/$pkgname-build
install -d ${pkgdir}/usr/share/$pkgname || return 1
install -d ${pkgdir}/usr/bin || return 1
install -d ${pkgdir}/usr/share/$pkgname/doc || return 1
install -d ${pkgdir}/usr/share/$pkgname
install -d ${pkgdir}/usr/bin
install -d ${pkgdir}/usr/share/$pkgname/doc
install -Dm755 ${srcdir}/$pkgname-build/test_off.sh \
${pkgdir}/usr/share/$pkgname || return 1
${pkgdir}/usr/share/$pkgname
ln -s /usr/share/$pkgname/test_off.sh \
${pkgdir}/usr/bin/test_off.sh || return 1
${pkgdir}/usr/bin/test_off.sh
install -Dm644 README \
${pkgdir}/usr/share/$pkgname/README

View File

@ -1,28 +1,20 @@
#
# Chakra Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# maintainer abveritas@chakra-project.org
# Find the kernel name inside the chroot
_extramodules=extramodules-`pacman -Q linux | cut -c7-9 | sed 's/linux //g'`-CHAKRA
_extramodules=extramodules-3.4.1-CHAKRA
_kver="$(cat /lib/modules/${_extramodules}/version)"
pkgname=broadcom-wl
pkgver=5.100.82.112
pkgrel=6
pkgrel=7
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=('custom')
depends=('linux>=3.2' 'linux<3.3')
makedepends=('linux-headers')
pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver'
url='http://www.broadcom.com/support/802.11/linux_sta.php'
arch=('i686' 'x86_64')
license=('custom')
depends=('linux')
depends=('linux>=3.4' 'linux<3.5')
makedepends=('linux-headers')
[[ $CARCH = x86_64 ]] && ARCH=x86_64 || ARCH=x86_32
@ -31,13 +23,15 @@ source=("http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${ARCH}-v${pkgver
'linux3.patch'
'linux3.2.patch'
'license.patch'
'semaphore.patch')
'semaphore.patch'
'linux3.4.patch')
sha1sums=('01aa32f9e85621253a3f15cf4361bb80d41da3e8'
'89bf92286ede30dd85304c6c4e42e89cfdc0f60a'
'3e18f905bbe5e8b99a53d6ecb3b80a919f3531f2'
'229f41b7c371842bf9c1c81b03f34ee32fcb3310'
'ea7b67982ddc0f56fd3becb9914fd4458fe7d373'
'105f8e1d48ebe1f25d53859e5ab9326a27435c66')
'105f8e1d48ebe1f25d53859e5ab9326a27435c66'
'4f902a8c0da2efd0fe9f6547c8d01f5325ca9fe8')
[[ $CARCH = x86_64 ]] && sha1sums[0]='5bd78c20324e6a4aa9f3fafdc6f0155e884d5131'
backup=('etc/modprobe.d/broadcom-wl.conf')
@ -50,6 +44,7 @@ build() {
patch -p0 src/wl/sys/wl_linux.c < linux3.2.patch
patch -p1 -i license.patch
patch -p1 -i semaphore.patch
patch -p1 -i linux3.4.patch
make -C /lib/modules/"${_kver}"/build M=`pwd`
}

View File

@ -0,0 +1,14 @@
From: Eugene San (eugenesan) <eugenesan@gmail.com>
Subject: [PATCH 1/1] add support for linux 3.4
--- a/src/wl/sys/wl_linux.c
+++ b/src/wl/sys/wl_linux.c
@@ -40,7 +40,9 @@
#include <linux/pci_ids.h>
#define WLC_MAXBSSCFG 1
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 1)
#include <asm/system.h>
+#endif
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/pgtable.h>