Commit 2ccb2162 authored by philm's avatar philm

remove kernel26-testing: update to kernel26-2.6.35-series

parent 24c1b0ed
......@@ -8,20 +8,24 @@
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=aufs2-util
pkgver=20100514
pkgrel=3
pkgver=20100809
pkgrel=1
pkgdesc="Another Unionfs Implementation that supports NFS branches"
arch=('i686' 'x86_64')
url="http://aufs.sourceforge.net/"
license=('GPL2')
depends=('glibc')
makedepends=('aufs2>=2.6.33_20100514-3' 'kernel26-headers')
replaces=('aufs-utils')
source=($pkgname-$pkgver.tar.gz)
md5sums=('411d4e94420d7b8c9a9bca620957292a')
makedepends=('aufs2>=2.6.35_20100809' 'kernel26-headers')
replaces=('aufs-utils' 'aufs2-util')
conflicts=('aufs2-util')
source=(http://chakra-project.org/sources/aufs2-util/aufs2-util-$pkgver.tar.gz)
md5sums=('28abec237a2d0b3307e319e13bfdb9e4')
build() {
cd $srcdir/$pkgname-$pkgver || return 1
cd $srcdir/aufs2-util-$pkgver || return 1
# fix KDIR
sed -i 's|$(shell uname -r)|2.6.35-CHAKRA|g' ./Makefile
# build
make || return 1
# install
......
#!/bin/sh
#AUFS2VERSION=""
#KERNELVERSION=2.6.33
GITSNAPSHOT=20100514
#KERNELVERSION=2.6.35
GITSNAPSHOT=20100809
# aufs2 (no -xx) for the latest -rc version.
if [ ! -d aufs2-util.git/.git ]; then
git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-util.git aufs2-util.git
else
git pull
fi
rm -R aufs2-util.git
git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-util.git aufs2-util.git
cd aufs2-util.git
#git checkout origin/aufs2${AUFS2VERSION}
#*** apply "aufs2-base.patch" and "aufs2-standalone.patch" to your kernel source files.
......
......@@ -8,38 +8,37 @@
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=aufs2
pkgver=2.6.33_20100514
pkgrel=6
pkgver=2.6.35_20100809
pkgrel=1
_kernver=${pkgver%_*}-CHAKRA
pkgdesc="Another Unionfs Implementation"
arch=('i686' 'x86_64')
url="http://aufs.sourceforge.net/"
license=('GPL2')
depends=('kernel26>=2.6.33.6-1.1' 'kernel26<2.6.34')
makedepends=('kernel26-headers>=2.6.33' 'kernel26-headers<2.6.34')
replaces=('aufs')
install=${pkgname}.install
source=("${pkgname}-${pkgver}.tar.gz" 'writefix.patch')
depends=('kernel26>=2.6.35' 'kernel26<2.6.36')
makedepends=('kernel26-headers>=2.6.35' 'kernel26-headers<2.6.36')
replaces=('aufs' 'aufs2')
conflicts=('aufs2')
install=aufs2.install
source=("http://chakra-project.org/sources/aufs2/aufs2-${pkgver}.tar.gz")
options=(!makeflags)
md5sums=('0bf267301bd89f9d64a104b722da9cec'
'a31931b296cb37d5c9bec1ffd31e7fc1')
md5sums=('7fee91c73274151b4a83982771a5c358')
build() {
cd ${srcdir}/${pkgname}-${pkgver} || return 1
cd ${srcdir}/aufs2-${pkgver} || return 1
msg "add patches"
patch -Np1 -i $startdir/writefix.patch || return 1
# msg "add patches"
msg "start config"
sed -i 's|CONFIG_AUFS_HNOTIFY =.*|CONFIG_AUFS_HNOTIFY = y|' \
sed -i 's|CONFIG_AUFS_HNOTIFY =.*|CONFIG_AUFS_HNOTIFY = y\nCONFIG_INOTIFY = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_HFSNOTIFY =.*|CONFIG_AUFS_HFSNOTIFY = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_EXPORT =.*|CONFIG_AUFS_EXPORT = y|' \
sed -i 's|CONFIG_AUFS_EXPORT =.*|CONFIG_AUFS_EXPORT = y\nCONFIG_EXPORTFS = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_SHWH =.*|CONFIG_AUFS_SHWH = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_BDEV_LOOP =.*|CONFIG_AUFS_BDEV_LOOP = y|' \
sed -i 's|CONFIG_AUFS_BDEV_LOOP =.*|CONFIG_AUFS_BDEV_LOOP = y\nCONFIG_BLK_DEV_LOOP = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_BR_RAMFS =.*|CONFIG_AUFS_BR_RAMFS = y|' \
config.mk || return 1
......@@ -59,7 +58,7 @@ build() {
$pkgdir/lib/modules/${_kernver}/kernel/fs/aufs/aufs.ko || return 1
# tweak the install script for the right kernel version
sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
$startdir/$pkgname.install || return 1
$startdir/aufs2.install || return 1
# install include files
install -D -m 644 include/linux/aufs_type.h $pkgdir/usr/src/linux-$_kernver/include/linux/aufs_type.h || return 1
}
post_install() {
KERNEL_VERSION=2.6.33-CHAKRA
KERNEL_VERSION=2.6.35-CHAKRA
depmod $KERNEL_VERSION
}
post_upgrade() {
KERNEL_VERSION=2.6.33-CHAKRA
KERNEL_VERSION=2.6.35-CHAKRA
depmod $KERNEL_VERSION
}
post_remove() {
KERNEL_VERSION=2.6.33-CHAKRA
KERNEL_VERSION=2.6.35-CHAKRA
depmod $KERNEL_VERSION
}
......
#!/bin/sh
AUFS2VERSION="-33"
KERNELVERSION=2.6.33
GITSNAPSHOT=20100420
AUFS2VERSION="-35"
KERNELVERSION=2.6.35
GITSNAPSHOT=20100809
# aufs2 (no -xx) for the latest -rc version.
rm -R aufs2-standalone.git
git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git aufs2-standalone.git
cd aufs2-standalone.git
git checkout origin/aufs2${AUFS2VERSION}
......
diff --git a/fs/aufs/dynop.c b/fs/aufs/dynop.c
index 73c6195..a59aff0 100644
--- a/fs/aufs/dynop.c
+++ b/fs/aufs/dynop.c
@@ -176,22 +176,22 @@ static void dy_fop(struct au_dykey *key, const void *h_op,
AuDbg("%s\n", au_sbtype(h_sb));
- DySetFopForce(owner); /* force */
+ DySetFopForce(owner); /* force */
DySetFop(llseek);
DySetFop(read);
- DySetFop(write);
+ DySetFopForce(write); /* force */
DySetFop(aio_read);
- DySetFop(aio_write);
+ DySetFopForce(aio_write); /* force */
DySetFop(readdir);
DySetFop(poll);
DySetFop(ioctl);
- DySetFop(unlocked_ioctl);
+ DySetFopForce(unlocked_ioctl); /* force */
DySetFop(compat_ioctl);
DySetFop(mmap);
- DySetFopForce(open); /* force */
+ DySetFopForce(open); /* force */
DySetFop(flush);
- DySetFopForce(release); /* force */
- DySetFop(fsync);
+ DySetFopForce(release); /* force */
+ DySetFopForce(fsync); /* force */
DySetFop(aio_fsync);
DySetFop(fasync);
DySetFop(lock);
@@ -199,7 +199,7 @@ static void dy_fop(struct au_dykey *key, const void *h_op,
DySetFop(get_unmapped_area);
DySetFop(check_flags);
DySetFop(flock);
- DySetFop(splice_write);
+ DySetFopForce(splice_write); /* force */
DySetFop(splice_read);
DySetFop(setlease);
# Maintainer: Austin ( doorknob60 [at] gmail [dot] com )
#
# 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>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=broadcom-wl
pkgver=5.60.48.36
pkgrel=6.2
pkgrel=7
# 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"
pkgdesc="Broadcom 802.11abg Networking Drivers for kernel26"
arch=('i686' 'x86_64')
[ "$CARCH" = "i686" ] && ARCH=x86_32
[ "$CARCH" = "x86_64" ] && ARCH=x86_64
url="http://www.broadcom.com/support/802.11/linux_sta.php"
license=('MIXED/Proprietary')
depends=('kernel26>=2.6.33' 'kernel26<2.6.34')
depends=('kernel26>=2.6.35' 'kernel26<2.6.36')
makedepends=(kernel26-headers)
install=broadcom-wl.install
source=("http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-${ARCH}-v${pkgver}.tar.gz")
md5sums=(0466d863405e1ab99d5e288fe886e852)
[ "$CARCH" == "x86_64" ] && md5sums=(a78095ddcc30a191f64dccbc31b84de8)
source=("http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-${ARCH}-v${pkgver}.tar.gz" 'kernel-2.6.35.patch')
[ "$CARCH" = 'x86_64' ] && sha1sums=('1174a4d3102aa0ed45003556e03842668ef698b9'
'43d541063fd91b1fbd5e84310228abafddab7f7e') \
|| sha1sums=('07d955afe599466b0e25bcc507186f5b50f1a171'
'43d541063fd91b1fbd5e84310228abafddab7f7e')
groups=("kernel26-modules")
conflicts=("broadcom-wl")
replaces=("broadcom-wl")
build() {
cd "$srcdir"
patch -p1 < kernel-2.6.35.patch
# Adding line license
sed -i '190i\MODULE_LICENSE("Mixed/Proprietary"); \n' ${srcdir}/src/wl/sys/wl_linux.c
sed -i 's/linux\/autoconf.h/generated\/autoconf.h/' ${srcdir}/src/include/linuxver.h
......
#
# 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>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=kernel26-testing-aufs2-util
pkgver=20100809
pkgrel=1
pkgdesc="Another Unionfs Implementation that supports NFS branches"
arch=('i686' 'x86_64')
url="http://aufs.sourceforge.net/"
license=('GPL2')
depends=('glibc')
makedepends=('kernel26-testing-aufs2>=2.6.35_20100809' 'kernel26-testing-headers')
replaces=('aufs-utils' 'aufs2-util')
conflicts=('aufs2-util')
source=(http://chakra-project.org/sources/aufs2-util/aufs2-util-$pkgver.tar.gz)
md5sums=('28abec237a2d0b3307e319e13bfdb9e4')
build() {
cd $srcdir/aufs2-util-$pkgver || return 1
# fix KDIR
sed -i 's|$(shell uname -r)|2.6.35-CHAKRA|g' ./Makefile
# build
make || return 1
# install
#mkdir -p $pkgdir/{sbin,usr/bin,etc/default/aufs}
make DESTDIR=$pkgdir install || return 1
rm $pkgdir/usr/lib/libau.so.2
rm $pkgdir/usr/lib/libau.so
ln -sf libau.so.2.2 $pkgdir/usr/lib/libau.so.2
ln -sf libau.so.2.2 $pkgdir/usr/lib/libau.so
}
#!/bin/sh
#AUFS2VERSION=""
#KERNELVERSION=2.6.35
GITSNAPSHOT=20100809
# aufs2 (no -xx) for the latest -rc version.
rm -R aufs2-util.git
git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-util.git aufs2-util.git
cd aufs2-util.git
#git checkout origin/aufs2${AUFS2VERSION}
#*** apply "aufs2-base.patch" and "aufs2-standalone.patch" to your kernel source files.
cd ..
rm -rf aufs2-util-${GITSNAPSHOT}
cp -a aufs2-util.git aufs2-util-${GITSNAPSHOT}
tar -czf aufs2-util-${GITSNAPSHOT}.tar.gz --exclude=.git aufs2-util-${GITSNAPSHOT}
#
# 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>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=kernel26-testing-aufs2
pkgver=2.6.35_20100809
pkgrel=1
_kernver=${pkgver%_*}-CHAKRA
pkgdesc="Another Unionfs Implementation"
arch=('i686' 'x86_64')
url="http://aufs.sourceforge.net/"
license=('GPL2')
depends=('kernel26-testing>=2.6.35' 'kernel26-testing<2.6.36')
makedepends=('kernel26-testing-headers>=2.6.35' 'kernel26-testing-headers<2.6.36')
replaces=('aufs' 'aufs2')
conflicts=('aufs2')
install=aufs2.install
source=("http://chakra-project.org/sources/aufs2/aufs2-${pkgver}.tar.gz")
options=(!makeflags)
md5sums=('7fee91c73274151b4a83982771a5c358')
build() {
cd ${srcdir}/aufs2-${pkgver} || return 1
# msg "add patches"
msg "start config"
sed -i 's|CONFIG_AUFS_HNOTIFY =.*|CONFIG_AUFS_HNOTIFY = y\nCONFIG_INOTIFY = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_HFSNOTIFY =.*|CONFIG_AUFS_HFSNOTIFY = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_EXPORT =.*|CONFIG_AUFS_EXPORT = y\nCONFIG_EXPORTFS = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_SHWH =.*|CONFIG_AUFS_SHWH = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_BDEV_LOOP =.*|CONFIG_AUFS_BDEV_LOOP = y\nCONFIG_BLK_DEV_LOOP = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_BR_RAMFS =.*|CONFIG_AUFS_BR_RAMFS = y|' \
config.mk || return 1
sed -i 's|CONFIG_AUFS_DEBUG =.*|CONFIG_AUFS_DEBUG =|' \
config.mk || return 1
if [ "${CARCH}" = "x86_64" ]; then
inot64=" y"
else
inot64=""
fi
sed -i "s|CONFIG_AUFS_INO_T_64 =.*|CONFIG_AUFS_INO_T_64 =${inot64}|" \
config.mk || return 1
# build
make KDIR=/usr/src/linux-${_kernver} || return 1
# install
install -D -m644 fs/aufs/aufs.ko \
$pkgdir/lib/modules/${_kernver}/kernel/fs/aufs/aufs.ko || return 1
# tweak the install script for the right kernel version
sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
$startdir/aufs2.install || return 1
# install include files
install -D -m 644 include/linux/aufs_type.h $pkgdir/usr/src/linux-$_kernver/include/linux/aufs_type.h || return 1
}
post_install() {
KERNEL_VERSION=2.6.35-CHAKRA
depmod $KERNEL_VERSION
}
post_upgrade() {
KERNEL_VERSION=2.6.35-CHAKRA
depmod $KERNEL_VERSION
}
post_remove() {
KERNEL_VERSION=2.6.35-CHAKRA
depmod $KERNEL_VERSION
}
op=$1
shift
$op $*
#!/bin/sh
AUFS2VERSION="-35"
KERNELVERSION=2.6.35
GITSNAPSHOT=20100809
# aufs2 (no -xx) for the latest -rc version.
rm -R aufs2-standalone.git
git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git aufs2-standalone.git
cd aufs2-standalone.git
git checkout origin/aufs2${AUFS2VERSION}
#*** apply "aufs2-base.patch" and "aufs2-standalone.patch" to your kernel source files.
cd ..
rm -rf aufs2-${KERNELVERSIN}_${GITSNAPSHOT}
cp -a aufs2-standalone.git aufs2-${KERNELVERSION}_${GITSNAPSHOT}
tar -czf aufs2-${KERNELVERSION}_${GITSNAPSHOT}.tar.gz --exclude=.git aufs2-${KERNELVERSION}_${GITSNAPSHOT}
#
# 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>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=kernel26-testing-broadcom-wl
pkgver=5.60.48.36
pkgrel=1
# Find the kernel name inside the chroot
_kernver=`pacman -Qf kernel26-testing | cut -c18-23 | sed 's/kernel26-testing //g'`-CHAKRA
pkgdesc="Broadcom 802.11abg Networking Drivers for kernel26-testing"
arch=('i686' 'x86_64')
[ "$CARCH" = "i686" ] && ARCH=x86_32
[ "$CARCH" = "x86_64" ] && ARCH=x86_64
url="http://www.broadcom.com/support/802.11/linux_sta.php"
license=('MIXED/Proprietary')
depends=('kernel26-testing>=2.6.35' 'kernel26-testing<2.6.36')
makedepends=(kernel26-testing-headers)
install=broadcom-wl.install
source=("http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-${ARCH}-v${pkgver}.tar.gz" 'kernel-2.6.35.patch')
[ "$CARCH" = 'x86_64' ] && sha1sums=('1174a4d3102aa0ed45003556e03842668ef698b9'
'43d541063fd91b1fbd5e84310228abafddab7f7e') \
|| sha1sums=('07d955afe599466b0e25bcc507186f5b50f1a171'
'43d541063fd91b1fbd5e84310228abafddab7f7e')
groups=("kernel26-testing-modules")
conflicts=("broadcom-wl")
replaces=("broadcom-wl")
build() {
cd "$srcdir"
patch -p1 < kernel-2.6.35.patch
# Adding line license
sed -i '190i\MODULE_LICENSE("Mixed/Proprietary"); \n' ${srcdir}/src/wl/sys/wl_linux.c
sed -i 's/linux\/autoconf.h/generated\/autoconf.h/' ${srcdir}/src/include/linuxver.h
# Building
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
}
post_install() {
KERNEL_VERSION=`pacman -Qf kernel26-testing | cut -c18-23 | sed 's/kernel26-testing //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
}
#
# 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>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=kernel26-testing-ndiswrapper
pkgver=1.56
pkgrel=1
# Find the kernel name inside the chroot
_kernver=`pacman -Qf kernel26-testing | cut -c18-23 | sed 's/kernel26-testing //g'`-CHAKRA
pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors. For kernel26-testing."
license=('GPL')
arch=(i686 x86_64)
url="http://ndiswrapper.sourceforge.net"
install="ndiswrapper.install"
depends=("ndiswrapper-utils=$pkgver" 'kernel26-testing>=2.6.35' 'kernel26-testing<2.6.36')
makedepends=('kernel26-testing-headers>=2.6.35' 'kernel26-testing-headers<2.6.36')
source=(http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz kernel-2.6.35.patch)
md5sums=('1431f7ed5f8e92e752d330bbb3aed333'
'0a03d613b1fd545a75c5dd1a7c2aaec4')
groups=("kernel26-testing-modules")
conflicts=("ndiswrapper")
replaces=("ndiswrapper")
build()
{
cd $srcdir/ndiswrapper-$pkgver/driver
patch -Np2 -i $startdir/kernel-2.6.35.patch
make KVERS=$_kernver || return 1
make DESTDIR=$pkgdir KVERS=$_kernver install || return 1
rm $pkgdir/lib/modules/$_kernver/modules.* #wtf?
sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/*.install
# move it to correct kernel directory
mkdir -p $pkgdir/lib/modules/$_kernver/kernel/drivers/net/wireless/ndiswrapper
mv $pkgdir/lib/modules/$_kernver/misc/* $pkgdir/lib/modules/$_kernver/kernel/drivers/net/wireless/ndiswrapper/
rm -r $pkgdir/lib/modules/$_kernver/misc/
}
# arg 1: the new package version
post_install()
{
ndiswrapper -m
KERNEL_VERSION='2.6.35-CHAKRA'
depmod -ae $KERNEL_VERSION > /dev/null 2>&1
}
# arg 1: the new package version
# arg 2: the old package version
post_upgrade()
{
ndiswrapper -m
KERNEL_VERSION='2.6.35-CHAKRA'
depmod -ae $KERNEL_VERSION > /dev/null 2>&1
}
# arg 1: the old package version
post_remove()
{
KERNEL_VERSION='2.6.35-CHAKRA'
depmod -ae $KERNEL_VERSION > /dev/null 2>&1
}
#
# 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>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
# Find the kernel name inside the chroot
_kernver=`pacman -Qf kernel26-testing | cut -c18-23 | sed 's/kernel26-testing //g'`-CHAKRA
pkgname=kernel26-testing-tiacx
pkgver=20080210
pkgrel=17.2
pkgdesc="OpenSource module for Texas Instruments ACX100/ACX111 wireless chips. For kernel26-testing."
arch=(i686 x86_64)
url="http://acx100.sourceforge.net/"
license=('MPL')
depends=('wireless_tools' 'kernel26-testing>=2.6.35' 'kernel26-testing<2.6.36' 'tiacx-firmware')
makedepends=('kernel26-testing-headers>=2.6.35' 'kernel26-testing-headers<2.6.36')
install=acx.install
source=(http://downloads.sourceforge.net/sourceforge/acx100/acx-$pkgver.tar.bz2
kernel-2.6.27.patch
kernel-2.6.30.patch
kernel-2.6.31.patch
kernel-2.6.33.patch)
_kernver=2.6.35-CHAKRA
groups=("kernel26-testing-modules")
conflicts=("tiacx")
replaces=("tiacx")
build() {
cd $startdir/src/acx-$pkgver
patch -Np1 -i ../kernel-2.6.27.patch || return 1
patch -Np0 -i ../kernel-2.6.30.patch || return 1
patch -Np1 -i ../kernel-2.6.31.patch || return 1
patch -Np0 -i ../kernel-2.6.33.patch || return 1
make -C /lib/modules/${_kernver}/build M=`pwd` || return 1
install -D acx.ko $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/net/wireless/tiacx/acx.ko
sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/*.install
}
md5sums=('7d5ce3215708e4e9f95cf567a9ee3a12'
'9895f72f8d0c84956b0f6c3b16df0fe8'
'e2900aee839ce711a7f7606b3e3de36e'
'dbcb276d77df7801cef58a85c18dfe94'
'9cd35ea33b8abdd2e4efec485b05477e')
# arg 1: the new package version
post_install() {
KERNEL_VERSION='2.6.35-CHAKRA'
depmod $KERNEL_VERSION > /dev/null 2>&1
}
# arg 1: the new package version
# arg 2: the old package version
post_upgrade() {
KERNEL_VERSION='2.6.35-CHAKRA'
depmod $KERNEL_VERSION > /dev/null 2>&1
}
# arg 1: the old package version
post_remove() {
KERNEL_VERSION='2.6.35-CHAKRA'
depmod $KERNEL_VERSION > /dev/null 2>&1
}
diff -Nur acx-20080210.orig/ioctl.c acx-20080210/ioctl.c
--- acx-20080210.orig/ioctl.c 2008-02-10 21:06:42.000000000 +0100
+++ acx-20080210/ioctl.c 2008-10-10 17:07:32.000000000 +0200
@@ -489,6 +489,7 @@
static char*
acx_s_scan_add_station(
acx_device_t *adev,
+ struct iw_request_info *info,
char *ptr,
char *end_buf,
struct client *bss)
@@ -503,14 +504,14 @@
iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
MAC_COPY(iwe.u.ap_addr.sa_data, bss->bssid);
acxlog_mac(L_IOCTL, "scan, station address: ", bss->bssid, "\n");
- ptr = iwe_stream_add_event(ptr, end_buf, &iwe, IW_EV_ADDR_LEN);
+ ptr = iwe_stream_add_event(info, ptr, end_buf, &iwe, IW_EV_ADDR_LEN);
/* Add ESSID */
iwe.cmd = SIOCGIWESSID;
iwe.u.data.length = bss->essid_len;
iwe.u.data.flags = 1;
log(L_IOCTL, "scan, essid: %s\n", bss->essid);
- ptr = iwe_stream_add_point(ptr, end_buf, &iwe, bss->essid);
+ ptr = iwe_stream_add_point(info, ptr, end_buf, &iwe, bss->essid);
/* Add mode */
iwe.cmd = SIOCGIWMODE;
@@ -520,7 +521,7 @@
else
iwe.u.mode = IW_MODE_ADHOC;
log(L_IOCTL, "scan, mode: %d\n", iwe.u.mode);
- ptr = iwe_stream_add_event(ptr, end_buf, &iwe, IW_EV_UINT_LEN);
+ ptr = iwe_stream_add_event(info, ptr, end_buf, &iwe, IW_EV_UINT_LEN);
}
/* Add frequency */
@@ -528,7 +529,7 @@
iwe.u.freq.m = acx_channel_freq[bss->channel - 1] * 100000;
iwe.u.freq.e = 1;
log(L_IOCTL, "scan, frequency: %d\n", iwe.u.freq.m);
- ptr = iwe_stream_add_event(ptr, end_buf, &iwe, IW_EV_FREQ_LEN);
+ ptr = iwe_stream_add_event(info, ptr, end_buf, &iwe, IW_EV_FREQ_LEN);
/* Add link quality */
iwe.cmd = IWEVQUAL;
@@ -546,7 +547,7 @@
iwe.u.qual.updated = 7;
log(L_IOCTL, "scan, link quality: %d/%d/%d\n",
iwe.u.qual.level, iwe.u.qual.noise, iwe.u.qual.qual);
- ptr = iwe_stream_add_event(ptr, end_buf, &iwe, IW_EV_QUAL_LEN);
+ ptr = iwe_stream_add_event(info, ptr, end_buf, &iwe, IW_EV_QUAL_LEN);
/* Add encryption */
iwe.cmd = SIOCGIWENCODE;
@@ -556,7 +557,7 @@
iwe.u.data.flags = IW_ENCODE_DISABLED;
iwe.u.data.length = 0;
log(L_IOCTL, "scan, encryption flags: %X\n", iwe.u.data.flags);
- ptr = iwe_stream_add_point(ptr, end_buf, &iwe, bss->essid);
+ ptr = iwe_stream_add_point(info, ptr, end_buf, &iwe, bss->essid);
/* add rates */
iwe.cmd = SIOCGIWRATE;
@@ -570,7 +571,7 @@
if (rate & 1) {
iwe.u.bitrate.value = *p * 500000; /* units of 500kb/s */
log(L_IOCTL, "scan, rate: %d\n", iwe.u.bitrate.value);
- ptr_rate = iwe_stream_add_value(ptr, ptr_rate, end_buf,
+ ptr_rate = iwe_stream_add_value(info, ptr, ptr_rate, end_buf,
&iwe, IW_EV_PARAM_LEN);