changed splashy to use splashy_update with uclibc and LD_LIBRARY_PATH. Link to /lib is added when a system is exported. Splashy still static, no dyn-version /w uclibc in the near future :(

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2607 95ad53e4-c205-0410-b2fa-d234c58c8868

4 files changed, 4 insertions, 8 deletions

diff --git a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
index b266de8e..eeaf6707 100644
--- a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
+++ b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
@@ -122,20 +122,15 @@ sub installationPhase
     $self->{openslxBasePath}      = $info->{'openslx-base-path'};
     my $splashyBinPath =
         "$self->{openslxBasePath}/lib/plugins/bootsplash/files/bin";
-    my $uClibcPath = "$self->{openslxBasePath}/share/uclib-rootfs/lib";
     my $pluginRepoPath = "$self->{pluginRepositoryPath}";
 
-    # copy splashy_update into plugin-repo folder
+    # copy splashy(_update) into plugin-repo folder
     mkpath("$pluginRepoPath/bin");
     mkpath("$pluginRepoPath/lib");
     slxsystem("cp -a $splashyBinPath/* $pluginRepoPath/bin") == 0
         or die _tr(
                 "unable to copy splashy to $pluginRepoPath/bin"
         );
-    slxsystem("cp -a $uClibcPath/libuClibc* $pluginRepoPath/lib") == 0
-        or die _tr(
-                "unable to copy libuClibc to $pluginRepoPath/lib"
-        );
 
     return;
 }
diff --git a/os-plugins/plugins/bootsplash/XX_bootsplash.sh b/os-plugins/plugins/bootsplash/XX_bootsplash.sh
index 4bd340fb..9a36c08f 100644
--- a/os-plugins/plugins/bootsplash/XX_bootsplash.sh
+++ b/os-plugins/plugins/bootsplash/XX_bootsplash.sh
@@ -20,8 +20,9 @@ if [ -e /initramfs/plugin-conf/bootsplash.conf ]; then
     if [ ${no_bootsplash} -eq 0 ]; then
       # create a runlevelscript that will stop splashy before the start of KDM
       d_mkrlscript init splashy.stop "Stopping Splashy ..."
-        echo -e "\t/opt/openslx/plugin-repo/bootsplash/bin/splashy_update.glibc\
-            exit 2>/dev/null \
+        echo -e "\tLD_LIBRARY_PATH=/opt/openslx/uclib-rootfs/lib/
+            /opt/openslx/plugin-repo/bootsplash/bin/splashy_update exit \
+            2>/dev/null \
           \n\ttype killall >/dev/null 2>&1 && killall -9 splashy \
           \n\trm -f /etc/init.d/splashy.stop 2>/dev/null" \
             >>/mnt/etc/init.d/splashy.stop
diff --git a/os-plugins/plugins/bootsplash/files/bin/splashy.dyn b/os-plugins/plugins/bootsplash/files/bin/splashy.dyn
deleted file mode 100755
index edd33bc8..00000000
--- a/os-plugins/plugins/bootsplash/files/bin/splashy.dyn
+++ /dev/null
diff --git a/os-plugins/plugins/bootsplash/files/bin/splashy_update.glibc b/os-plugins/plugins/bootsplash/files/bin/splashy_update.glibc
deleted file mode 100755
index 0a7be6c8..00000000
--- a/os-plugins/plugins/bootsplash/files/bin/splashy_update.glibc
+++ /dev/null