Commit e207361b authored by abveritas's avatar abveritas

vhba-module, tiacx, ndiswrapper updates/rebuild for 3.4.1 & clean-up

parent a818055a
#
# 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
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
# 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=ndiswrapper
pkgver=1.57
pkgrel=4
pkgrel=5
pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors. For linux-testing."
license=('GPL')
arch=(i686 x86_64)
arch=('i686' 'x86_64')
url="http://ndiswrapper.sourceforge.net"
install="ndiswrapper.install"
depends=('linux>=3.2' 'linux<3.3')
depends=('linux>=3.4' 'linux<3.5')
provides=("ndiswrapper-utils=$pkgver")
replaces=('ndiswrapper-utils')
conflicts=('ndiswrapper-utils')
makedepends=('linux-headers')
source=(http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz)
md5sums=('7a401dc540938bf07893c67f418b6152')
source=("http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz"
'linux34.patch')
md5sums=('7a401dc540938bf07893c67f418b6152'
'46cb26e68de91dc3c650866fc1189c28')
build() {
cd "$srcdir/$pkgname-$pkgver"
sed -i "/modinfo/s/s/usr\//" driver/Makefile
patch -p0 -i "$srcdir/linux34.patch"
make KVERS=$_kver
}
......@@ -40,5 +39,4 @@ package() {
KVERS=$_kver DESTDIR="$pkgdir/" install
gzip "$pkgdir/lib/modules/$_extramodules/$pkgname.ko"
sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" ${startdir}/*.install
}
\ No newline at end of file
--- driver/ndis.c 2011-12-31 21:30:16.000000000 +0100
+++ driver/ndis.c.new 2012-04-08 11:14:16.746614153 +0200
@@ -2654,9 +2654,15 @@
(ULONG *idle, ULONG *kernel_user, ULONG *index)
{
int cpu = smp_processor_id();
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,1)
+ *idle = kcpustat_cpu(cpu).cpustat[CPUTIME_IDLE];
+ *kernel_user = kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM] +
+ kcpustat_cpu(cpu).cpustat[CPUTIME_USER];
+#else
*idle = kstat_cpu(cpu).cpustat.idle;
*kernel_user = kstat_cpu(cpu).cpustat.system +
kstat_cpu(cpu).cpustat.user;
+#endif
*index = cpu;
}
--- driver/wrapndis.c 2011-12-31 21:30:16.000000000 +0100
+++ driver/wrapndis.c.new 2012-04-08 11:13:00.574116936 +0200
@@ -1684,6 +1684,7 @@
return 0;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,1)
static u32 ndis_get_rx_csum(struct net_device *dev)
{
struct ndis_device *wnd = netdev_priv(dev);
@@ -1735,18 +1736,21 @@
else
return -EOPNOTSUPP;
}
+#endif
static struct ethtool_ops ndis_ethtool_ops = {
.get_drvinfo = ndis_get_drvinfo,
.get_link = ndis_get_link,
.get_wol = ndis_get_wol,
.set_wol = ndis_set_wol,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,1)
.get_tx_csum = ndis_get_tx_csum,
.get_rx_csum = ndis_get_rx_csum,
.set_tx_csum = ndis_set_tx_csum,
.set_rx_csum = ndis_set_rx_csum,
.get_sg = ndis_get_sg,
.set_sg = ndis_set_sg,
+#endif
};
static int notifier_event(struct notifier_block *notifier, unsigned long event,
#
# 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
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
# 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=tiacx
pkgver=20080210
pkgrel=34
pkgrel=35
pkgdesc="OpenSource module for Texas Instruments ACX100/ACX111 wireless chips. For stock chakra kernel"
arch=(i686 x86_64)
url="http://acx100.sourceforge.net/"
license=('MPL')
depends=('wireless_tools' 'linux>=3.2' 'linux<3.3' 'tiacx-firmware')
makedepends=('linux-headers' 'linux-headers')
depends=('wireless_tools' 'linux>=3.4' 'linux<3.5' 'tiacx-firmware')
makedepends=('linux-headers')
install=acx.install
source=(http://downloads.sourceforge.net/sourceforge/acx100/acx-$pkgver.tar.bz2
kernel-2.6.27.patch
......@@ -27,14 +22,20 @@ source=(http://downloads.sourceforge.net/sourceforge/acx100/acx-$pkgver.tar.bz2
kernel-2.6.31.patch
kernel-2.6.33.patch
kernel-3.1.patch)
md5sums=('7d5ce3215708e4e9f95cf567a9ee3a12'
'9895f72f8d0c84956b0f6c3b16df0fe8'
'e2900aee839ce711a7f7606b3e3de36e'
'dbcb276d77df7801cef58a85c18dfe94'
'9cd35ea33b8abdd2e4efec485b05477e'
'05b32bb1e3e2df884a9d3775019b08a4')
build() {
cd $startdir/src/acx-$pkgver
patch -Np1 -i ../kernel-2.6.27.patch
patch -Np0 -i ../kernel-2.6.30.patch
patch -Np1 -i ../kernel-2.6.31.patch
patch -Np0 -i ../kernel-2.6.33.patch
patch -Np0 -i ../kernel-3.1.patch
patch -p1 -i ../kernel-2.6.27.patch
patch -p0 -i ../kernel-2.6.30.patch
patch -p1 -i ../kernel-2.6.31.patch
patch -p0 -i ../kernel-2.6.33.patch
patch -p0 -i ../kernel-3.1.patch
# kernel 3.2 abi change
sed -i -e "s/.ndo_set_multicast_list/.ndo_set_rx_mode/" usb.c
......@@ -44,9 +45,4 @@ build() {
install -D acx.ko $pkgdir/lib/modules/$_extramodules/acx.ko
sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" ${startdir}/*.install
}
md5sums=('7d5ce3215708e4e9f95cf567a9ee3a12'
'9895f72f8d0c84956b0f6c3b16df0fe8'
'e2900aee839ce711a7f7606b3e3de36e'
'dbcb276d77df7801cef58a85c18dfe94'
'9cd35ea33b8abdd2e4efec485b05477e'
'05b32bb1e3e2df884a9d3775019b08a4')
......@@ -5,7 +5,7 @@ post_install()
post_upgrade()
{
EXTRAMODULES='extramodules-3.2-CHAKRA'
EXTRAMODULES='extramodules-3.4.1-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
......
#
# 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=vhba-module
pkgver=20110915
pkgrel=4
pkgver=20120422
pkgrel=1
pkgdesc="Kernel module that emulates SCSI devices"
arch=('i686' 'x86_64')
url="http://cdemu.sourceforge.net/"
license=('GPL2')
depends=('linux>=3.2' 'linux<3.3')
depends=('linux>=3.4' 'linux<3.5')
makedepends=('linux-headers')
install=vhba-module.install
source=(http://sourceforge.net/projects/cdemu/files/vhba-module/vhba-module-$pkgver.tar.bz2)
md5sums=('8bb99b427ca67bad448f4dd211bdd1a2')
md5sums=('d97372da1d270d1605742b2995fb6678')
build() {
cd "$srcdir/$pkgname-$pkgver"
......
post_install() {
EXTRAMODULES='extramodules-3.2-CHAKRA'
EXTRAMODULES='extramodules-3.4.1-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
......@@ -8,7 +8,7 @@ post_upgrade() {
}
post_remove() {
EXTRAMODULES='extramodules-3.2-CHAKRA'
EXTRAMODULES='extramodules-3.4.1-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment