Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Juuso Alasuutari (734c06a9723c06958fb396fbe4444c559950c28c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Juuso Alasuutari (734c06a9723c06958fb396fbe4444c559950c28c)
  • Date: Wed, 12 Jul 2006 18:25:26 -0500

GIT changes to master z-rejected grimoire by Juuso Alasuutari
<iuso AT sourcemage.org>:

z-kernels/nvidia_driver/DETAILS | 4 ++--
z-kernels/nvidia_driver/HISTORY | 6 ++++++
z-kernels/nvidia_driver/INSTALL | 2 ++
z-kernels/nvidia_driver/PRE_BUILD | 16 +++++++++-------
4 files changed, 19 insertions(+), 9 deletions(-)

New commits:
commit 734c06a9723c06958fb396fbe4444c559950c28c
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

Disabled staged install (bug #12843), fixed broken desktop file.

diff --git a/z-kernels/nvidia_driver/DETAILS b/z-kernels/nvidia_driver/DETAILS
index 480ee06..0871386 100755
--- a/z-kernels/nvidia_driver/DETAILS
+++ b/z-kernels/nvidia_driver/DETAILS
@@ -26,13 +26,13 @@ ########################################
esac
WEB_SITE=http://www.nvidia.com/object/unix.html
ENTERED=20030401
- UPDATED=20050730
PATCHLEVEL=1
ARCHIVE=off
REJECT="Non-GPL compatible software license"
LICENSE[0]=http://www.nvidia.com/object/nv_swlicense.html
- BUILD_API=2
SHORT="Driver provided by NVIDIA for NVIDIA GPUs"
+ # Remove this when bug #12843 is fixed
+ STAGED_INSTALL=off
cat << EOF
NVIDIA
These are the nvidia provided binary X drivers for their graphics cards.
diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index c8f2981..5d81a23 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,9 @@
+2006-07-13 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Disabled staged install until bug #12843 is fixed,
+ removed UPDATED & BUILD_API.
+ * PRE_BUILD: Added sedit to fix defunct nvidia-settings.desktop.
+ * INSTALL: Install pixmap.
+
2006-06-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* INSTALL: removed the last hardcoded version string usage

diff --git a/z-kernels/nvidia_driver/INSTALL b/z-kernels/nvidia_driver/INSTALL
index be8cfa7..cc1e0ff 100755
--- a/z-kernels/nvidia_driver/INSTALL
+++ b/z-kernels/nvidia_driver/INSTALL
@@ -125,6 +125,8 @@ if [ ! -d $INSTALL_ROOT/usr/share/do
mkdir -p $INSTALL_ROOT/usr/share/doc/NVIDIA_GLX-1.0
fi &&
cp -a * $INSTALL_ROOT/usr/share/doc/NVIDIA_GLX-1.0 &&
+# Install pixmap
+cp nvidia-settings.png $INSTALL_ROOT/usr/share/pixmaps &&
popd &&
if [ ! -d $INSTALL_ROOT/usr/share/doc/$SPELL ]; then
mkdir -p $INSTALL_ROOT/usr/share/doc/$SPELL
diff --git a/z-kernels/nvidia_driver/PRE_BUILD
b/z-kernels/nvidia_driver/PRE_BUILD
index 2eb8157..65a722d 100755
--- a/z-kernels/nvidia_driver/PRE_BUILD
+++ b/z-kernels/nvidia_driver/PRE_BUILD
@@ -49,15 +49,17 @@ if [[ $AGPFW == "y" ]]; then
usr/src/nv/os-registry.c
fi &&

-#
-# Setup Makefile symlink
-#
-cd $SOURCE_DIRECTORY/usr/src/nv &&
-ln -sfn Makefile.kbuild Makefile &&
+# Fix defunct desktop file
+sedit 's/__.*__\///' usr/share/applications/nvidia-settings.desktop &&

#
# Modify module-install target to use `depmod -ae` on $KVER rather
# than the running kernel
#
-sedit 's:depmod -ae:& \$(KERNEL_UNAME):' \
- $SOURCE_DIRECTORY/usr/src/nv/Makefile.kbuild
+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



  • [SM-Commit] GIT changes to master z-rejected grimoire by Juuso Alasuutari (734c06a9723c06958fb396fbe4444c559950c28c), Juuso Alasuutari, 07/12/2006

Archive powered by MHonArc 2.6.24.

Top of Page