From 0009ee8bd62f6140077c0c468bccdd229638c5c0 Mon Sep 17 00:00:00 2001 From: Manuel Date: Mon, 20 May 2013 17:37:21 +0000 Subject: [PATCH] New kernel --- catalyst-legacy/PKGBUILD | 4 ++-- catalyst-legacy/catalyst.install | 2 +- catalyst-utils/PKGBUILD | 6 +++--- catalyst/PKGBUILD | 4 +--- catalyst/catalyst.install | 2 +- madwifi/PKGBUILD | 3 +-- nvidia-bumblebee/PKGBUILD | 4 ++-- nvidia-bumblebee/nvidia.install | 6 +++--- nvidia/PKGBUILD | 2 -- nvidia/conftest_new.diff | 11 ----------- 10 files changed, 14 insertions(+), 30 deletions(-) delete mode 100644 nvidia/conftest_new.diff diff --git a/catalyst-legacy/PKGBUILD b/catalyst-legacy/PKGBUILD index 7307f79f8..e6152a56d 100644 --- a/catalyst-legacy/PKGBUILD +++ b/catalyst-legacy/PKGBUILD @@ -1,7 +1,7 @@ # # Chakra Packages for Chakra, part of chakra-project.org -_kernver="3.9.0-1-CHAKRA" +_kernver="3.9.2-1-CHAKRA" pkgname=('catalyst-legacy' 'chd-catalyst-legacy') pkgver=13.1 @@ -24,7 +24,7 @@ md5sums=('c07fd1332abe4c742a9a0d0e0d0a90de' '9adef6e20662d5e486e15bc5ec40751f' '83b8d2063458cc9e8b6679567b280e36' 'cff482b58c9090a66cb82159a2170654' - '37c100cc9e5cc5e8233a72d5e53487ff') + 'cbb8c2f388a8ad617656c412e3a6690f') build() { diff --git a/catalyst-legacy/catalyst.install b/catalyst-legacy/catalyst.install index 92e2a75f3..18a5d0557 100644 --- a/catalyst-legacy/catalyst.install +++ b/catalyst-legacy/catalyst.install @@ -1,5 +1,5 @@ -KERNEL_VERSION=3.9.0-1-CHAKRA +KERNEL_VERSION=3.9.2-1-CHAKRA remove_hook(){ diff --git a/catalyst-utils/PKGBUILD b/catalyst-utils/PKGBUILD index 667e72c05..566a79e18 100644 --- a/catalyst-utils/PKGBUILD +++ b/catalyst-utils/PKGBUILD @@ -6,7 +6,7 @@ pkgname=catalyst-utils # Edit chakra-hardware-detection/hooks/hwdetect_7_graphics on version jump from 1x.x pkgver=13.4 pkgrel=1 -_amdver=9.012 +_amdver=12.104 pkgdesc="AMD/ATI Catalyst drivers utilities and libraries." arch=('x86_64') url="http://www.amd.com/us/Pages/AMDHomePage.aspx" @@ -14,8 +14,8 @@ license=('custom') depends=('xorg-server>=1.11.0' 'xorg-server<1.13.0' 'netkit-bsd-finger' 'libxrandr' 'libsm' 'fontconfig' 'libxcursor' 'libxi' 'gcc-libs' 'libxinerama') optdepends=('qt: to run ATi Catalyst Control Center (amdcccle)' 'libxxf86vm: to run ATi Catalyst Control Center (amdcccle)') -conflicts=('catalyst-test' 'nvidia-utils' 'libgl' 'catalystpxp-utils' 'catalyst-legacy-utils') -provides=('libgl' "libatical=${pkgver}") +conflicts=('catalyst-test' 'nvidia-utils' 'libgl' 'libcl' 'catalystpxp-utils' 'catalyst-legacy-utils') +provides=('libgl' 'libcl' "libatical=${pkgver}") install=${pkgname}.install source=( diff --git a/catalyst/PKGBUILD b/catalyst/PKGBUILD index 54dc45e47..4b6460898 100644 --- a/catalyst/PKGBUILD +++ b/catalyst/PKGBUILD @@ -1,9 +1,7 @@ # # Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas[at]chakra-project[dot]org> -_kernver="3.9.0-1-CHAKRA" +_kernver="3.9.2-1-CHAKRA" pkgname=(catalyst chd-catalyst) pkgver=13.4 diff --git a/catalyst/catalyst.install b/catalyst/catalyst.install index 92e2a75f3..18a5d0557 100644 --- a/catalyst/catalyst.install +++ b/catalyst/catalyst.install @@ -1,5 +1,5 @@ -KERNEL_VERSION=3.9.0-1-CHAKRA +KERNEL_VERSION=3.9.2-1-CHAKRA remove_hook(){ diff --git a/madwifi/PKGBUILD b/madwifi/PKGBUILD index 771aa9c2e..6731cdd61 100644 --- a/madwifi/PKGBUILD +++ b/madwifi/PKGBUILD @@ -1,6 +1,5 @@ # # Chakra Packages for Chakra, part of chakra-project.org -# _extramodules=extramodules-3.9-CHAKRA _kver="$(cat /lib/modules/${_extramodules}/version)" @@ -13,7 +12,7 @@ arch=('x86_64') license=('GPL') url="http://madwifi-project.org" depends=('madwifi-utils' 'linux>=3.9' 'linux<3.10') -makedepends=('linux-headers' 'sharutils') +makedepends=('linux-headers' 'sharutils' 'subversion') install=madwifi-ng.install # subversion source: svn checkout http:/madwifi-project.org/svn/madwifi/trunk madwifi source=(http://chakra.sourceforge.net/sources/madwifi/madwifi-${pkgver}.tar.gz) diff --git a/nvidia-bumblebee/PKGBUILD b/nvidia-bumblebee/PKGBUILD index 1289bd86d..d76d88a28 100644 --- a/nvidia-bumblebee/PKGBUILD +++ b/nvidia-bumblebee/PKGBUILD @@ -6,8 +6,8 @@ pkgname=nvidia-bumblebee pkgver=313.30 pkgrel=1 -_kernver='3.9.0-1-CHAKRA' -_extramodules='extramodules-3.8-CHAKRA' +_kernver='3.9.2-1-CHAKRA' +_extramodules='extramodules-3.9-CHAKRA' pkgdesc="NVIDIA drivers for linux. Packaged for Bumblebee" arch=('x86_64') url="http://www.nvidia.com/" diff --git a/nvidia-bumblebee/nvidia.install b/nvidia-bumblebee/nvidia.install index c341abef7..27d988f15 100644 --- a/nvidia-bumblebee/nvidia.install +++ b/nvidia-bumblebee/nvidia.install @@ -1,15 +1,15 @@ post_install() { - EXTRAMODULES='extramodules-3.8-CHAKRA' + EXTRAMODULES='extramodules-3.9-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) #echo 'In order to use nvidia module, reboot the system.' } post_upgrade() { - EXTRAMODULES='extramodules-3.8-CHAKRA' + EXTRAMODULES='extramodules-3.9-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.8-CHAKRA' + EXTRAMODULES='extramodules-3.9-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/nvidia/PKGBUILD b/nvidia/PKGBUILD index 0e23f02c3..8fdb91a61 100644 --- a/nvidia/PKGBUILD +++ b/nvidia/PKGBUILD @@ -1,7 +1,5 @@ # # Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas@chakra-project.org _extramodules=extramodules-3.9-CHAKRA _kver=$(cat /lib/modules/${_extramodules}/version) diff --git a/nvidia/conftest_new.diff b/nvidia/conftest_new.diff deleted file mode 100644 index b75666521..000000000 --- a/nvidia/conftest_new.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/NVIDIA-Linux-x86_64-313.18-no-compat32/kernel/conftest.sh 2013-02-04 15:10:20.669633666 -0500 -+++ b/NVIDIA-Linux-x86_64-313.18-no-compat32/kernel/conftest.sh 2013-02-04 15:10:34.283334673 -0500 -@@ -1701,7 +1701,7 @@ - SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3) - - if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ -- -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then -+ -a -n "$SUBLEVEL" -a $SUBLEVEL -le 6 ]; then - SELECTED_MAKEFILE=Makefile.kbuild - RET=0 - fi