Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Sukneet Basuta (9fec43f0bb2bcf0515c7be571ad79879c76002a4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Sukneet Basuta <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Sukneet Basuta (9fec43f0bb2bcf0515c7be571ad79879c76002a4)
  • Date: Wed, 17 Mar 2010 00:48:32 -0500

GIT changes to master z-rejected grimoire by Sukneet Basuta
<sukneet AT sourcemage.org>:

z-kernels/nvidia_driver/DETAILS | 4 -
z-kernels/nvidia_driver/HISTORY | 5 +
z-kernels/nvidia_driver/PRE_BUILD | 8 --
z-kernels/nvidia_driver/nvidia-195-2.6.33.patch | 78
------------------------
4 files changed, 9 insertions(+), 86 deletions(-)

New commits:
commit 9fec43f0bb2bcf0515c7be571ad79879c76002a4
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

nvidia_driver: beta => 195.36.15

diff --git a/z-kernels/nvidia_driver/DETAILS b/z-kernels/nvidia_driver/DETAILS
index f0fe2f0..c9bf317 100755
--- a/z-kernels/nvidia_driver/DETAILS
+++ b/z-kernels/nvidia_driver/DETAILS
@@ -1,7 +1,7 @@
. $GRIMOIRE/FUNCTIONS
SPELL=nvidia_driver
if [[ $NVIDIA_BETA == y ]]; then
- VERSION=195.30
+ VERSION=195.36.15
else
VERSION=190.53
fi
@@ -9,7 +9,7 @@ case "${SMGL_COMPAT_ARCHS[1]}" in
x86_64)
SOURCE=NVIDIA-Linux-x86_64-$VERSION-pkg2.run
if [[ $NVIDIA_BETA == y ]]; then
-
SOURCE_HASH=sha512:6071a757cc7ff460073e83674033d6ef4d111b1bef1c1511e73663e98583f982b11dbf0e1a5d0cfd1a60ea0606fad4b389b619bcbad279b244a2c8a9d39895d8
+
SOURCE_HASH=sha512:910d3f6703222177a27125fdba353d10a0df3cb0cd5ca872cc8739caeeb9847a6ab3aacd5a5c8b4ee1092bbcdde05ec825df1f547eca1f3f47bc85502ae939d7
else

SOURCE_HASH=sha512:84ac7ef4a62fc17879e43c9fdd3298805bd7e32f36975c79e52e04c5d4c1cfda46e5ed875d695cc7c6a3cfaacde1ab0fbf07a1bc8ca61100a6fcc5e03728cbb3
fi
diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index 7dc8863..4a75e6b 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,8 @@
+2010-03-17 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated beta to 195.36.15
+ * PRE_BUILD: changed kernel version check (to apply patch) so it is
more robust
+ * nvidia-195-2.6.33.patch: removed, no longer needed
+
2010-03-14 Julien "_kaze_" ROZO <julien AT rozo.org>
* INSTALL: fixed vdpau libs installation

diff --git a/z-kernels/nvidia_driver/PRE_BUILD
b/z-kernels/nvidia_driver/PRE_BUILD
index 6841d45..731a794 100755
--- a/z-kernels/nvidia_driver/PRE_BUILD
+++ b/z-kernels/nvidia_driver/PRE_BUILD
@@ -37,11 +37,7 @@ cd $SOURCE_DIRECTORY/usr/src/nv &&
ln -sfn Makefile.kbuild Makefile &&

# patch for 2.6.33 kernel
-if [[ "$(get_kernel_version|cut -d. -f3)" == "33" ]]; then
+if [[ "$(get_kernel_version|cut -c5-6)" == "33" ]] && [[ "$NVIDIA_BETA" ==
"n" ]]; then
cd $SOURCE_DIRECTORY &&
- if [[ "$NVIDIA_BETA" == "y" ]]; then
- patch -p0 < $SCRIPT_DIRECTORY/nvidia-195-2.6.33.patch
- else
- patch -p0 < $SCRIPT_DIRECTORY/nvidia-190-2.6.33.patch
- fi
+ patch -p0 < $SCRIPT_DIRECTORY/nvidia-190-2.6.33.patch
fi
diff --git a/z-kernels/nvidia_driver/nvidia-195-2.6.33.patch
b/z-kernels/nvidia_driver/nvidia-195-2.6.33.patch
deleted file mode 100644
index c5b2735..0000000
--- a/z-kernels/nvidia_driver/nvidia-195-2.6.33.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Index: usr/src/nv/conftest.sh
-===================================================================
---- usr/src/nv/conftest.sh
-+++ usr/src/nv/conftest.sh 2010-01-14 06:15:40.000000000 +0530
-@@ -33,14 +33,14 @@
- # CONFIG_XEN and CONFIG_PARAVIRT are present, text_xen() treats
- # the kernel as a stand-alone kernel.
- #
-- FILE="linux/autoconf.h"
-+ FILE="generated/autoconf.h"
-
- if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
- #
- # We are looking at a configured source tree; verify
- # that it's not a Xen kernel.
- #
-- echo "#include <linux/autoconf.h>
-+ echo "#include <generated/autoconf.h>
- #if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT)
- #error CONFIG_XEN defined!
- #endif
-@@ -110,7 +110,7 @@
- fi
- }
-
--CONFTEST_PREAMBLE="#include <linux/autoconf.h>
-+CONFTEST_PREAMBLE="#include <generated/autoconf.h>
- #if defined(CONFIG_XEN) && \
- defined(CONFIG_XEN_INTERFACE_VERSION) &&
!defined(__XEN_INTERFACE_VERSION__)
- #define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION
-@@ -1305,10 +1305,10 @@
- RET=1
- FILE=""
-
-- if [ -f $HEADERS/linux/utsrelease.h ]; then
-- FILE="$HEADERS/linux/utsrelease.h"
-- elif [ -f $OUTPUT/include/linux/utsrelease.h ]; then
-- FILE="$OUTPUT/include/linux/utsrelease.h"
-+ if [ -f $HEADERS/generated/utsrelease.h ]; then
-+ FILE="$HEADERS/generated/utsrelease.h"
-+ elif [ -f $OUTPUT/include/generated/utsrelease.h ]; then
-+ FILE="$OUTPUT/include/generated/utsrelease.h"
- elif [ -f $HEADERS/linux/version.h ]; then
- FILE="$HEADERS/linux/version.h"
- elif [ -f $OUTPUT/include/linux/version.h ]; then
-@@ -1365,7 +1365,7 @@
- #
- RET=1
- VERBOSE=$7
-- FILE="linux/autoconf.h"
-+ FILE="generated/autoconf.h"
-
- if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
- #
-@@ -1419,7 +1419,7 @@
- #
- RET=1
- VERBOSE=$7
-- FILE="linux/autoconf.h"
-+ FILE="generated/autoconf.h"
-
- if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
- #
-Index: usr/src/nv/nvacpi.c
-===================================================================
---- usr/src/nv/nvacpi.c
-+++ usr/src/nv/nvacpi.c 2010-01-14 06:09:00.000000000 +0530
-@@ -48,6 +48,10 @@
- };
- #endif
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
-+#define acpi_walk_namespace(a,b,c,d,e,f)
acpi_walk_namespace(a,b,c,d,e,f,NULL)
-+#endif
-+
- static struct acpi_driver *nv_acpi_driver;
- static acpi_handle nvif_handle = NULL;
- static acpi_handle dsm_handle = NULL;



  • [SM-Commit] GIT changes to master z-rejected grimoire by Sukneet Basuta (9fec43f0bb2bcf0515c7be571ad79879c76002a4), Sukneet Basuta, 03/17/2010

Archive powered by MHonArc 2.6.24.

Top of Page