Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (ee37e0cfc7c1237828386daecc7a22e590f2368b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (ee37e0cfc7c1237828386daecc7a22e590f2368b)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (ee37e0cfc7c1237828386daecc7a22e590f2368b)
  • Date: Sat, 7 Sep 2013 06:46:22 -0500
GIT changes to master z-rejected grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

z-kernels/nvidia_driver/BUILD | 10 +++++++---
z-kernels/nvidia_driver/DETAILS | 16 ++++++++--------
z-kernels/nvidia_driver/HISTORY | 6 ++++++
z-kernels/nvidia_driver/INSTALL | 11 ++++++++---
z-kernels/nvidia_driver/PRE_BUILD | 16 +++++++++-------
z-kernels/nvidia_driver/linux-3.11.patch | 14 ++++++++++++++
6 files changed, 52 insertions(+), 21 deletions(-)

New commits:
commit ee37e0cfc7c1237828386daecc7a22e590f2368b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

z-kernels/nvidia_driver: versions 319.49 and 325.15

diff --git a/z-kernels/nvidia_driver/BUILD b/z-kernels/nvidia_driver/BUILD
index 823f85b..98b7348 100755
--- a/z-kernels/nvidia_driver/BUILD
+++ b/z-kernels/nvidia_driver/BUILD
@@ -1,9 +1,13 @@
local KVER &&
KVER=$(get_kernel_version) &&

-pushd $SOURCE_DIRECTORY/kernel &&
+if [[ "$NVIDIA_BETA" == "n" ]]; then
+ MAKEFILE=Makefile.kbuild
+else
+ MAKEFILE=Makefile
+fi &&
+cd $SOURCE_DIRECTORY/kernel &&
make KERNEL_MODLIB=$INSTALL_ROOT/lib/modules/$KVER \
KERNEL_UNAME=$KVER \
SYSSRC=$INSTALL_ROOT/lib/modules/$KVER/source \
- -f Makefile.kbuild module &&
-popd
+ -f $MAKEFILE module
diff --git a/z-kernels/nvidia_driver/DETAILS b/z-kernels/nvidia_driver/DETAILS
index 13ca579..13d0d31 100755
--- a/z-kernels/nvidia_driver/DETAILS
+++ b/z-kernels/nvidia_driver/DETAILS
@@ -3,11 +3,11 @@
case "${SMGL_COMPAT_ARCHS[1]}" in
x86_64)
if [[ $NVIDIA_BETA == y ]]; then
- VERSION=325.08
-
SOURCE_HASH=sha512:cc2e397325f7c237fb61d7ae322d7c199e054877bdcea2d505b9342f0ab80e275c0ecc0569434c65306d626e82aa4f524fb4df0f43d9d08b3f0d7ba8cb2de80e
+ VERSION=325.15
+
SOURCE_HASH=sha512:323cbd8e6f3ce29a1556b83b2fb3456f919964ede1cbee4ddaa3539ab75eda7abe26b96ba500462eed2ade4163b8de20d1db6ea987af923710f0e1a60e432e83
else
- VERSION=319.32
-
SOURCE_HASH=sha512:514378a2a0452a4595b5aab570ff14b6d085c341f330f823b684b1b3eeb95e6a93b6e538cf9280eb1016c7eba8e6364d0277f895072b7e56faf0bf6a60be5b0a
+ VERSION=319.49
+
SOURCE_HASH=sha512:2a7c8c9f5739a37dbf819115d015462e12e9b5f80f0e37c7e99d3aea799a8601d8fa089356c68b9e0cba658d8b9f796b43727bab9366f5146e52570c05a2d58c
fi
SOURCE=NVIDIA-Linux-x86_64-$VERSION.run

SOURCE_URL=http://us.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/$SOURCE
@@ -17,11 +17,11 @@
SOURCE_DIRECTORY="$BUILD_DIRECTORY/NVIDIA-Linux-x86_64-$VERSION"
;;
ia32)
if [[ $NVIDIA_BETA == y ]]; then
- VERSION=325.08
-
SOURCE_HASH=sha512:c356fdc40d6dcca4e2f7f6387dbe7846405344eaae7f0bc2894a53940dc1d9893e6f245a496e4b328a6e7c476619597cc4535626eb350cfed491090ce35c36fd
+ VERSION=325.15
+
SOURCE_HASH=sha512:48052c3daa8748a7c43de1c24e00fdd3f94cebbe7f5efbb185a0472a1d0bbab8adfe377359ccdc6cd8e437a80506fdd551408237b0842c194a3497c43cf3487e
else
- VERSION=319.32
-
SOURCE_HASH=sha512:86e6297e14dc1b68b74db931118c1cb3597dcfbfaa8a930e53d9c1cbf1d9d8ce0bb6bf48fa20927dbd45d66da30da3f660c426af9659c35b786826402b10fbb0
+ VERSION=319.49
+
SOURCE_HASH=sha512:4e8f634beddfc404dd266e11bfeb46f2991c59df4c954a9b9c58a7f319ce21a2bf65d677daf7db8fbdb86f63504e8b1430718fcbdb8754fb2ae6d03d598755e9
fi
SOURCE=NVIDIA-Linux-x86-$VERSION.run

SOURCE_URL=http://us.download.nvidia.com/XFree86/Linux-x86/$VERSION/$SOURCE
diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index 14b5065..eb9f218 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,9 @@
+2013-09-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: versions 325.15, 319.49
+ * linux-3.11.patch, PRE_BUILD: fix compile error with linux 3.11
+ * BUILD, INSTALL, PRE_BUILD: Makefile.kbuild is now called Makefile
+ in the beta version; added conditionals to take that into account
+
2013-07-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 319.32, version 325.08 (beta)
* PRE_BUILD, nvidia-linux-3.10.patch: apply patch from archlinux
diff --git a/z-kernels/nvidia_driver/INSTALL b/z-kernels/nvidia_driver/INSTALL
index e4127da..6f1f54a 100755
--- a/z-kernels/nvidia_driver/INSTALL
+++ b/z-kernels/nvidia_driver/INSTALL
@@ -1,15 +1,20 @@
local X_MOD KVER &&
KVER=$(get_kernel_version) &&

+if [[ "$NVIDIA_BETA" == "n" ]]; then
+ MAKEFILE=Makefile.kbuild
+else
+ MAKEFILE=Makefile
+fi &&
#
# Install kernel module 'nvidia.ko'
#
-pushd $SOURCE_DIRECTORY/kernel &&
+cd $SOURCE_DIRECTORY/kernel &&
make KERNEL_MODLIB=$INSTALL_ROOT/lib/modules/$KVER \
KERNEL_UNAME=$KVER \
SYSSRC=$INSTALL_ROOT/lib/modules/$KVER/source \
- -f Makefile.kbuild module-install &&
-popd &&
+ -f $MAKEFILE module-install &&
+cd $SOURCE_DIRECTORY &&

#
# Install binaries and script
diff --git a/z-kernels/nvidia_driver/PRE_BUILD
b/z-kernels/nvidia_driver/PRE_BUILD
index 4bc8ce2..819a5f4 100755
--- a/z-kernels/nvidia_driver/PRE_BUILD
+++ b/z-kernels/nvidia_driver/PRE_BUILD
@@ -3,20 +3,22 @@ unpack_file '' &&
sh $SOURCE_CACHE/$SOURCE --extract-only \
--target $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/linux-3.11.patch &&

# Fix defunct desktop file
sedit 's/__.*__\///' nvidia-settings.desktop &&

#
-# Modify module-install target to use `depmod -ae` on $KVER rather
-# than the running kernel
+# Setup Makefile symlink
#
-sedit 's:depmod -ae:& \$(KERNEL_UNAME):' kernel/Makefile.kbuild &&
+cd $SOURCE_DIRECTORY/kernel &&
+if [[ "$NVIDIA_BETA" == "n" ]]; then
+ ln -sfn Makefile.kbuild Makefile
+fi &&

#
-# Setup Makefile symlink
+# Modify module-install target to use `depmod -ae` on $KVER rather
+# than the running kernel
#
-cd $SOURCE_DIRECTORY/kernel &&
-ln -sfn Makefile.kbuild Makefile &&
+sedit 's:depmod -ae:& \$(KERNEL_UNAME):' Makefile

-patch -Np2 < $SPELL_DIRECTORY/nvidia-linux-3.10.patch
diff --git a/z-kernels/nvidia_driver/linux-3.11.patch
b/z-kernels/nvidia_driver/linux-3.11.patch
new file mode 100644
index 0000000..94fec72
--- /dev/null
+++ b/z-kernels/nvidia_driver/linux-3.11.patch
@@ -0,0 +1,14 @@
+--- a/kernel/nv-linux.h
++++ b/kernel/nv-linux.h
+@@ -957,7 +957,11 @@ static inline int nv_execute_on_all_cpus
+ #endif
+
+ #if !defined(NV_VMWARE)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
++#define NV_NUM_PHYSPAGES get_num_physpages()
++#else
+ #define NV_NUM_PHYSPAGES num_physpages
++#endif
+ #define NV_GET_CURRENT_PROCESS() current->tgid
+ #define NV_IN_ATOMIC() in_atomic()
+ #define NV_LOCAL_BH_DISABLE() local_bh_disable()
\ No newline at end of file


  • [SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (ee37e0cfc7c1237828386daecc7a22e590f2368b), Florian Franzmann, 09/07/2013

Archive powered by MHonArc 2.6.24.

Top of Page