Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Julien ROZO (909d9193e7a1f5aa5570eeedecf47cac7e0be51b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Julien ROZO (909d9193e7a1f5aa5570eeedecf47cac7e0be51b)
  • Date: Fri, 12 Mar 2010 14:27:36 -0600

GIT changes to master z-rejected grimoire by Julien ROZO <julien AT rozo.org>:

z-kernels/nvidia_driver/HISTORY | 6 +
z-kernels/nvidia_driver/INSTALL | 83 +++++++++++++++++++++
z-kernels/nvidia_driver/PRE_BUILD | 12 ++-
z-kernels/nvidia_driver/nvidia-190-2.6.33.patch | 91
++++++++++++++++++++++++
z-kernels/nvidia_driver/nvidia-195-2.6.33.patch | 78 ++++++++++++++++++++
5 files changed, 269 insertions(+), 1 deletion(-)

New commits:
commit 909d9193e7a1f5aa5570eeedecf47cac7e0be51b
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

nvidia_driver: added installation of libs and headers for cuda and vdpau
and installation of libs and headers for OpenCL for beta version
added patches to fix compilation issue with 2.6.33 kernel

diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index 15ea026..ce80303 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,9 @@
+2010-03-12 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * INSTALL: added installation of libs and headers for cuda and vdpau,
+ and installation of libs and headers for OpenCL for beta version
+ * PRE_BUILD, nvidia-190-2.6.33.patch, nvidia-195-2.6.33.patch: added
patches
+ to fix compilation issue with 2.6.33 kernel
+
2009-12-23 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated beta version to 195.30

diff --git a/z-kernels/nvidia_driver/INSTALL b/z-kernels/nvidia_driver/INSTALL
index 88c5ad3..c234dfc 100755
--- a/z-kernels/nvidia_driver/INSTALL
+++ b/z-kernels/nvidia_driver/INSTALL
@@ -102,6 +102,89 @@ popd &&
popd

#
+# Install Cuda headers
+#
+pushd $SOURCE_DIRECTORY/usr/include/cuda &&
+mkdir -vp $INSTALL_ROOT/usr/include/cuda
+for file in cudaGL.h cuda.h; do
+ install -v -m 0644 -o root -g root $file
$INSTALL_ROOT/usr/include/cuda/
+done &&
+popd &&
+
+#
+# Install Cuda libraries
+#
+pushd $SOURCE_DIRECTORY/usr/lib &&
+for lib in libcuda.so.${VERSION/-/.}; do
+ install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib
+done &&
+ #
+ # Setup symlinks
+ #
+ pushd $INSTALL_ROOT/usr/lib &&
+ ln -sfn libcuda.so.${VERSION/-/.} libcuda.so.1 &&
+ ln -sfn libcuda.so.1 libcuda.so &&
+ popd &&
+popd &&
+
+#
+# Install VDPAU headers
+#
+pushd $SOURCE_DIRECTORY/usr/include/vdpau &&
+mkdir -vp $INSTALL_ROOT/usr/include/vdpau
+for file in vdpau.h vdpau_x11.h; do
+ install -v -m 0644 -o root -g root $file
$INSTALL_ROOT/usr/include/vdpau/
+done &&
+popd &&
+
+#
+# Install VDPAU libraries
+#
+pushd $SOURCE_DIRECTORY/usr/lib/vdpau &&
+mkdir -vp $INSTALL_ROOT/usr/lib/vdpau
+for lib in libvdpau_nvidia.so.${VERSION/-/.}
libvdpau_trace.so.${VERSION/-/.}; do
+ install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib/vdpau/
+done &&
+ #
+ # Setup symlinks
+ #
+ pushd $INSTALL_ROOT/usr/lib &&
+ ln -sfn libvdpau_nvidia.so.${VERSION/-/.} libvdpau_nvidia.so.1
&&
+ ln -sfn libvdpau_nvidia.so.1 libvdpau_nvidia.so
&&
+ ln -sfn libvdpau_trace.so.${VERSION/-/.} libvdpau_trace.so.1
&&
+ ln -sfn libvdpau_trace.so.1 libvdpau_trace.so
&&
+ popd &&
+popd &&
+
+#
+# Install OpenCL headers
+#
+if [[ "$NVIDIA_BETA" == "y" ]]; then
+pushd $SOURCE_DIRECTORY/usr/include/CL &&
+mkdir -vp $INSTALL_ROOT/usr/include/CL
+for file in cl_gl.h cl.h cl_platform.h; do
+ install -v -m 0644 -o root -g root $file $INSTALL_ROOT/usr/include/CL/
+done &&
+popd &&
+
+#
+# Install OpenCL libraries
+#
+pushd $SOURCE_DIRECTORY/usr/lib &&
+for lib in libOpenCL.so.1.0.0; do
+ install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib/
+done &&
+ #
+ # Setup symlinks
+ #
+ pushd $INSTALL_ROOT/usr/lib &&
+ ln -sfn libOpenCL.so.1.0.0 libOpenCL.so.1 &&
+ ln -sfn libOpenCL.so.1 libOpenCL.so &&
+ popd &&
+popd
+fi &&
+
+#
# Install Freedesktop.org spec
#
install -m 0644 -o root -g root \
diff --git a/z-kernels/nvidia_driver/PRE_BUILD
b/z-kernels/nvidia_driver/PRE_BUILD
index 0191024..6841d45 100755
--- a/z-kernels/nvidia_driver/PRE_BUILD
+++ b/z-kernels/nvidia_driver/PRE_BUILD
@@ -34,4 +34,14 @@ 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
+ln -sfn Makefile.kbuild Makefile &&
+
+# patch for 2.6.33 kernel
+if [[ "$(get_kernel_version|cut -d. -f3)" == "33" ]]; 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
+fi
diff --git a/z-kernels/nvidia_driver/nvidia-190-2.6.33.patch
b/z-kernels/nvidia_driver/nvidia-190-2.6.33.patch
new file mode 100644
index 0000000..39ef468
--- /dev/null
+++ b/z-kernels/nvidia_driver/nvidia-190-2.6.33.patch
@@ -0,0 +1,91 @@
+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;
diff --git a/z-kernels/nvidia_driver/nvidia-195-2.6.33.patch
b/z-kernels/nvidia_driver/nvidia-195-2.6.33.patch
new file mode 100644
index 0000000..c5b2735
--- /dev/null
+++ b/z-kernels/nvidia_driver/nvidia-195-2.6.33.patch
@@ -0,0 +1,78 @@
+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 Julien ROZO (909d9193e7a1f5aa5570eeedecf47cac7e0be51b), Julien ROZO, 03/12/2010

Archive powered by MHonArc 2.6.24.

Top of Page