Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (4a371f1dfefb299ff4a9c2e336823777805b798b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (4a371f1dfefb299ff4a9c2e336823777805b798b)
  • Date: Mon, 20 Oct 2008 19:38:29 -0500

GIT changes to master z-rejected grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

z-kernels/nvidia_legacy_173xx/HISTORY | 8 ++++++++
z-kernels/nvidia_legacy_173xx/INSTALL | 11 +++++++++--
z-kernels/nvidia_legacy_173xx/PRE_REMOVE | 12 ++++++++++++
z-kernels/nvidia_legacy_173xx/REPAIR^all^PRE_REMOVE | 12 ++++++++++++
4 files changed, 41 insertions(+), 2 deletions(-)

New commits:
commit 4a371f1dfefb299ff4a9c2e336823777805b798b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

nvidia_legacy_173xx:
* Bug #14819
* INSTALL: Only install nVidia's libwfb.so symlink if
xorg-server didn't already install libwfb.so
* PRE_REMOVE: Remove libwfb.so from nvidia's install log if
libwfb.so is a file (from xorg-server) instead of a symlink (from
this spell)
* REPAIR^all^PRE_REMOVE: Update tablet's PRE_REMOVE so the first
cast works

diff --git a/z-kernels/nvidia_legacy_173xx/HISTORY
b/z-kernels/nvidia_legacy_173xx/HISTORY
index 53ca2c0..9338210 100644
--- a/z-kernels/nvidia_legacy_173xx/HISTORY
+++ b/z-kernels/nvidia_legacy_173xx/HISTORY
@@ -1,3 +1,11 @@
+2008-10-20 Eric Sandall <sandalle AT sourcemage.org>
+ * Bug #14819
+ * INSTALL: Only install nVidia's libwfb.so symlink if xorg-server
+ didn't already install libwfb.so
+ * PRE_REMOVE: Remove libwfb.so from nvidia's install log if libwfb.so
+ is a file (from xorg-server) instead of a symlink (from this spell)
+ * REPAIR^all^PRE_REMOVE: Update tablet's PRE_REMOVE so the first cast
works
+
2008-10-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: downgraded NVIDIA_BETA to 173.14.12
* PRE_BUILD, NVIDIA_173.14.12_2.6.27.patch: added due to linux 2.6.27
diff --git a/z-kernels/nvidia_legacy_173xx/INSTALL
b/z-kernels/nvidia_legacy_173xx/INSTALL
index 5c5dfdb..3eb55b0 100755
--- a/z-kernels/nvidia_legacy_173xx/INSTALL
+++ b/z-kernels/nvidia_legacy_173xx/INSTALL
@@ -110,8 +110,15 @@ extensions/libglx.so.${VERSION/-/.} \
#
ln -sfn "$X_MOD/libnvidia-wfb.so.${VERSION/-/.}" \
"$X_MOD/libnvidia-wfb.so" &&
- ln -sfn "$X_MOD/libnvidia-wfb.so.${VERSION/-/.}" \
- "$X_MOD/libwfb.so" &&
+
+ #
+ # If libwfb.so is a file, it's probably from xorg-server, leave alone
+ # Bug #14819
+ #
+ if [[ ! -f "$X_MOD/libwfb.so" ]]; then
+ ln -sfn "$X_MOD/libnvidia-wfb.so.${VERSION/-/.}" \
+ "$X_MOD/libwfb.so"
+ fi &&
pushd $X_MOD/extensions &&
ln -sfn libglx.so.${VERSION/-/.} libglx.so &&
popd &&
diff --git a/z-kernels/nvidia_legacy_173xx/PRE_REMOVE
b/z-kernels/nvidia_legacy_173xx/PRE_REMOVE
new file mode 100755
index 0000000..f76ec4c
--- /dev/null
+++ b/z-kernels/nvidia_legacy_173xx/PRE_REMOVE
@@ -0,0 +1,12 @@
+#
+# If libwfb.so is a file and not a symlink it's from xorg-server, remove
+# from this spell's install log
+# Bug #14819
+#
+if [[ -f $INSTALL_ROOT/usr/lib/xorg/modules/libwfb.so &&
+ ! -h $INSTALL_ROOT/usr/lib/xorg/modules/libwfb.so ]]; then
+ sedit '/\/usr\/lib\/xorg\/modules\/libwfb.so/d'
$INSTALL_LOGS/$SPELL-$(installed_version $SPELL)
+
+fi &&
+
+default_pre_remove
diff --git a/z-kernels/nvidia_legacy_173xx/REPAIR^all^PRE_REMOVE
b/z-kernels/nvidia_legacy_173xx/REPAIR^all^PRE_REMOVE
new file mode 100755
index 0000000..f76ec4c
--- /dev/null
+++ b/z-kernels/nvidia_legacy_173xx/REPAIR^all^PRE_REMOVE
@@ -0,0 +1,12 @@
+#
+# If libwfb.so is a file and not a symlink it's from xorg-server, remove
+# from this spell's install log
+# Bug #14819
+#
+if [[ -f $INSTALL_ROOT/usr/lib/xorg/modules/libwfb.so &&
+ ! -h $INSTALL_ROOT/usr/lib/xorg/modules/libwfb.so ]]; then
+ sedit '/\/usr\/lib\/xorg\/modules\/libwfb.so/d'
$INSTALL_LOGS/$SPELL-$(installed_version $SPELL)
+
+fi &&
+
+default_pre_remove



  • [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (4a371f1dfefb299ff4a9c2e336823777805b798b), Eric Sandall, 10/20/2008

Archive powered by MHonArc 2.6.24.

Top of Page