Commit 2d8fdafa authored by abveritas's avatar abveritas

removed obsolete acerhk-lts, lts packages rebuild, bbswitch, dkms, catalyst/legacy

parent 11950452
--- a/acerhk.c
+++ b/acerhk.c
@@ -2668,7 +2668,9 @@ static int acerhk_proc_init(void)
printk(KERN_INFO"acerhk: could not create /proc/driver/acerhk\n");
}
else {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
proc_acer_dir->owner = THIS_MODULE;
+#endif
/* now create several files, first general info ... */
entry = create_proc_read_entry("info",
0444, proc_acer_dir, acerhk_proc_info, NULL);
@@ -2677,7 +2679,9 @@ static int acerhk_proc_init(void)
remove_proc_entry("driver/acerhk", NULL);
retval = 0;
} else {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
entry->owner = THIS_MODULE;
+#endif
/* ... last pressed key ... */
entry = create_proc_read_entry("key",
0444, proc_acer_dir, acerhk_proc_key, NULL);
@@ -2687,7 +2691,9 @@ static int acerhk_proc_init(void)
remove_proc_entry("driver/acerhk", NULL);
retval = 0;
} else {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
entry->owner = THIS_MODULE;
+#endif
/* ... and led control file */
entry = create_proc_entry("led", 0222, proc_acer_dir);
if (entry == NULL) {
@@ -2699,7 +2705,9 @@ static int acerhk_proc_init(void)
}
else {
entry->write_proc = acerhk_proc_led;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
entry->owner = THIS_MODULE;
+#endif
/* ... and wireless led controll file */
entry = create_proc_entry("wirelessled", 0222, proc_acer_dir);
if (entry == NULL) {
@@ -2712,7 +2720,9 @@ static int acerhk_proc_init(void)
}
else {
entry->write_proc = acerhk_proc_wirelessled;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
entry->owner = THIS_MODULE;
+#endif
/* ... and bluetooth led controll file */
entry = create_proc_entry("blueled", 0222, proc_acer_dir);
if (entry == NULL) {
@@ -2725,7 +2735,9 @@ static int acerhk_proc_init(void)
retval = 0;
} else {
entry->write_proc = acerhk_proc_blueled;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
entry->owner = THIS_MODULE;
+#endif
retval = 1;
#ifdef ACERDEBUG
/* add extra file for debugging purposes */
@@ -2742,7 +2754,9 @@ static int acerhk_proc_init(void)
}
else {
entry->write_proc = acerhk_proc_debug;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
entry->owner = THIS_MODULE;
+#endif
retval = 1;
}
#endif
--- acerhk.c.orig 2010-10-22 23:33:34.195981177 +0200
+++ acerhk.c 2010-10-22 23:39:16.349277070 +0200
@@ -2793,8 +2793,7 @@ static void acerhk_proc_cleanup(void)
/* {{{ file operations */
-static int acerhk_ioctl( struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg )
+static long acerhk_unlocked_ioctl(struct file *file,unsigned int cmd, unsigned long arg )
{
int retval;
switch( cmd ) {
@@ -2904,7 +2903,7 @@ static int acerhk_resume(struct platform
static struct file_operations acerhk_fops = {
owner: THIS_MODULE,
- ioctl: acerhk_ioctl,
+ unlocked_ioctl: acerhk_unlocked_ioctl,
open: acerhk_open,
#ifdef ACERDEBUG
write: acerhk_write,
2010-04-09 Chris Brannon <cmbrannon79@gmail.com>
* Release bump: 17
* PKGBUILD: updated for the 2.6.33 kernel.
* Added kernelversion.patch, since the location of utsrelease.h
changed with the 2.6.33 kernel.
2010-01-11 Chris Brannon <cmbrannon79@gmail.com>
* Release bump: 17
* PKGBUILD: fixed _kernver
2010-01-09 Chris Brannon <cmbrannon79@gmail.com>
* Release bump: 16
* PKGBUILD: updated for the 2.6.32 kernel
2009-10-10 Corrado Primier <bardo@aur.archlinux.org>
* Release bump: 15
* PKGBUILD: updated for the 2.6.31 kernel
* acerhk.install: changed modprobe.conf path
2009-06-24 Corrado Primier <bardo@aur.archlinux.org>
* Release bump: 14
* PKGBUILD: updated for the 2.6.30 kernel, added compilation patch
* 2.6.30.patch: added
2009-04-09 Corrado Primier <bardo@aur.archlinux.org>
* Release bump: 13
* PKGBUILD: updated for the 2.6.29 kernel
2009-01-16 Corrado Primier <bardo@aur.archlinux.org>
* Release bump: 12
* PKGBUILD: updated for the 2.6.28 kernel
2008-10-16 Corrado Primier <bardo@aur.archlinux.org>
* Release bump: 11
* PKGBUILD: updated for the 2.6.27 kernel
2008-08-12 Corrado Primier <bardo@aur.archlinux.org>
* Release bump: 10
* PKGBUILD: updated for the 2.6.26 kernel, moved to $srcdir/$pkgdir
2008-05-27 Corrado Primier <bardo@aur.archlinux.org>
* Release bump: 9
* PKGBUILD: updated for the 2.6.25 kernel
* ChangeLog: added
#
# 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>
# use ../makepkg
_kernver="2.6.35-CHAKRA-LTS"
pkgname=acerhk-lts
pkgver=0.5.35
pkgrel=1
pkgdesc="Acer hotkey driver"
url="http://www.cakey.de/acerhk/"
arch=('i686') # Unavailable for x86_64
license=('GPL')
depends=('kernel26-lts>=2.6.35' 'kernel26-lts<2.6.36')
makedepends=('kernel26-lts-headers>=2.6.35' 'kernel26-lts-headers<2.6.36')
source=(http://www.cakey.de/acerhk/archives/acerhk-${pkgver}.tgz acerhk.rc
2.6.30.patch kernelversion.patch 2.6.36.patch)
install=acerhk.install
build() {
cd "${srcdir}/acerhk-${pkgver}"
sed -i 's/CFLAGS/EXTRA_CFLAGS/' Makefile
patch -Np1 -i "${srcdir}/2.6.30.patch" || return 1
patch -Np0 -i "${srcdir}/2.6.36.patch" || return 1
patch -N -p1 < "$srcdir/kernelversion.patch" || return 1
# Set KERNELSRC. The makefile tries to autodetect it with uname,
# but that is unreliable.
make KERNELSRC="/lib/modules/${_kernver}/build" acerhk.ko || return 1
install -Dm644 "${srcdir}/acerhk-${pkgver}/acerhk.ko" \
"${pkgdir}/lib/modules/${_kernver}/kernel/drivers/block/acerhk.ko" || return 1
install -Dm755 "${srcdir}/acerhk.rc" "${pkgdir}/etc/rc.d/acerhk-lts" || return 1
sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/acerhk.install
}
# vim:set ts=2 sw=2 et:
md5sums=('05255919f312cb76af473a760c284433'
'935584b3e4bfbb3af8460558e5b98bb5'
'2a0bc99e5b12e25096441df4d53d7df7'
'fd2ef062ecbc9d670e1b42aa5866d32d'
'd257a4e9223ebfde48b9608805df9c99')
post_install() {
cat << EOM
>>> PLEASE ADD PROPER OPTIONS IN /etc/modprobe.d/modprobe.conf IF NEEDED
>>> e.g. for Series 290:
>>> echo "options acerhk force_series=290 usedritek=1 verbose=0" >> /etc/modprobe.conf
EOM
depmod -a
}
post_upgrade() {
depmod -a
}
post_remove() {
depmod -a
}
# vim:set ts=2 sw=2 et:
#!/bin/bash
. /etc/rc.conf
. /etc/rc.d/functions
case "$1" in
start)
stat_busy "Starting Acer Hotkey Wireless LED"
if [ ! -f /proc/driver/acerhk/wirelessled ]; then
stat_fail
else
echo 1 > /proc/driver/acerhk/wirelessled
stat_done
fi
;;
stop)
stat_busy "Stopping Acer Hotkey Wireless LED"
if [ ! -f /proc/driver/acerhk/wirelessled ]; then
stat_fail
else
echo 0 > /proc/driver/acerhk/wirelessled
stat_done
fi
;;
restart)
$0 stop
$0 start
;;
*)
echo "usage: $0 {start|stop|restart}"
;;
esac
diff -Naur acerhk-0.5.35/Makefile acerhk-0.5.35-new/Makefile
--- acerhk-0.5.35/Makefile 2006-08-16 11:11:08.000000000 -0500
+++ acerhk-0.5.35-new/Makefile 2010-04-09 15:59:40.000000000 -0500
@@ -3,7 +3,7 @@
#KERNELSRC=/usr/src/linux
KERNELSRC?=/lib/modules/`uname -r`/build
# Starting with 2.6.18, the kernel version is in utsrelease.h instead of version.h, accomodate both cases
-KERNELVERSION=$(shell awk -F\" '/REL/ {print $$2}' $(shell grep -s -l REL $(KERNELSRC)/include/linux/version.h $(KERNELSRC)/include/linux/utsrelease.h))
+KERNELVERSION=$(shell awk -F\" '/REL/ {print $$2}' $(shell grep -s -l REL $(KERNELSRC)/include/linux/version.h $(KERNELSRC)/include/generated/utsrelease.h))
KERNELMAJOR=$(shell echo $(KERNELVERSION)|head -c3)
# next line is for kernel 2.6, if you integrate the driver in the kernel tree
......@@ -9,9 +9,9 @@ _kver="$(cat /lib/modules/${_extramodules}/version)"
pkgname=bbswitch-lts
_pkgname=bbswitch
pkgver=0.4.2
pkgrel=2
pkgrel=3
pkgdesc="kernel module allowing to switch dedicated graphics card on Optimus laptops"
arch=('i686' 'x86_64')
arch=('x86_64')
url=("http://github.com/Bumblebee-Project/bbswitch")
license=('GPL')
provides=('bbswitch')
......
#
# Chakra Packages for Chakra, part of chakra-project.org
#
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# maintainer abveritas[at]chakra-project[dot]org>
_kernver="3.0.43-1-lts"
_kernver="3.0.58-1-lts"
pkgname=catalyst-legacy-lts
pkgver=12.6
pkgrel=3
pkgrel=4
pkgdesc="AMD/ATI Catalyst drivers for linux. fglrx kernel module only"
arch=('i686' 'x86_64')
arch=('x86_64')
url="http://www.ati.amd.com"
screenshot="http://linuxtation3.files.wordpress.com/2007/03/pantallazo.jpg"
license=('custom')
......@@ -37,15 +37,8 @@ build() {
msg "Unpacking archive ..."
/bin/sh ./amd-driver-installer-${pkgver}-legacy-x86.x86_64.run --extract archive_files
if [ "${CARCH}" = "x86_64" ]; then
BUILDARCH=x86_64
_archdir=x86_64
fi
if [ "${CARCH}" = "i686" ]; then
BUILDARCH=i386
_archdir=x86
fi
BUILDARCH=x86_64
_archdir=x86_64
cd "${srcdir}/archive_files/"
......
KERNEL_VERSION=3.0.43-1-lts
KERNEL_VERSION=3.0.58-1-lts
remove_hook(){
......@@ -24,8 +24,5 @@ post_upgrade() {
post_remove() {
EXTRAMODULES=extramodules-3.0-lts
depmod $(cat /lib/modules/$EXTRAMODULES/version)
echo "----------------------------------------------------------------"
echo "Don't forget to remove fglrx from MODULES array of /etc/rc.conf"
echo "----------------------------------------------------------------"
}
#
# Chakra Packages for Chakra, part of chakra-project.org
#
# maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# maintainer abveritas[at]chakra-project[dot]org>
_kernver="3.0.43-1-lts"
_kernver="3.0.58-1-lts"
pkgname=catalyst-lts
pkgver=12.8
pkgrel=3
pkgrel=4
_amdver=8.982
pkgdesc="AMD/ATI Catalyst drivers for linux. fglrx kernel module only"
arch=('i686' 'x86_64')
......@@ -38,15 +38,8 @@ build() {
msg "Unpacking archive ..."
/bin/sh ./amd-driver-installer-${_amdver}-x86.x86_64.run --extract archive_files
if [ "${CARCH}" = "x86_64" ]; then
BUILDARCH=x86_64
_archdir=x86_64
fi
if [ "${CARCH}" = "i686" ]; then
BUILDARCH=i386
_archdir=x86
fi
cd "${srcdir}/archive_files/"
......
......@@ -20,8 +20,5 @@ post_upgrade() {
post_remove() {
EXTRAMODULES=extramodules-3.0-lts
depmod $(cat /lib/modules/$EXTRAMODULES/version)
echo "----------------------------------------------------------------"
echo "Don't forget to remove fglrx from MODULES array of /etc/rc.conf"
echo "----------------------------------------------------------------"
}
......@@ -7,14 +7,14 @@
pkgname=dkms-lts
_pkgname=dkms
pkgver=2.2.0.3
pkgrel=3
pkgrel=4
pkgdesc='Dynamic Kernel Modules System'
arch=('any')
url='http://linux.dell.com/dkms/'
license=('GPL2')
depends=('linux-lts-headers' 'kmod')
backup=('etc/dkms/framework.conf' "etc/conf.d/$pkgname")
source=("http://linux.dell.com/$pkgname/permalink/$_pkgname-$pkgver.tar.gz"
source=("http://linux.dell.com/$_pkgname/permalink/$_pkgname-$pkgver.tar.gz"
"$pkgname.service"
"$pkgname.systemd"
'01-broken-uninstall.patch')
......
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