[SM-Commit] GIT changes to master z-rejected grimoire by Vlad Glagolev (68d30e973a6ab30c03e8d9a060f2897f233be622)

Vlad Glagolev scm at sourcemage.org
Fri Mar 19 18:17:49 EDT 2010


GIT changes to master z-rejected grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 z-kernels/nvidia_driver/HISTORY                 |    2 
 z-kernels/nvidia_driver/PRE_BUILD               |    8 --
 z-kernels/nvidia_driver/nvidia-190-2.6.33.patch |   91 ------------------------
 3 files changed, 3 insertions(+), 98 deletions(-)

New commits:
commit 68d30e973a6ab30c03e8d9a060f2897f233be622
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    nvidia_driver: removed useless patch

diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index d2c380b..0240124 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,5 +1,7 @@
 2010-03-20 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated stable to 195.36.15
+	* PRE_BUILD: don't apply the patch
+	* nvidia-195-2.6.33.patch: really removed, no longer needed
 
 2010-03-17 Sukneet Basuta <sukneet at sourcemage.org>
 	* DETAILS: updated beta to 195.36.15
diff --git a/z-kernels/nvidia_driver/PRE_BUILD b/z-kernels/nvidia_driver/PRE_BUILD
index 731a794..0191024 100755
--- a/z-kernels/nvidia_driver/PRE_BUILD
+++ b/z-kernels/nvidia_driver/PRE_BUILD
@@ -34,10 +34,4 @@ sedit  's:depmod -ae:& \$(KERNEL_UNAME):'  usr/src/nv/Makefile.kbuild  &&
 # Setup Makefile symlink
 #
 cd  $SOURCE_DIRECTORY/usr/src/nv     &&
-ln  -sfn  Makefile.kbuild  Makefile  &&
-
-# patch for 2.6.33 kernel
-if [[ "$(get_kernel_version|cut -c5-6)" == "33" ]] && [[ "$NVIDIA_BETA" == "n" ]]; then
-    cd  $SOURCE_DIRECTORY  &&
-    patch -p0 < $SCRIPT_DIRECTORY/nvidia-190-2.6.33.patch
-fi
+ln  -sfn  Makefile.kbuild  Makefile
diff --git a/z-kernels/nvidia_driver/nvidia-190-2.6.33.patch b/z-kernels/nvidia_driver/nvidia-190-2.6.33.patch
deleted file mode 100644
index 39ef468..0000000
--- a/z-kernels/nvidia_driver/nvidia-190-2.6.33.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Index: usr/src/nv/conftest.sh
-===================================================================
---- usr/src/nv/conftest.sh	
-+++ usr/src/nv/conftest.sh	2010-01-06 12:10:56.000000000 +0530
-@@ -32,14 +32,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
-@@ -111,7 +111,12 @@
-     fi
- }
- 
--CONFTEST_PREAMBLE="#include <linux/autoconf.h>
-+CONFTEST_PREAMBLE="#include <linux/version.h>
-+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+    #include <generated/autoconf.h>
-+    #else
-+    #include <linux/autoconf.h>
-+    #endif
-     #if defined(CONFIG_XEN) && \
-         defined(CONFIG_XEN_INTERFACE_VERSION) &&  !defined(__XEN_INTERFACE_VERSION__)
-     #define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION
-@@ -1294,7 +1299,7 @@
-                 echo "";
-             fi
-         fi
--        exit $RET
-+#        exit $RET
-     ;;
- 
-     get_uname)
-@@ -1316,11 +1321,11 @@
-             # tree or at headers shipped for a specific kernel.
-             # Determine the kernel version using a compile check.
-             #
--            FILE="linux/utsrelease.h"
-+            FILE="generated/utsrelease.h"
- 
-             if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
-                 echo "$CONFTEST_PREAMBLE
--                #include <linux/utsrelease.h>
-+                #include <generated/utsrelease.h>
-                 int main() {
-                     printf(\"%s\", UTS_RELEASE);
-                     return 0;
-@@ -1375,7 +1380,7 @@
-         #
-         RET=1
-         VERBOSE=$6
--        FILE="linux/autoconf.h"
-+        FILE="generated/autoconf.h"
- 
-         if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
-             #
-@@ -1429,7 +1434,7 @@
-         #
-         RET=1
-         VERBOSE=$6
--        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-06 12:10:56.000000000 +0530
-@@ -49,6 +49,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,NULL,e,f)
-+#endif
-+
- static struct acpi_driver *nv_acpi_driver;
- static acpi_handle nvif_handle = NULL;
- static acpi_handle dsm_handle  = NULL;



More information about the SM-Commit mailing list