From d3710b31c38cc0deb61564c73b452cf0665aac2a Mon Sep 17 00:00:00 2001 From: Phil Date: Wed, 3 Aug 2011 00:28:01 +0000 Subject: [PATCH] chakra-hardware-detection: update databases and conf --- chakra-hardware-detection/PKGBUILD | 4 +- .../etc/chakra-hwdetect.conf | 2 +- .../opt/chakra/hwdb/hw_ati_hwdb | 28 ++- .../opt/chakra/hwdb/hw_nvidia173xx_hwdb | 6 +- .../opt/chakra/hwdb/hw_nvidia96xx_hwdb | 8 +- .../opt/chakra/hwdb/hw_nvidia_hwdb | 217 ++---------------- nvidia-lts/PKGBUILD | 6 +- nvidia-utils/PKGBUILD | 8 +- nvidia/PKGBUILD | 6 +- 9 files changed, 66 insertions(+), 219 deletions(-) mode change 100755 => 100644 chakra-hardware-detection/opt/chakra/hwdb/hw_ati_hwdb diff --git a/chakra-hardware-detection/PKGBUILD b/chakra-hardware-detection/PKGBUILD index 1716dc455..67724bcca 100755 --- a/chakra-hardware-detection/PKGBUILD +++ b/chakra-hardware-detection/PKGBUILD @@ -8,8 +8,8 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=chakra-hardware-detection -pkgver=20110710 -pkgrel=2 +pkgver=20110803 +pkgrel=1 pkgdesc="Hardware detection scripts for Chakra" arch=('any') url="http://www.chakra-project.org" diff --git a/chakra-hardware-detection/etc/chakra-hwdetect.conf b/chakra-hardware-detection/etc/chakra-hwdetect.conf index a11d55c73..308e3de17 100755 --- a/chakra-hardware-detection/etc/chakra-hwdetect.conf +++ b/chakra-hardware-detection/etc/chakra-hwdetect.conf @@ -9,7 +9,7 @@ HW_DB_PATH="/opt/chakra/hwdb" # VERSION OF THE "NVIDIA" DRIVER PKG # (keep in sync with postinstall config) -NVIDIA_DRV_VER="275" +NVIDIA_DRV_VER="280" # NVIDIA HW DATABASE FILE NAME NV_DB="hw_nvidia_hwdb" diff --git a/chakra-hardware-detection/opt/chakra/hwdb/hw_ati_hwdb b/chakra-hardware-detection/opt/chakra/hwdb/hw_ati_hwdb old mode 100755 new mode 100644 index e7f4dc7e8..132cf99ba --- a/chakra-hardware-detection/opt/chakra/hwdb/hw_ati_hwdb +++ b/chakra-hardware-detection/opt/chakra/hwdb/hw_ati_hwdb @@ -1,7 +1,7 @@ # Listing generated by fglrx_supported_chakra-20100412. # Do not edit manually. -# Taken for catalyst-10.12 -# (C) 2011 Chakra-Developer-Team +# Taken for catalyst-11.07 +# (C) 2010 Chakra-Developer-Team 0x6700 0x6701 0x6702 @@ -16,6 +16,7 @@ 0x6719 0x671C 0x671D +0x671F 0x6720 0x6721 0x6722 @@ -28,6 +29,7 @@ 0x6729 0x6738 0x6739 +0x673E 0x6740 0x6741 0x6742 @@ -52,6 +54,16 @@ 0x6768 0x6770 0x6779 +0x6798 +0x6799 +0x679A +0x6840 +0x6841 +0x6842 +0x6849 +0x6850 +0x6858 +0x6859 0x6880 0x6888 0x6889 @@ -61,6 +73,7 @@ 0x6890 0x6898 0x6899 +0x689B 0x689C 0x689D 0x689E @@ -72,7 +85,9 @@ 0x68B1 0x68B8 0x68B9 +0x68BA 0x68BE +0x68BF 0x68C0 0x68C1 0x68C7 @@ -248,3 +263,12 @@ 0x9803 0x9804 0x9805 +0x9806 +0x9807 +0x9900 +0x9901 +0x9903 +0x9904 +0x990F +0x9990 +0x9991 diff --git a/chakra-hardware-detection/opt/chakra/hwdb/hw_nvidia173xx_hwdb b/chakra-hardware-detection/opt/chakra/hwdb/hw_nvidia173xx_hwdb index 515027ca4..a82ca3262 100644 --- a/chakra-hardware-detection/opt/chakra/hwdb/hw_nvidia173xx_hwdb +++ b/chakra-hardware-detection/opt/chakra/hwdb/hw_nvidia173xx_hwdb @@ -1,7 +1,7 @@ -# Listing generated by nvidia_supported_chakra-20090930. +# List taken from nvidia-173-modaliases_173.14.27-0ubuntu1 # Do not edit manually. # (C) 2011 Chakra-Developer-Team -# Taken for nvidia-173xx-173.14.28-1 +# 0x0040 0x0041 0x0042 @@ -407,4 +407,4 @@ 0x0870 0x087A 0x087B -0x087F +0x087F \ No newline at end of file diff --git a/chakra-hardware-detection/opt/chakra/hwdb/hw_nvidia96xx_hwdb b/chakra-hardware-detection/opt/chakra/hwdb/hw_nvidia96xx_hwdb index be6411fa6..079b57508 100755 --- a/chakra-hardware-detection/opt/chakra/hwdb/hw_nvidia96xx_hwdb +++ b/chakra-hardware-detection/opt/chakra/hwdb/hw_nvidia96xx_hwdb @@ -1,8 +1,7 @@ -# Listing generated by nvidia_supported_chakra-20090930. +# List taken from nvidia-96-modaliases_96.43.19-0ubuntu1 # Do not edit manually. -# Taken for nvidia-96xx-96.43.19-1 # (C) 2011 Chakra-Developer-Team -# Listing generated by nvidia_supported. Do not edit manually. +# 0x0040 0x0041 0x0042 @@ -273,5 +272,4 @@ 0x03DC 0x03DD 0x03DE -0x03DF - +0x03DF \ No newline at end of file diff --git a/chakra-hardware-detection/opt/chakra/hwdb/hw_nvidia_hwdb b/chakra-hardware-detection/opt/chakra/hwdb/hw_nvidia_hwdb index 839b5787f..eba6de574 100644 --- a/chakra-hardware-detection/opt/chakra/hwdb/hw_nvidia_hwdb +++ b/chakra-hardware-detection/opt/chakra/hwdb/hw_nvidia_hwdb @@ -1,4 +1,4 @@ -# List taken from nvidia-current-modaliases_260.19.29-0ubuntu1~xup~lucid4 +# List taken from nvidia-current-modaliases_280.13-0ubuntu1~lucid~xup1 # Do not edit manually. # (C) 2011 Chakra-Developer-Team # @@ -11,20 +11,15 @@ 0x0046 0x0047 0x0048 -0x0049 -0x004D 0x004E 0x0090 0x0091 0x0092 0x0093 -0x0094 0x0095 0x0098 0x0099 -0x009C 0x009D -0x009E 0x00C0 0x00C1 0x00C2 @@ -53,7 +48,6 @@ 0x0148 0x0149 0x014A -0x014B 0x014C 0x014D 0x014E @@ -69,13 +63,7 @@ 0x0168 0x0169 0x016A -0x016B -0x016C -0x016D -0x016E -0x0190 0x0191 -0x0192 0x0193 0x0194 0x0197 @@ -85,52 +73,29 @@ 0x01D1 0x01D2 0x01D3 -0x01D4 -0x01D5 0x01D6 0x01D7 0x01D8 -0x01D9 0x01DA 0x01DB 0x01DC 0x01DD 0x01DE 0x01DF -0x0210 -0x0211 -0x0212 -0x0215 -0x0218 -0x021D -0x021E -0x0220 0x0221 0x0222 -0x0228 0x0240 0x0241 0x0242 -0x0243 0x0244 0x0245 -0x0246 0x0247 -0x0248 -0x0249 -0x024A -0x024B -0x024C -0x024D -0x024E -0x024F 0x0290 0x0291 0x0292 0x0293 0x0294 0x0295 -0x0296 0x0297 0x0298 0x0299 @@ -155,26 +120,13 @@ 0x0397 0x0398 0x0399 -0x039A -0x039B 0x039C 0x039E 0x03D0 0x03D1 0x03D2 -0x03D3 -0x03D4 0x03D5 0x03D6 -0x03D7 -0x03D8 -0x03D9 -0x03DA -0x03DB -0x03DC -0x03DD -0x03DE -0x03DF 0x0400 0x0401 0x0402 @@ -192,7 +144,6 @@ 0x040E 0x040F 0x0410 -0x0414 0x0420 0x0421 0x0422 @@ -209,43 +160,22 @@ 0x042D 0x042E 0x042F -0x0530 0x0531 -0x0532 0x0533 0x053A 0x053B 0x053E -0x053F 0x05E0 0x05E1 0x05E2 0x05E3 -0x05E4 -0x05E5 0x05E6 0x05E7 -0x05E8 -0x05E9 0x05EA 0x05EB -0x05EC 0x05ED -0x05EE -0x05EF -0x05F0 -0x05F1 -0x05F2 -0x05F3 -0x05F4 -0x05F5 -0x05F6 -0x05F7 0x05F8 0x05F9 -0x05FA -0x05FB -0x05FC 0x05FD 0x05FE 0x05FF @@ -263,7 +193,6 @@ 0x060B 0x060C 0x060D -0x060E 0x060F 0x0610 0x0611 @@ -271,7 +200,6 @@ 0x0613 0x0614 0x0615 -0x0616 0x0617 0x0618 0x0619 @@ -281,41 +209,25 @@ 0x061D 0x061E 0x061F -0x0620 -0x0621 0x0622 0x0623 -0x0624 0x0625 0x0626 0x0627 0x0628 -0x0629 0x062A 0x062B 0x062C 0x062D 0x062E -0x062F -0x0630 0x0631 0x0632 -0x0633 -0x0634 0x0635 -0x0636 0x0637 0x0638 -0x0639 0x063A -0x063B -0x063C -0x063D -0x063E -0x063F 0x0640 0x0641 -0x0642 0x0643 0x0644 0x0645 @@ -326,39 +238,20 @@ 0x064A 0x064B 0x064C -0x064D -0x064E -0x064F -0x0650 0x0651 0x0652 0x0653 0x0654 -0x0655 0x0656 -0x0657 0x0658 0x0659 0x065A 0x065B 0x065C -0x065D -0x065E -0x065F 0x06C0 -0x06C1 -0x06C2 -0x06C3 0x06C4 -0x06C5 -0x06C6 -0x06C7 -0x06C8 -0x06C9 0x06CA -0x06CB 0x06CD -0x06D0 0x06D1 0x06D2 0x06D8 @@ -382,7 +275,6 @@ 0x06EB 0x06EC 0x06EF -0x06F0 0x06F1 0x06F8 0x06F9 @@ -394,22 +286,7 @@ 0x07E1 0x07E2 0x07E3 -0x07E4 0x07E5 -0x07E6 -0x07E7 -0x07E8 -0x07E9 -0x07EA -0x07EB -0x07EC -0x07ED -0x07EE -0x07EF -0x0840 -0x0841 -0x0842 -0x0843 0x0844 0x0845 0x0846 @@ -421,22 +298,6 @@ 0x084C 0x084D 0x084F -0x0850 -0x0851 -0x0852 -0x0853 -0x0854 -0x0855 -0x0856 -0x0857 -0x0858 -0x0859 -0x085A -0x085B -0x085C -0x085D -0x085E -0x085F 0x0860 0x0861 0x0862 @@ -446,9 +307,7 @@ 0x0866 0x0867 0x0868 -0x0869 0x086A -0x086B 0x086C 0x086D 0x086E @@ -459,41 +318,27 @@ 0x0873 0x0874 0x0876 -0x0877 0x087A -0x087B 0x087D 0x087E 0x087F -0x08A0 -0x08A1 -0x08A2 -0x08A3 -0x08A4 0x08A5 -0x08B0 -0x08B1 -0x08B2 -0x08B3 0x0A20 -0x0A21 0x0A22 0x0A23 +0x0A26 +0x0A27 0x0A28 0x0A29 0x0A2A 0x0A2B 0x0A2C 0x0A2D -0x0A30 0x0A34 0x0A35 0x0A38 0x0A3C -0x0A3D -0x0A3F 0x0A60 -0x0A61 0x0A62 0x0A63 0x0A64 @@ -512,56 +357,34 @@ 0x0A73 0x0A74 0x0A75 -0x0A76 0x0A78 -0x0A79 0x0A7A 0x0A7C -0x0A7D -0x0A7E -0x0A7F 0x0CA0 0x0CA2 0x0CA3 0x0CA4 -0x0CA5 0x0CA7 0x0CA8 0x0CA9 0x0CAC -0x0CAD -0x0CAE 0x0CAF 0x0CB0 0x0CB1 0x0CBC 0x0DC0 -0x0DC1 -0x0DC2 0x0DC4 -0x0DC5 -0x0DC6 -0x0DCA -0x0DCC 0x0DCD -0x0DCE -0x0DCF -0x0DD0 0x0DD1 0x0DD2 -0x0DD3 0x0DD6 0x0DD8 0x0DDA -0x0DDE -0x0DDF 0x0DE0 0x0DE1 0x0DE2 -0x0DEA -0x0DEB +0x0DE5 0x0DEC -0x0DED 0x0DEE 0x0DF0 0x0DF1 @@ -573,32 +396,34 @@ 0x0DF7 0x0DF8 0x0DFA -0x0DFE -0x0DFF -0x0E21 0x0E22 0x0E23 0x0E24 -0x0E25 -0x0E28 0x0E30 0x0E31 -0x0E32 -0x0E38 0x0E3A 0x0E3B -0x0E3E -0x0E3F +0x1040 +0x1050 +0x1055 +0x1056 0x1080 0x1081 0x1082 -0x1083 -0x1084 -0x1086 -0x1098 +0x1088 +0x1091 +0x1094 +0x1096 0x109A -0x10C0 +0x109B 0x10C3 -0x10C4 0x10C5 0x10D8 +0x1200 +0x1201 +0x1210 +0x1211 +0x1241 +0x1244 +0x1245 +0x1251 diff --git a/nvidia-lts/PKGBUILD b/nvidia-lts/PKGBUILD index 6cf9a5a52..747ba752b 100644 --- a/nvidia-lts/PKGBUILD +++ b/nvidia-lts/PKGBUILD @@ -8,7 +8,7 @@ _kernver="2.6.35-CHAKRA-LTS" pkgname=nvidia-lts -pkgver=275.21 +pkgver=280.13 pkgrel=1 pkgdesc="NVIDIA drivers for kernel26." arch=('i686' 'x86_64') @@ -23,12 +23,12 @@ if [ "$CARCH" = "i686" ]; then ARCH='x86' _pkg="NVIDIA-Linux-${ARCH}-${pkgver}" source=("http://us.download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run") - md5sums=('8c0b4392c9222023d0827e2743c42d40') + md5sums=('c3992c8cef02b7773a398640d8830e77') elif [ "$CARCH" = "x86_64" ]; then ARCH='x86_64' _pkg="NVIDIA-Linux-${ARCH}-${pkgver}-no-compat32" source=("http://us.download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run") - md5sums=('7568cd7a34634506bdfef9d9887de7ec') + md5sums=('05e62b61feb34bf412f83ca1074e1917') fi build() { diff --git a/nvidia-utils/PKGBUILD b/nvidia-utils/PKGBUILD index 1a6b73272..18c9bae2c 100644 --- a/nvidia-utils/PKGBUILD +++ b/nvidia-utils/PKGBUILD @@ -5,8 +5,8 @@ # maintainer (x86_64): Manuel Tortosa pkgname=('nvidia-utils') -pkgver=275.21 -pkgrel=2 +pkgver=280.13 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.nvidia.com/" license=('custom') @@ -24,12 +24,12 @@ if [ "$CARCH" = "i686" ]; then ARCH='x86' _pkg="NVIDIA-Linux-${ARCH}-${pkgver}" source=("http://us.download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run") - md5sums=('8c0b4392c9222023d0827e2743c42d40') + md5sums=('c3992c8cef02b7773a398640d8830e77') elif [ "$CARCH" = "x86_64" ]; then ARCH='x86_64' _pkg="NVIDIA-Linux-${ARCH}-${pkgver}-no-compat32" source=("http://us.download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run") - md5sums=('7568cd7a34634506bdfef9d9887de7ec') + md5sums=('05e62b61feb34bf412f83ca1074e1917') fi source[1]='20-nvidia.conf' diff --git a/nvidia/PKGBUILD b/nvidia/PKGBUILD index 79adadd98..0cf1d3a97 100644 --- a/nvidia/PKGBUILD +++ b/nvidia/PKGBUILD @@ -8,7 +8,7 @@ _kernver=`pacman -Q kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA pkgname=nvidia -pkgver=275.21 +pkgver=280.13 pkgrel=1 pkgdesc="NVIDIA drivers for kernel26." arch=('i686' 'x86_64') @@ -23,12 +23,12 @@ if [ "$CARCH" = "i686" ]; then ARCH='x86' _pkg="NVIDIA-Linux-${ARCH}-${pkgver}" source=("http://us.download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run") - md5sums=('8c0b4392c9222023d0827e2743c42d40') + md5sums=('c3992c8cef02b7773a398640d8830e77') elif [ "$CARCH" = "x86_64" ]; then ARCH='x86_64' _pkg="NVIDIA-Linux-${ARCH}-${pkgver}-no-compat32" source=("http://us.download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run") - md5sums=('7568cd7a34634506bdfef9d9887de7ec') + md5sums=('05e62b61feb34bf412f83ca1074e1917') fi build() { -- GitLab