Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Ladislav Hagara (e839486291c29e77f509193d02d4782b261a1083)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Ladislav Hagara (e839486291c29e77f509193d02d4782b261a1083)
  • Date: Thu, 7 Nov 2013 01:30:49 -0600

GIT changes to master z-rejected grimoire by Ladislav Hagara <hgr AT vabo.cz>:

z-kernels/nvidia_driver/BUILD | 2 +-
z-kernels/nvidia_driver/DETAILS | 8 ++++----
z-kernels/nvidia_driver/HISTORY | 4 ++++
z-kernels/nvidia_driver/INSTALL | 2 +-
z-kernels/nvidia_driver/PRE_BUILD | 9 ++++-----
5 files changed, 14 insertions(+), 11 deletions(-)

New commits:
commit e839486291c29e77f509193d02d4782b261a1083
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

nvidia_driver 331.20

diff --git a/z-kernels/nvidia_driver/BUILD b/z-kernels/nvidia_driver/BUILD
index 98b7348..d14f15a 100755
--- a/z-kernels/nvidia_driver/BUILD
+++ b/z-kernels/nvidia_driver/BUILD
@@ -2,7 +2,7 @@ local KVER &&
KVER=$(get_kernel_version) &&

if [[ "$NVIDIA_BETA" == "n" ]]; then
- MAKEFILE=Makefile.kbuild
+ MAKEFILE=Makefile
else
MAKEFILE=Makefile
fi &&
diff --git a/z-kernels/nvidia_driver/DETAILS b/z-kernels/nvidia_driver/DETAILS
index cf56792..abc07d6 100755
--- a/z-kernels/nvidia_driver/DETAILS
+++ b/z-kernels/nvidia_driver/DETAILS
@@ -6,8 +6,8 @@ if [[ $NVIDIA_BETA == y ]]; then
VERSION=325.15

SOURCE_HASH=sha512:323cbd8e6f3ce29a1556b83b2fb3456f919964ede1cbee4ddaa3539ab75eda7abe26b96ba500462eed2ade4163b8de20d1db6ea987af923710f0e1a60e432e83
else
- VERSION=319.60
-
SOURCE_HASH=sha512:5f0f1f4c4d60b7339218ae36d9654e07b003cec5864af169ef213404496c00eea76b2db86f104f8613a76eece42a88dd8d86d7ae1ee510f2fa7b0c8034f5fae1
+ VERSION=331.20
+
SOURCE_HASH=sha512:96c2858fcfca05e68683dbc3c677194d1ad30d179cb88df445f32bc68e98b5964315336154f4a693ef1e385e809adfc3795e19b2337f4c1e93908825ee7792c1
fi
SOURCE=NVIDIA-Linux-x86_64-$VERSION.run

SOURCE_URL=http://us.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/$SOURCE
@@ -20,8 +20,8 @@ if [[ $NVIDIA_BETA == y ]]; then
VERSION=325.15

SOURCE_HASH=sha512:48052c3daa8748a7c43de1c24e00fdd3f94cebbe7f5efbb185a0472a1d0bbab8adfe377359ccdc6cd8e437a80506fdd551408237b0842c194a3497c43cf3487e
else
- VERSION=319.60
-
SOURCE_HASH=sha512:6b1927869101ed43349f1d5ebcdd3ff40929364a7cb4296d8c86fd99c3e2214d3f35d6f80235498a12ab3762bfa79be03e155ea17175cef544354d1fbe55a839
+ VERSION=331.20
+
SOURCE_HASH=sha512:e42cfdcceba7f590e0fa6d8a99bf0c80143dc5bf5af21f26ce65274426c4eb3dbd1ec6864bf4edfcfd6f463453f06f44fd67acfcdd545764741a9620381865d2
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 890178a..bab055e 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,7 @@
+2013-11-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 331.20
+ * PRE_BUILD, BUILD, INSTALL: updated
+
2013-10-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 319.60

diff --git a/z-kernels/nvidia_driver/INSTALL b/z-kernels/nvidia_driver/INSTALL
index 6f1f54a..771ff10 100755
--- a/z-kernels/nvidia_driver/INSTALL
+++ b/z-kernels/nvidia_driver/INSTALL
@@ -2,7 +2,7 @@ local X_MOD KVER
&&
KVER=$(get_kernel_version) &&

if [[ "$NVIDIA_BETA" == "n" ]]; then
- MAKEFILE=Makefile.kbuild
+ MAKEFILE=Makefile
else
MAKEFILE=Makefile
fi &&
diff --git a/z-kernels/nvidia_driver/PRE_BUILD
b/z-kernels/nvidia_driver/PRE_BUILD
index 819a5f4..e3abfac 100755
--- a/z-kernels/nvidia_driver/PRE_BUILD
+++ b/z-kernels/nvidia_driver/PRE_BUILD
@@ -3,7 +3,7 @@ unpack_file '' &&
sh $SOURCE_CACHE/$SOURCE --extract-only \
--target $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/linux-3.11.patch &&
+#patch -p1 < $SPELL_DIRECTORY/linux-3.11.patch &&

# Fix defunct desktop file
sedit 's/__.*__\///' nvidia-settings.desktop &&
@@ -12,13 +12,12 @@ sedit 's/__.*__\///' nvidia-settings.desktop &&
# Setup Makefile symlink
#
cd $SOURCE_DIRECTORY/kernel &&
-if [[ "$NVIDIA_BETA" == "n" ]]; then
- ln -sfn Makefile.kbuild Makefile
-fi &&
+#if [[ "$NVIDIA_BETA" == "n" ]]; then
+# ln -sfn Makefile.kbuild Makefile
+#fi &&

#
# Modify module-install target to use `depmod -ae` on $KVER rather
# than the running kernel
#
sedit 's:depmod -ae:& \$(KERNEL_UNAME):' Makefile
-



  • [SM-Commit] GIT changes to master z-rejected grimoire by Ladislav Hagara (e839486291c29e77f509193d02d4782b261a1083), Ladislav Hagara, 11/07/2013

Archive powered by MHonArc 2.6.24.

Top of Page