From 99bfe382438dfdd0b87c6ff169fd3845acf1aa7a Mon Sep 17 00:00:00 2001 From: Manuel Tortosa Date: Sun, 27 Jun 2010 11:40:06 +0000 Subject: [PATCH] Fix uname -r --- broadcom-wl/PKGBUILD | 8 ++++++-- ndiswrapper/PKGBUILD | 5 ++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/broadcom-wl/PKGBUILD b/broadcom-wl/PKGBUILD index c923aa021..77588cb4b 100644 --- a/broadcom-wl/PKGBUILD +++ b/broadcom-wl/PKGBUILD @@ -3,6 +3,10 @@ pkgname=broadcom-wl pkgver=5.60.48.36 pkgrel=4 + +# Find the kernel name inside the chroot +_kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA + pkgdesc="Broadcom 802.11abg Networking Drivers" arch=('i686' 'x86_64') [ "$CARCH" = "i686" ] && ARCH=x86_32 @@ -22,7 +26,7 @@ build() { sed -i 's/linux\/autoconf.h/generated\/autoconf.h/' ${srcdir}/src/include/linuxver.h # Building - KBUILD_NOPEDANTIC=1 make -C /lib/modules/$(uname -r)/build M=`pwd` || return 1 - install -D -m 755 wl.ko ${pkgdir}/lib/modules/$(uname -r)/kernel/drivers/net/wireless/wl.ko || return 1 + KBUILD_NOPEDANTIC=1 make -C /lib/modules/${_kernver}/build M=`pwd` || return 1 + install -D -m 755 wl.ko ${pkgdir}/lib/modules/${_kernver}/kernel/drivers/net/wireless/wl.ko || return 1 } diff --git a/ndiswrapper/PKGBUILD b/ndiswrapper/PKGBUILD index a87b5b689..af290d193 100644 --- a/ndiswrapper/PKGBUILD +++ b/ndiswrapper/PKGBUILD @@ -8,9 +8,12 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=ndiswrapper -_kernver=2.6.33-CHAKRA pkgver=1.56 pkgrel=4 + +# Find the kernel name inside the chroot +_kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA + pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors. For stock arch 2.6 kernel." license=('GPL') arch=(i686 x86_64)