Commit 09d02f01 authored by Xuetian Weng's avatar Xuetian Weng

rebuild all kernel modules and we are done for /lib moving

parent 9184caf8
......@@ -6,7 +6,7 @@ _kver="$(cat /lib/modules/${_extramodules}/version)"
pkgname=bbswitch-lts
_pkgname=bbswitch
pkgver=0.8
pkgrel=1
pkgrel=2
pkgdesc="kernel module allowing to switch dedicated graphics card on Optimus laptops"
arch=('x86_64')
url=("http://github.com/Bumblebee-Project/bbswitch")
......@@ -19,7 +19,7 @@ source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz
md5sums=('5b116b31ace3604ddf9d1fc1f4bc5807')
build() {
cd ${srcdir}/${_pkgname}-${pkgver}
make KDIR=/lib/modules/${_kver}/build KVERSION=${_kver}
make KDIR=/usr/lib/modules/${_kver}/build KVERSION=${_kver}
}
package() {
......@@ -28,9 +28,9 @@ package() {
# KDIR is necessary even when cleaning
#make KDIR=/usr/src/linux-${_kver} clean
mkdir -p $pkgdir//lib/modules/${_extramodules}
install -D -m644 bbswitch.ko $pkgdir/lib/modules/${_extramodules}
gzip "${pkgdir}/lib/modules/${_extramodules}/bbswitch.ko"
mkdir -p $pkgdir/usr/lib/modules/${_extramodules}
install -D -m644 bbswitch.ko $pkgdir/usr/lib/modules/${_extramodules}
gzip "${pkgdir}/usr/lib/modules/${_extramodules}/bbswitch.ko"
#automatically update bbswitch.install
sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/bbswitch.install"
}
post_install() {
EXTRAMODULES='extramodules-3.2-CHAKRA-LTS'
EXTRAMODULES='extramodules-3.2-lts'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
echo 'In order to use nvidia module, reboot the system.'
}
post_upgrade() {
EXTRAMODULES='extramodules-3.2-CHAKRA-LTS'
EXTRAMODULES='extramodules-3.2-lts'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
post_remove() {
EXTRAMODULES='extramodules-3.2-CHAKRA-LTS'
EXTRAMODULES='extramodules-3.2-lts'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
\ No newline at end of file
# maintainer tetris4@gmail.com
# contributions from: https://www.archlinux.org/packages/community/x86_64/bbswitch/
_extramodules=extramodules-3.15.5-CHAKRA
_extramodules=extramodules-3.16-CHAKRA
_kver="$(cat /lib/modules/${_extramodules}/version)"
pkgname=bbswitch
pkgver=0.8
pkgrel=6
pkgrel=7
pkgdesc="kernel module allowing to switch dedicated graphics card on Optimus laptops"
arch=('x86_64')
url=("http://github.com/Bumblebee-Project/bbswitch")
license=('GPL')
install=bbswitch.install
depends=('linux>=3.15' 'linux<3.16')
depends=('linux>=3.16' 'linux<3.17')
makedepends=('linux' 'linux-headers')
source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz")
md5sums=('5b116b31ace3604ddf9d1fc1f4bc5807')
......@@ -33,6 +33,6 @@ package() {
# KDIR is necessary even when cleaning
#make KDIR=/usr/src/linux-${_kver} clean
install -Dm644 bbswitch.ko $pkgdir/lib/modules/${_extramodules}/bbswitch.ko
gzip "${pkgdir}/lib/modules/${_extramodules}/bbswitch.ko"
install -Dm644 bbswitch.ko $pkgdir/usr/lib/modules/${_extramodules}/bbswitch.ko
gzip "${pkgdir}/usr/lib/modules/${_extramodules}/bbswitch.ko"
}
post_install() {
EXTRAMODULES='extramodules-3.12.6-CHAKRA'
EXTRAMODULES='extramodules-3.16-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
echo 'In order to use nvidia module, reboot the system.'
}
post_upgrade() {
EXTRAMODULES='extramodules-3.12.6-CHAKRA'
EXTRAMODULES='extramodules-3.16-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
post_remove() {
EXTRAMODULES='extramodules-3.12.6-CHAKRA'
EXTRAMODULES='extramodules-3.16-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
# Maintainer: Neophytos Kolokotronis <tetris4 AT gmail DOT com>
_extramodules=extramodules-3.2-lts
_kernver="$(cat /lib/modules/${_extramodules}/version)"
_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
url_ref="http://support.amd.com/en-us/download/desktop?os=Linux+x86"
DLAGENTS="http::/usr/bin/curl --referer ${url_ref} -o %o %u"
pkgname=catalyst-lts
pkgver=14.4
pkgrel=1
pkgrel=2
_amdver=14.10.1006.1001
pkgdesc="AMD/ATI Catalyst drivers for linux. fglrx kernel module only"
arch=('x86_64')
......@@ -16,7 +19,7 @@ depends=('linux-lts>=3.2' 'linux-lts<3.4' 'catalyst-utils')
makedepends=('gcc-libs' 'gcc>4.0.0' 'make' 'linux-lts-headers')
conflicts=('catalyst-test' 'nvidia' 'xf86-video-ati' 'xf86-video-radeonhd')
install=catalyst.install
source=( http://www2.ati.com/drivers/linux/amd-catalyst-${pkgver/./-}-rev2-linux-x86-x86-64-may6.zip
source=(http://www2.ati.com/drivers/linux/amd-catalyst-${pkgver/./-}-rev2-linux-x86-x86-64-may6.zip
ati_make.sh
makefile_compat.patch
lano1106_fglrx_intel_iommu.patch
......@@ -69,17 +72,17 @@ build() {
# Compile module using _ati_check variables
CFLAGS_MODULE="-DMODULE -DATI -DFGL -DPAGE_ATTR_FIX=$PAGE_ATTR_FIX -DCOMPAT_ALLOC_USER_SPACE=$COMPAT_ALLOC_USER_SPACE $def_smp $def_modversions"
make -C /lib/modules/${_kernver}/build SUBDIRS="`pwd`" ARCH=${BUILDARCH} \
make -C /usr/lib/modules/${_kernver}/build SUBDIRS="`pwd`" ARCH=${BUILDARCH} \
MODFLAGS="$CFLAGS_MODULE" \
CFLAGS_MODULE="$CFLAGS_MODULE" \
PAGE_ATTR_FIX=$PAGE_ATTR_FIX COMPAT_ALLOC_USER_SPACE=$COMPAT_ALLOC_USER_SPACE modules
}
package_catalyst() {
package() {
# here we are checking kernel's extramodules dir
for r in /lib/modules/*; do
s=${r:13}
for r in /usr/lib/modules/*; do
s=${r:17}
if [[ ${s:0:3} = "ext" ]]; then
if [[ `cat ${r}/version | grep -c ${_kernver}` != 0 ]]; then
_destidir=${s}
......@@ -93,8 +96,8 @@ package_catalyst() {
cd "${srcdir}/archive_files/common/lib/modules/fglrx/build_mod"
install -m755 -d "${pkgdir}/lib/modules/${_destidir}/"
install -m644 fglrx.ko "${pkgdir}/lib/modules/${_destidir}/"
install -m755 -d "${pkgdir}/usr/lib/modules/${_destidir}/"
install -m644 fglrx.ko "${pkgdir}/usr/lib/modules/${_destidir}/"
find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" $startdir/catalyst.install
......
......@@ -2,12 +2,12 @@
# Chakra Packages for Chakra, part of chakra-project.org
#
_extramodules=extramodules-3.15.5-CHAKRA
_kernver=$(cat /lib/modules/${_extramodules}/version)
_extramodules=extramodules-3.16-CHAKRA
_kernver=$(cat /usr/lib/modules/${_extramodules}/version)
pkgname=(catalyst chd-catalyst)
pkgver=14.4
pkgrel=4
pkgrel=5
_amdver=14.10.1006.1001
pkgdesc="AMD/ATI Catalyst drivers for linux. fglrx kernel module only. Radeons HD 2 3 4 xxx ARE NOT SUPPORTED"
screenshot="http://linuxtation3.files.wordpress.com/2007/03/pantallazo.jpg"
......@@ -72,7 +72,7 @@ build() {
# Compile module using _ati_check variables
CFLAGS_MODULE="-DMODULE -DATI -DFGL -DPAGE_ATTR_FIX=$PAGE_ATTR_FIX -DCOMPAT_ALLOC_USER_SPACE=$COMPAT_ALLOC_USER_SPACE $def_smp $def_modversions"
make -C /lib/modules/${_kernver}/build SUBDIRS="`pwd`" ARCH=${BUILDARCH} \
make -C /usr/lib/modules/${_kernver}/build SUBDIRS="`pwd`" ARCH=${BUILDARCH} \
MODFLAGS="$CFLAGS_MODULE" \
CFLAGS_MODULE="$CFLAGS_MODULE" \
PAGE_ATTR_FIX=$PAGE_ATTR_FIX COMPAT_ALLOC_USER_SPACE=$COMPAT_ALLOC_USER_SPACE modules
......@@ -81,13 +81,13 @@ build() {
package_catalyst() {
pkgdesc="AMD/ATI Catalyst drivers for linux. fglrx kernel module only"
screenshot="http://linuxtation3.files.wordpress.com/2007/03/pantallazo.jpg"
depends=('linux>=3.15' 'linux<3.16' 'catalyst-utils')
depends=('linux>=3.16' 'linux<3.17' 'catalyst-utils')
conflicts=('nvidia' 'xf86-video-ati' 'xf86-video-radeonhd' 'catalyst-legacy')
install=catalyst.install
# here we are checking kernel's extramodules dir
for r in /lib/modules/*; do
s=${r:13}
for r in /usr/lib/modules/*; do
s=${r:17}
if [[ ${s:0:3} = "ext" ]]; then
if [[ `cat ${r}/version | grep -c ${_kernver}` != 0 ]]; then
_destidir=${s}
......@@ -101,8 +101,8 @@ package_catalyst() {
cd "${srcdir}/archive_files/common/lib/modules/fglrx/build_mod"
install -m755 -d "${pkgdir}/lib/modules/${_destidir}/"
install -m644 fglrx.ko "${pkgdir}/lib/modules/${_destidir}/"
install -m755 -d "${pkgdir}/usr/lib/modules/${_destidir}/"
install -m644 fglrx.ko "${pkgdir}/usr/lib/modules/${_destidir}/"
find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" $startdir/catalyst.install
......
KERNEL_VERSION=3.15.1-1-CHAKRA
KERNEL_VERSION=3.16.2-1-CHAKRA
remove_hook(){
......@@ -11,18 +11,18 @@ remove_hook(){
}
post_install() {
EXTRAMODULES=extramodules-3.15.1-CHAKRA
EXTRAMODULES=extramodules-3.16-CHAKRA
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
post_upgrade() {
remove_hook
EXTRAMODULES=extramodules-3.15.1-CHAKRA
EXTRAMODULES=extramodules-3.16-CHAKRA
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
post_remove() {
EXTRAMODULES=extramodules-3.15.1-CHAKRA
EXTRAMODULES=extramodules-3.16-CHAKRA
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
# maintainer almack@chakraos.org
_extramodules=extramodules-3.15.5-CHAKRA
_kver=$(cat /lib/modules/${_extramodules}/version)
_extramodules=extramodules-3.16-CHAKRA
_kver=$(cat /usr/lib/modules/${_extramodules}/version)
pkgname=lirc-utils
pkgver=0.9.1
pkgrel=3
pkgrel=4
pkgdesc="Linux Infrared Remote Control utils"
arch=('x86_64')
url="http://www.lirc.org/"
license=('GPL')
depends=('alsa-lib' 'libx11' 'libftdi' 'linux')
makedepends=('help2man' 'linux-headers>=3.15' 'linux-headers<3.16' 'python2' 'libtool')
makedepends=('help2man' 'linux-headers>=3.16' 'linux-headers<3.17' 'python2' 'libtool')
optdepends=('python2: pronto2lirc utility')
replaces=('lirc+pctv')
backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf' 'etc/lirc/lircmd.conf')
......@@ -53,7 +53,7 @@ build() {
cd "${srcdir}/lirc-${pkgver}"
./configure --enable-sandboxed --prefix=/usr \
--with-driver=all --with-kerneldir=/usr/src/linux-${_kver} \
--with-moduledir=/lib/modules/${_kver}/kernel/drivers/misc \
--with-moduledir=/usr/lib/modules/${_kver}/kernel/drivers/misc \
--with-transmitter
# Remove drivers already in kernel
......
EXTRAMODULES='extramodules-3.15.5-CHAKRA'
EXTRAMODULES='extramodules-3.16-CHAKRA'
post_install() {
systemd-tmpfiles --create lirc.conf
......
......@@ -2,12 +2,12 @@
# Find the kernel name inside the chroot
_extramodules=extramodules-3.2-lts
_kver="$(cat /lib/modules/${_extramodules}/version)"
_kver="$(cat /usr/lib/modules/${_extramodules}/version)"
pkgname=madwifi-lts
pkgver=0.9.4.4182
_ver=r4182-20140204
pkgrel=1
pkgrel=2
pkgdesc="Madwifi drivers for Atheros wireless chipsets"
arch=('x86_64')
license=('GPL')
......@@ -32,18 +32,15 @@ build()
sed -i 's/-Werror//' Makefile.inc
sed -i 's/\[4-9\]\\\./[0-9]-/' Makefile
make KERNELPATH=/lib/modules/${_kver}/build KERNELRELEASE=${_kver} modules
make KMODPATH="/usr/lib/modules/$_extramodules" KERNELPATH=/usr/lib/modules/${_kver}/build KERNELRELEASE=${_kver} modules
}
package()
{
cd madwifi-*-${_ver}
make KERNELPATH=/lib/modules/${_kver}/build KERNELRELEASE=${_kver} modules \
make KMODPATH="/usr/lib/modules/$_extramodules" KERNELPATH=/usr/lib/modules/${_kver}/build KERNELRELEASE=${_kver} modules \
DESTDIR="${pkgdir}" KERNELRELEASE=${_kver} install-modules
sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" ${startdir}/*.install
mkdir -p "${pkgdir}/lib/modules/$_extramodules"
mv "${pkgdir}"/lib/modules/${_kver}/net/* "${pkgdir}/lib/modules/$_extramodules"
rm -r "${pkgdir}"/lib/modules/${_kver}
find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
}
......
......@@ -5,7 +5,7 @@ post_install()
post_upgrade()
{
EXTRAMODULES='extramodules-3.2-CHAKRA-LTS'
EXTRAMODULES='extramodules-3.2-lts'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
......
......@@ -5,7 +5,7 @@
pkgname=nss-mdns
pkgver=0.10
pkgrel=4
pkgrel=6
pkgdesc="glibc plugin providing host name resolution via mDNS"
arch=('i686' 'x86_64')
url="http://0pointer.de/lennart/projects/nss-mdns/"
......@@ -13,7 +13,7 @@ license=('lgpl')
depends=('glibc')
makedepends=('pkgconfig')
install=nss-mdns.install
source=("http://0pointer.de/lennart/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz")
source=("http://pkgs.fedoraproject.org/repo/pkgs/nss-mdns/nss-mdns-$pkgver.tar.gz/03938f17646efbb50aa70ba5f99f51d7/nss-mdns-$pkgver.tar.gz")
md5sums=('03938f17646efbb50aa70ba5f99f51d7')
build() {
......
......@@ -5,7 +5,7 @@
pkgname=nss_ldap
pkgver=265
pkgrel=4
pkgrel=5
pkgdesc="The nss_ldap module provides the means for Linux and Solaris workstations to resolve the entities defined in RFC 2307 from LDAP directories."
arch=('x86_64')
url="http://www.padl.com/OSS/nss_ldap.html"
......
......@@ -3,11 +3,11 @@
# Find the kernel name inside the chroot
_extramodules=extramodules-3.2-lts
_kver="$(cat /lib/modules/${_extramodules}/version)"
_kver="$(cat /usr/lib/modules/${_extramodules}/version)"
pkgname=nvidia-173xx-lts
pkgver=173.14.39
pkgrel=2
pkgrel=3
pkgdesc="NVIDIA drivers for linux - LTS package"
arch=('x86_64')
url="http://www.nvidia.com/"
......@@ -25,14 +25,14 @@ build() {
cd "usr/src/nv/"
ln -s Makefile.kbuild Makefile
make SYSSRC=/lib/modules/${_kver}/build module
make SYSSRC=/usr/lib/modules/${_kver}/build module
}
package() {
cd "NVIDIA-Linux-$arch-${pkgver}-pkg0/usr/src/nv/"
mkdir -p $pkgdir//lib/modules/${_extramodules}
install -m644 nvidia.ko $pkgdir/lib/modules/${_extramodules}
mkdir -p $pkgdir/usr/lib/modules/${_extramodules}
install -m644 nvidia.ko $pkgdir/usr/lib/modules/${_extramodules}
install -d -m755 "${pkgdir}/etc/modprobe.d"
sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
gzip "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko"
gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
}
post_install() {
EXTRAMODULES='extramodules-3.2-CHAKRA-LTS'
EXTRAMODULES='extramodules-3.2-lts'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
echo 'In order to use nvidia module, reboot the system.'
echo "blacklist nouveau" > "/etc/modprobe.d/nouveau_blacklist.conf"
}
post_upgrade() {
EXTRAMODULES='extramodules-3.2-CHAKRA-LTS'
EXTRAMODULES='extramodules-3.2-lts'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
echo "blacklist nouveau" > "/etc/modprobe.d/nouveau_blacklist.conf"
}
post_remove() {
EXTRAMODULES='extramodules-3.2-CHAKRA-LTS'
EXTRAMODULES='extramodules-3.2-lts'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
rm "/etc/modprobe.d/nouveau_blacklist.conf"
}
# Maintainer: Neophytos Kolokotronis <tetris4 AT gmail DOT com>
_extramodules=extramodules-3.12.15-CHAKRA
_kver="$(cat /lib/modules/${_extramodules}/version)"
_extramodules=extramodules-3.16-CHAKRA
_kver="$(cat /usr/lib/modules/${_extramodules}/version)"
pkgname=(nvidia-173xx chd-nvidia-173xx)
pkgver=173.14.39
pkgrel=2
pkgrel=3
arch=('x86_64')
url="http://www.nvidia.com/"
makedepends=('linux-headers')
makedepends=('linux-headers>=3.16' 'linux-headers<3.17')
license=('custom')
source=("http://download.nvidia.com/XFree86/Linux-$arch/${pkgver}/NVIDIA-Linux-$arch-${pkgver}-pkg0.run"
"linux-3.14.patch"
"https://gitorious.org/chakra/chakra-hardware-detection/blobs/raw/master/hwdb/nvidia_supported")
md5sums=('0799f194869e40141c7bac8a71762db6'
'6dfb34d8fdf35c1637932f95d2216c46'
'62d0cdb856cfae64753c0f3acf729d47')
build() {
......@@ -22,24 +24,25 @@ build() {
cd NVIDIA-Linux-$arch-${pkgver}-pkg0
cd usr/src/nv/
patch -p1 -i $srcdir/linux-3.14.patch || return 1
ln -s Makefile.kbuild Makefile
make SYSSRC=/lib/modules/${_kver}/build/ module
make SYSSRC=/usr/lib/modules/${_kver}/build/ module
}
package_nvidia-173xx() {
pkgdesc="Legacy NVIDIA drivers for linux."
depends=('linux>=3.12' 'linux<3.13' 'nvidia-173xx-utils')
depends=('linux>=3.16' 'linux<3.17' 'nvidia-173xx-utils')
conflicts=('nvidia-96xx' 'nvidia')
install=nvidia.install
cd $srcdir/"NVIDIA-Linux-$arch-${pkgver}-pkg0/usr/src/nv/"
mkdir -p $pkgdir/lib/modules/${_extramodules}
install -m644 nvidia.ko $pkgdir/lib/modules/${_extramodules}
mkdir -p $pkgdir/usr/lib/modules/${_extramodules}
install -m644 nvidia.ko $pkgdir/usr/lib/modules/${_extramodules}
mkdir -p "${pkgdir}/etc/modprobe.d"
echo "blacklist nouveau" >> $pkgdir/etc/modprobe.d/nouveau_blacklist.conf
sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" $startdir/nvidia.install
# gzip -9 module
gzip "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko"
gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
}
package_chd-nvidia-173xx() {
......
diff -pur 1/conftest.sh 2/conftest.sh
--- 1/conftest.sh 2013-11-28 03:16:46.000000000 +0400
+++ 2/conftest.sh 2014-04-10 09:51:13.880164860 +0400
@@ -992,61 +992,6 @@ compile_test() {
fi
;;
- acpi_os_wait_events_complete)
- #
- # Determine if the acpi_os_wait_events_complete() function
- # is present and how many arguments it takes.
- #
- echo "$CONFTEST_PREAMBLE
- #include <linux/acpi.h>
- void conftest_acpi_os_wait_events_complete(void) {
- acpi_os_wait_events_complete(NULL, NULL);
- }" > conftest$$.c
-
- $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
- rm -f conftest$$.c
-
- if [ -f conftest$$.o ]; then
- rm -f conftest$$.o
- echo "#undef NV_ACPI_OS_WAIT_EVENTS_COMPLETE_PRESENT" >> conftest.h
- return
- fi
-
- echo "$CONFTEST_PREAMBLE
- #include <linux/acpi.h>
- void conftest_acpi_os_wait_events_complete(void) {
- acpi_os_wait_events_complete(NULL);
- }" > conftest$$.c
-
- $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
- rm -f conftest$$.c
-
- if [ -f conftest$$.o ]; then
- rm -f conftest$$.o
- echo "#define NV_ACPI_OS_WAIT_EVENTS_COMPLETE_PRESENT" >> conftest.h
- echo "#define NV_ACPI_OS_WAIT_EVENTS_COMPLETE_ARGUMENT_COUNT 1" >> conftest.h
- return
- fi
-
- echo "$CONFTEST_PREAMBLE
- #include <linux/acpi.h>
- void conftest_acpi_os_wait_events_complete(void) {
- acpi_os_wait_events_complete();
- }" > conftest$$.c
-
- $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
- rm -f conftest$$.c
-
- if [ -f conftest$$.o ]; then
- rm -f conftest$$.o
- echo "#define NV_ACPI_OS_WAIT_EVENTS_COMPLETE_PRESENT" >> conftest.h
- echo "#define NV_ACPI_OS_WAIT_EVENTS_COMPLETE_ARGUMENT_COUNT 0" >> conftest.h
- return
- else
- echo "#error acpi_os_wait_events_complete() conftest failed!" >> conftest.h
- fi
- ;;
-
ioremap_cache)
#
# Determine if the ioremap_cache() function is present.
diff -pur 1/Makefile.kbuild 2/Makefile.kbuild
--- 1/Makefile.kbuild 2013-11-28 03:16:46.000000000 +0400
+++ 2/Makefile.kbuild 2014-04-10 09:50:35.116646401 +0400
@@ -163,7 +163,6 @@ COMPILE_TESTS = \
ioremap_wc \
proc_dir_entry \
acpi_walk_namespace \
- acpi_os_wait_events_complete \
agp_memory \
scatterlist \
file_operations \
diff -pur 1/nvacpi.c 2/nvacpi.c
--- 1/nvacpi.c 2013-11-28 03:16:46.000000000 +0400
+++ 2/nvacpi.c 2014-04-10 10:30:55.538227542 +0400
@@ -14,6 +14,10 @@
#include "os-interface.h"
#include "nv-linux.h"
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) && defined(ACPI_HANDLE)
+#define DEVICE_ACPI_HANDLE(a) ACPI_HANDLE(a)
+#endif
+
#if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED)
/*
@@ -259,8 +263,6 @@ static int nv_acpi_remove(struct acpi_de
if (pNvAcpiObject->notify_handler_installed)
{
- NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
-
// remove event notifier
status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
}
diff -pur 1/nv-linux.h 2/nv-linux.h
--- 1/nv-linux.h 2013-11-28 03:16:46.000000000 +0400
+++ 2/nv-linux.h 2014-04-10 10:21:08.848753758 +0400
@@ -206,8 +206,7 @@ extern int nv_pat_mode;
#endif
#if defined(CONFIG_ACPI)
-#include <acpi/acpi.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
#if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID)
#define NV_LINUX_ACPI_EVENTS_SUPPORTED 1
#endif
@@ -225,19 +224,6 @@ extern int nv_pat_mode;
#error "NV_ACPI_WALK_NAMESPACE_ARGUMENT_COUNT value unrecognized!"
#endif
-#if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED)
-#if defined(KERNEL_2_4) || \
- (NV_ACPI_OS_WAIT_EVENTS_COMPLETE_ARGUMENT_COUNT == 1)
-#define NV_ACPI_OS_WAIT_EVENTS_COMPLETE() \
- acpi_os_wait_events_complete(NULL)
-#elif (NV_ACPI_OS_WAIT_EVENTS_COMPLETE_ARGUMENT_COUNT == 0)
-#define NV_ACPI_OS_WAIT_EVENTS_COMPLETE() \
- acpi_os_wait_events_complete()
-#else
-#error "NV_ACPI_OS_WAIT_EVENTS_COMPLETE_ARGUMENT_COUNT value unrecognized!"
-#endif
-#endif
-
#if defined(CONFIG_PREEMPT_RT)
typedef atomic_spinlock_t nv_spinlock_t;
#define NV_SPIN_LOCK_INIT(lock) atomic_spin_lock_init(lock)
post_install() {
EXTRAMODULES='extramodules-3.12.6-CHAKRA'
EXTRAMODULES='extramodules-3.16-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
echo 'In order to use nvidia module, reboot the system.'
}
post_upgrade() {
EXTRAMODULES='extramodules-3.12.6-CHAKRA'
EXTRAMODULES='extramodules-3.16-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
post_remove() {
EXTRAMODULES='extramodules-3.12.6-CHAKRA'
EXTRAMODULES='extramodules-3.16-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
......@@ -2,7 +2,7 @@
# Find the kernel name inside the chroot
_extramodules=extramodules-3.2-lts
_kver="$(cat /lib/modules/${_extramodules}/version)"
_kver="$(cat /usr/lib/modules/${_extramodules}/version)"
pkgname=nvidia-304xx-lts
pkgver=304.123
......@@ -23,13 +23,13 @@ build() {
cd "${srcdir}"
sh "${_pkg}.run" --extract-only
cd "${_pkg}/kernel"
make SYSSRC=/lib/modules/"${_kver}/build" module
make SYSSRC=/usr/lib/modules/"${_kver}/build" module
}
package() {
install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
"${pkgdir}/lib/modules/${_extramodules}/nvidia.ko"
"${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
install -d -m755 "${pkgdir}/etc/modprobe.d"
sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
gzip "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko"
gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
}
post_install() {
EXTRAMODULES='extramodules-3.2-CHAKRA-LTS'
EXTRAMODULES='extramodules-3.2-lts'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
echo 'In order to use nvidia module, reboot the system.'
echo "blacklist nouveau" > "/etc/modprobe.d/nouveau_blacklist.conf"
}