r421 - vdr/vdr/trunk/debian

Thomas Schmidt pkg-vdr-dvb-changes@lists.alioth.debian.org
Sun, 10 Apr 2005 12:58:01 +0000


Author: tschmidt
Date: 2005-04-10 12:58:00 +0000 (Sun, 10 Apr 2005)
New Revision: 421

Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/plugin-loader.sh
Log:
vdr: Use LD_ASSUME_KERNEL=2.4.1 when calling vdr in plugins-loader.sh


Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2005-04-09 22:43:23 UTC (rev 420)
+++ vdr/vdr/trunk/debian/changelog	2005-04-10 12:58:00 UTC (rev 421)
@@ -6,6 +6,7 @@
     - New upstream release
       + Removed 01_gcc3.4-FTBFS-fix.dpatch
       + Removed 09_amd64_epg.dpatch
+    - Use LD_ASSUME_KERNEL=2.4.1 when calling vdr in plugins-loader.sh
 
  -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sat, 09 Apr 2005 20:43:31 +0200
 

Modified: vdr/vdr/trunk/debian/plugin-loader.sh
===================================================================
--- vdr/vdr/trunk/debian/plugin-loader.sh	2005-04-09 22:43:23 UTC (rev 420)
+++ vdr/vdr/trunk/debian/plugin-loader.sh	2005-04-10 12:58:00 UTC (rev 421)
@@ -16,7 +16,7 @@
     local leftout2
     local version
 
-    version=`/usr/bin/vdr -u $USER -g $GROUP -V -L/usr/bin/vdr 2>/dev/null | sed -e 's/.*(\(.*\)).*/\1/'`
+    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/'`
     test "$version" || version="unknown version"
  
     PLUGINS=""
@@ -47,7 +47,7 @@
 
         # move not startable plugins to $leftout2
         for (( i=${#installed_plugins[@]}, i-- ; i >= 0 ; i-- )); do
-            if ! /usr/bin/vdr -u $USER -g $GROUP -V -L $PLUGIN_DIR -P ${installed_plugins[$i]} \
+            if ! LD_ASSUME_KERNEL=2.4.1 /usr/bin/vdr -u $USER -g $GROUP -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]