r1205 - vdr/vdr/trunk/debian

[Thomas Schmidt]

Author: tschmidt
Date: 2005-09-06 12:20:47 +0000 (Tue, 06 Sep 2005)
New Revision: 1205

Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/plugin-loader.sh
Log:
vdr: Do not try to use LD_ASSUME_KERNEL in plugins-loader.sh on amd64

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2005-09-05 21:20:45 UTC (rev 1204)
+++ vdr/vdr/trunk/debian/changelog	2005-09-06 12:20:47 UTC (rev 1205)
@@ -11,8 +11,11 @@
     - Modified the init-script to not exit silently if vdr is disabled in 
       /etc/default/vdr (which is the default), instead of this showing a small
       note how to enable the daemon
+    - Do not try to call vdr with LD_ASSUME_KERNEL=2.4.1 in plugins-loader.sh
+      on amd64 (many thanks to Sören Köpping for reporting the problem and
+      sending a patch) (closes: #326866)
 
- -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sun,  4 Sep 2005 17:18:11 +0200
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Tue,  6 Sep 2005 14:19:43 +0200
 
 vdr (1.3.31-2) unstable; urgency=low
 

Modified: vdr/vdr/trunk/debian/plugin-loader.sh
===================================================================
--- vdr/vdr/trunk/debian/plugin-loader.sh	2005-09-05 21:20:45 UTC (rev 1204)
+++ vdr/vdr/trunk/debian/plugin-loader.sh	2005-09-06 12:20:47 UTC (rev 1205)
@@ -14,9 +14,16 @@
     local patchelvels
     local leftout
     local leftout2
+    local vdrcmd
     local version
 
-    version=`LD_ASSUME_KERNEL=2.4.1 /usr/bin/vdr -u $USER -g $GROUP -V -L/usr/bin/vdr 2>/dev/null | sed -e 's/.*(\(.*\)).*/\1/'`
+    if [ "$NONPTL" = "1" -a `uname -m` != x86_64 ]; then
+        vdrcmd="LD_ASSUME_KERNEL=2.4.1 /usr/bin/vdr"
+    else
+        vdrcmd="/usr/bin/vdr"
+    fi
+
+    version=`$vdrcmd -u $USER -g $GROUP -V -L/usr/bin/vdr 2>/dev/null | sed -e 's/.*(\(.*\)).*/\1/'`
     test "$version" || version="unknown version"
  
     PLUGINS=""
@@ -47,7 +54,7 @@
 
         # move not startable plugins to $leftout2
         for (( i=${#installed_plugins[@]}, i-- ; i >= 0 ; i-- )); do
-            if ! LD_ASSUME_KERNEL=2.4.1 /usr/bin/vdr -u $USER -g $GROUP $OPTIONS -V -L $PLUGIN_DIR -P ${installed_plugins[$i]} \
+            if ! $vdrcmd -u $USER -g $GROUP $OPTIONS -V -L $PLUGIN_DIR -P ${installed_plugins[$i]} \
                 2>/dev/null | grep -q "^${installed_plugins[$i]} "; then
                 leftout2="${leftout2} ${installed_plugins[$i]}"
                 unset installed_plugins[$i]