remove uclibc stuff - part II

45 files changed, 7 insertions, 40 deletions

diff --git a/src/boot-env/preboot/rootfs/lib/libgcc_s.so.1 b/src/boot-env/preboot/rootfs/lib/libgcc_s.so.1
new file mode 100644
index 00000000..f893c04d
--- /dev/null
+++ b/src/boot-env/preboot/rootfs/lib/libgcc_s.so.1
diff --git a/src/boot-env/preboot/rootfs/lib/libm.so.6 b/src/boot-env/preboot/rootfs/lib/libm.so.6
new file mode 100644
index 00000000..ceb234cd
--- /dev/null
+++ b/src/boot-env/preboot/rootfs/lib/libm.so.6
diff --git a/src/boot-env/preboot/rootfs/lib/libncurses.so.5 b/src/boot-env/preboot/rootfs/lib/libncurses.so.5
index c7b1e02a..39d30af4 120000..100644
--- a/src/boot-env/preboot/rootfs/lib/libncurses.so.5
+++ b/src/boot-env/preboot/rootfs/lib/libncurses.so.5
diff --git a/src/boot-env/preboot/rootfs/lib/libncursesw.so.5 b/src/boot-env/preboot/rootfs/lib/libncursesw.so.5
new file mode 100644
index 00000000..4b239423
--- /dev/null
+++ b/src/boot-env/preboot/rootfs/lib/libncursesw.so.5
diff --git a/src/boot-env/preboot/rootfs/lib/libnsl.so.1 b/src/boot-env/preboot/rootfs/lib/libnsl.so.1
new file mode 100644
index 00000000..a978e3e9
--- /dev/null
+++ b/src/boot-env/preboot/rootfs/lib/libnsl.so.1
diff --git a/src/boot-env/preboot/rootfs/lib/libpthread.so.0 b/src/boot-env/preboot/rootfs/lib/libpthread.so.0
new file mode 100755
index 00000000..bddc5fac
--- /dev/null
+++ b/src/boot-env/preboot/rootfs/lib/libpthread.so.0
diff --git a/src/boot-env/preboot/rootfs/sbin/kdump b/src/boot-env/preboot/rootfs/sbin/kdump
new file mode 100755
index 00000000..ef80c3c6
--- /dev/null
+++ b/src/boot-env/preboot/rootfs/sbin/kdump
diff --git a/src/boot-env/preboot/rootfs/sbin/kexec b/src/boot-env/preboot/rootfs/sbin/kexec
new file mode 100755
index 00000000..dab2eb6c
--- /dev/null
+++ b/src/boot-env/preboot/rootfs/sbin/kexec
diff --git a/src/boot-env/preboot/rootfs/usr/bin/clear b/src/boot-env/preboot/rootfs/usr/bin/clear
index acc13246..06766374 100755
--- a/src/boot-env/preboot/rootfs/usr/bin/clear
+++ b/src/boot-env/preboot/rootfs/usr/bin/clear
diff --git a/src/boot-env/preboot/rootfs/usr/bin/dialog b/src/boot-env/preboot/rootfs/usr/bin/dialog
index 6929569f..dd1a9040 100755
--- a/src/boot-env/preboot/rootfs/usr/bin/dialog
+++ b/src/boot-env/preboot/rootfs/usr/bin/dialog
diff --git a/src/boot-env/preboot/rootfs/usr/bin/w3m b/src/boot-env/preboot/rootfs/usr/bin/w3m
index 2766a681..12b9bfc2 100755
--- a/src/boot-env/preboot/rootfs/usr/bin/w3m
+++ b/src/boot-env/preboot/rootfs/usr/bin/w3m
diff --git a/src/boot-env/preboot/rootfs/usr/lib/i686/cmov/libcrypto.so.0.9.8 b/src/boot-env/preboot/rootfs/usr/lib/i686/cmov/libcrypto.so.0.9.8
new file mode 100644
index 00000000..611adf2c
--- /dev/null
+++ b/src/boot-env/preboot/rootfs/usr/lib/i686/cmov/libcrypto.so.0.9.8
diff --git a/src/boot-env/preboot/rootfs/usr/lib/i686/cmov/libssl.so.0.9.8 b/src/boot-env/preboot/rootfs/usr/lib/i686/cmov/libssl.so.0.9.8
new file mode 100644
index 00000000..74671972
--- /dev/null
+++ b/src/boot-env/preboot/rootfs/usr/lib/i686/cmov/libssl.so.0.9.8
diff --git a/src/boot-env/preboot/rootfs/usr/lib/libcrypto.so b/src/boot-env/preboot/rootfs/usr/lib/libcrypto.so
deleted file mode 120000
index cda623f3..00000000
--- a/src/boot-env/preboot/rootfs/usr/lib/libcrypto.so
+++ /dev/null
@@ -1 +0,0 @@
-libcrypto.so.0.9.8
\ No newline at end of file
diff --git a/src/boot-env/preboot/rootfs/usr/lib/libcrypto.so.0.9.8 b/src/boot-env/preboot/rootfs/usr/lib/libcrypto.so.0.9.8
deleted file mode 100755
index bb1b8163..00000000
--- a/src/boot-env/preboot/rootfs/usr/lib/libcrypto.so.0.9.8
+++ /dev/null
diff --git a/src/boot-env/preboot/rootfs/usr/lib/libgc.so.1 b/src/boot-env/preboot/rootfs/usr/lib/libgc.so.1
new file mode 100644
index 00000000..033c4611
--- /dev/null
+++ b/src/boot-env/preboot/rootfs/usr/lib/libgc.so.1
diff --git a/src/boot-env/preboot/rootfs/usr/lib/libgpm.so.2 b/src/boot-env/preboot/rootfs/usr/lib/libgpm.so.2
new file mode 100644
index 00000000..31e442aa
--- /dev/null
+++ b/src/boot-env/preboot/rootfs/usr/lib/libgpm.so.2
diff --git a/src/boot-env/preboot/rootfs/usr/sbin/kdump b/src/boot-env/preboot/rootfs/usr/sbin/kdump
deleted file mode 100755
index 07226a4b..00000000
--- a/src/boot-env/preboot/rootfs/usr/sbin/kdump
+++ /dev/null
diff --git a/src/boot-env/preboot/rootfs/usr/sbin/kexec b/src/boot-env/preboot/rootfs/usr/sbin/kexec
deleted file mode 100755
index cc49c45c..00000000
--- a/src/boot-env/preboot/rootfs/usr/sbin/kexec
+++ /dev/null
diff --git a/src/os-plugins/plugins/dropbear/OpenSLX/OSPlugin/dropbear.pm b/src/os-plugins/plugins/dropbear/OpenSLX/OSPlugin/dropbear.pm
index fc1b96f8..bfd03309 100644
--- a/src/os-plugins/plugins/dropbear/OpenSLX/OSPlugin/dropbear.pm
+++ b/src/os-plugins/plugins/dropbear/OpenSLX/OSPlugin/dropbear.pm
@@ -85,7 +85,7 @@ sub installationPhase
 
     my $filesDir = "$openslxBasePath/lib/plugins/dropbear/files";
 
-	copyFile("$filesDir/dropbearmulti","$pluginRepoPath");
+    slxsystem("cp -r $filesDir/* $pluginRepoPath")
 
     return;
 }
diff --git a/src/os-plugins/plugins/dropbear/XX_dropbear.sh b/src/os-plugins/plugins/dropbear/XX_dropbear.sh
index cb4321ff..b43844af 100644
--- a/src/os-plugins/plugins/dropbear/XX_dropbear.sh
+++ b/src/os-plugins/plugins/dropbear/XX_dropbear.sh
@@ -20,12 +20,10 @@ if [ -e /initramfs/plugin-conf/dropbear.conf ]; then
   if [ $dropbear_active -ne 0 ]; then
     [ $DEBUGLEVEL -gt 0 ] && echo "executing the 'dropbear' os-plugin ...";
 
+       # TODO: TESTEN !!!
        # setup links to multibinary
-       ln -sf /mnt/opt/openslx/plugin-repo/dropbear/dropbearmulti /sbin/dropbear
-       ln -sf /mnt/opt/openslx/plugin-repo/dropbear/dropbearmulti /sbin/dropbearkey
-       ln -sf /mnt/opt/openslx/plugin-repo/dropbear/dropbearmulti /sbin/dropbearconvert
-       ln -sf /mnt/opt/openslx/plugin-repo/dropbear/dropbearmulti /bin/dbclient
-       ln -sf /mnt/opt/openslx/plugin-repo/dropbear/dropbearmulti /bin/scp
+       tar -cp -C /mnt/opt/openslx/plugin-repo/dropbear usr lib  |\
+         tar -xp -C /
 
        # create dropbear config dir
        mkdir -p /etc/dropbear
diff --git a/src/os-plugins/plugins/dropbear/files/dropbearmulti b/src/os-plugins/plugins/dropbear/files/dropbearmulti
deleted file mode 100755
index 357e644f..00000000
--- a/src/os-plugins/plugins/dropbear/files/dropbearmulti
+++ /dev/null
diff --git a/src/os-plugins/plugins/dropbear/files/lib/libcrypt.so.1 b/src/os-plugins/plugins/dropbear/files/lib/libcrypt.so.1
new file mode 100644
index 00000000..4692c6fa
--- /dev/null
+++ b/src/os-plugins/plugins/dropbear/files/lib/libcrypt.so.1
diff --git a/src/os-plugins/plugins/dropbear/files/lib/libutil.so.1 b/src/os-plugins/plugins/dropbear/files/lib/libutil.so.1
new file mode 100644
index 00000000..1864dcd6
--- /dev/null
+++ b/src/os-plugins/plugins/dropbear/files/lib/libutil.so.1
diff --git a/src/os-plugins/plugins/dropbear/files/usr/bin/dbclient b/src/os-plugins/plugins/dropbear/files/usr/bin/dbclient
new file mode 100755
index 00000000..b7235203
--- /dev/null
+++ b/src/os-plugins/plugins/dropbear/files/usr/bin/dbclient
diff --git a/src/os-plugins/plugins/dropbear/files/usr/bin/dropbearkey b/src/os-plugins/plugins/dropbear/files/usr/bin/dropbearkey
new file mode 100755
index 00000000..c472d0aa
--- /dev/null
+++ b/src/os-plugins/plugins/dropbear/files/usr/bin/dropbearkey
diff --git a/src/os-plugins/plugins/dropbear/files/usr/sbin/dropbear b/src/os-plugins/plugins/dropbear/files/usr/sbin/dropbear
new file mode 100755
index 00000000..928f891c
--- /dev/null
+++ b/src/os-plugins/plugins/dropbear/files/usr/sbin/dropbear
diff --git a/src/os-plugins/plugins/qemukvm/OpenSLX/OSPlugin/qemukvm.pm b/src/os-plugins/plugins/qemukvm/OpenSLX/OSPlugin/qemukvm.pm
index 14e5917f..10e15687 100644
--- a/src/os-plugins/plugins/qemukvm/OpenSLX/OSPlugin/qemukvm.pm
+++ b/src/os-plugins/plugins/qemukvm/OpenSLX/OSPlugin/qemukvm.pm
@@ -164,10 +164,10 @@ sub installationPhase
           # TODO: maybe in the ifup-script better solution?
           # configuring the tap0 interface to the existing bridge configured in stage3
           #for i in 0 1 2; do
-          #  /opt/openslx/uclib-rootfs/sbin/tunctl -t tap${i} >/dev/null 2>&1
+          #  /opt/openslx/rootfs/sbin/tunctl -t tap${i} >/dev/null 2>&1
           #  ip link set dev tap${i} up
           #done
-          #/opt/openslx/uclib-rootfs/usr/sbin/brctl addif br0 tap0
+          #/opt/openslx/rootfs/usr/sbin/brctl addif br0 tap0
           #ip addr add ${nataddress} dev tap1
           #ip addr add ${hoaddress} dev tap2
           #echo "1" >/proc/sys/net/ipv4/conf/br0/forwarding
@@ -182,7 +182,7 @@ sub installationPhase
           [ -n "${module}" ] && modprobe -q -r ${module}
           modprobe -q -r tun
           # TODO: tun removed, so this is not necessary
-          #/opt/openslx/uclib-rootfs/usr/sbin/brctl delif br0 tap0
+          #/opt/openslx/rootfs/usr/sbin/brctl delif br0 tap0
           #ip addr del ${nataddress} dev tap1
           #ip addr del ${hoaddress} dev tap2
           #echo "0" >/proc/sys/net/ipv4/conf/br0/forwarding
diff --git a/src/os-plugins/plugins/wlanboot/files/bin/iwconfig b/src/os-plugins/plugins/wlanboot/files/bin/iwconfig
deleted file mode 100755
index 42c18ca1..00000000
--- a/src/os-plugins/plugins/wlanboot/files/bin/iwconfig
+++ /dev/null
diff --git a/src/os-plugins/plugins/wlanboot/files/bin/iwevent b/src/os-plugins/plugins/wlanboot/files/bin/iwevent
deleted file mode 100755
index bf9b921b..00000000
--- a/src/os-plugins/plugins/wlanboot/files/bin/iwevent
+++ /dev/null
diff --git a/src/os-plugins/plugins/wlanboot/files/bin/iwgetid b/src/os-plugins/plugins/wlanboot/files/bin/iwgetid
deleted file mode 100755
index a310ee85..00000000
--- a/src/os-plugins/plugins/wlanboot/files/bin/iwgetid
+++ /dev/null
diff --git a/src/os-plugins/plugins/wlanboot/files/bin/iwlist b/src/os-plugins/plugins/wlanboot/files/bin/iwlist
deleted file mode 100755
index 9597d4d4..00000000
--- a/src/os-plugins/plugins/wlanboot/files/bin/iwlist
+++ /dev/null
diff --git a/src/os-plugins/plugins/wlanboot/files/bin/iwpriv b/src/os-plugins/plugins/wlanboot/files/bin/iwpriv
deleted file mode 100755
index a9fd399e..00000000
--- a/src/os-plugins/plugins/wlanboot/files/bin/iwpriv
+++ /dev/null
diff --git a/src/os-plugins/plugins/wlanboot/files/bin/iwspy b/src/os-plugins/plugins/wlanboot/files/bin/iwspy
deleted file mode 100755
index 2bded1e1..00000000
--- a/src/os-plugins/plugins/wlanboot/files/bin/iwspy
+++ /dev/null
diff --git a/src/os-plugins/plugins/wlanboot/files/bin/iwtest b/src/os-plugins/plugins/wlanboot/files/bin/iwtest
deleted file mode 100644
index c6846702..00000000
--- a/src/os-plugins/plugins/wlanboot/files/bin/iwtest
+++ /dev/null
@@ -1 +0,0 @@
-test file for plugin wlanboot.
diff --git a/src/os-plugins/plugins/wlanboot/files/lib/libiw.so b/src/os-plugins/plugins/wlanboot/files/lib/libiw.so
deleted file mode 120000
index ee7675c6..00000000
--- a/src/os-plugins/plugins/wlanboot/files/lib/libiw.so
+++ /dev/null
@@ -1 +0,0 @@
-libiw.so.29
\ No newline at end of file
diff --git a/src/os-plugins/plugins/wlanboot/files/lib/libiw.so.29 b/src/os-plugins/plugins/wlanboot/files/lib/libiw.so.29
deleted file mode 100755
index 1fde3844..00000000
--- a/src/os-plugins/plugins/wlanboot/files/lib/libiw.so.29
+++ /dev/null
diff --git a/src/os-plugins/plugins/wlanboot/files/lib/libiw.so.30 b/src/os-plugins/plugins/wlanboot/files/lib/libiw.so.30
new file mode 100644
index 00000000..9d38d1d9
--- /dev/null
+++ b/src/os-plugins/plugins/wlanboot/files/lib/libiw.so.30
diff --git a/src/os-plugins/plugins/wlanboot/files/sbin/iwconfig b/src/os-plugins/plugins/wlanboot/files/sbin/iwconfig
new file mode 100755
index 00000000..75ec3587
--- /dev/null
+++ b/src/os-plugins/plugins/wlanboot/files/sbin/iwconfig
diff --git a/src/os-plugins/plugins/wlanboot/files/sbin/iwevent b/src/os-plugins/plugins/wlanboot/files/sbin/iwevent
new file mode 100755
index 00000000..cdb121fc
--- /dev/null
+++ b/src/os-plugins/plugins/wlanboot/files/sbin/iwevent
diff --git a/src/os-plugins/plugins/wlanboot/files/sbin/iwgetid b/src/os-plugins/plugins/wlanboot/files/sbin/iwgetid
new file mode 100755
index 00000000..53572b34
--- /dev/null
+++ b/src/os-plugins/plugins/wlanboot/files/sbin/iwgetid
diff --git a/src/os-plugins/plugins/wlanboot/files/sbin/iwlist b/src/os-plugins/plugins/wlanboot/files/sbin/iwlist
new file mode 100755
index 00000000..c3841e02
--- /dev/null
+++ b/src/os-plugins/plugins/wlanboot/files/sbin/iwlist
diff --git a/src/os-plugins/plugins/wlanboot/files/sbin/iwpriv b/src/os-plugins/plugins/wlanboot/files/sbin/iwpriv
new file mode 100755
index 00000000..9a68624c
--- /dev/null
+++ b/src/os-plugins/plugins/wlanboot/files/sbin/iwpriv
diff --git a/src/os-plugins/plugins/wlanboot/files/sbin/iwspy b/src/os-plugins/plugins/wlanboot/files/sbin/iwspy
new file mode 100755
index 00000000..be68314d
--- /dev/null
+++ b/src/os-plugins/plugins/wlanboot/files/sbin/iwspy
diff --git a/src/tools/uclibc-wrapper b/src/tools/uclibc-wrapper
deleted file mode 100755
index 08934f32..00000000
--- a/src/tools/uclibc-wrapper
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2008..2009 - OpenSLX GmbH
-#
-# This program is free software distributed under the GPL version 2.
-# See http://openslx.org/COPYING
-#
-# If you have any feedback please consult http://openslx.org/feedback and
-# send your feedback to feedback@openslx.org
-#
-# General information about OpenSLX can be found under http://openslx.org
-#
-# Wrapper script for OpenSLX environments used with server and client stage4 
-
-if [ -d /opt/openslx/share/uclib-rootfs ]; then
-  SLX_UCLIB_PATH=/opt/openslx/share/uclib-rootfs
-elif [ -d /opt/openslx/uclib-rootfs ]; then
-  SLX_UCLIB_PATH=/opt/openslx/uclib-rootfs
-else
-  echo "Can't find OpenSLX Environment." && exit 1
-fi
-
-[ -f /lib/ld-uClibc.so.0 ] || \
-  ln -sf $SLX_PATH/uclib-rootfs/lib/ld-uClibc.so.0 /lib/ld-uClibc.so.0
-
-PATH=$SLX_UCLIB_PATH/bin:$SLX_UCLIB_PATH/usr/bin:$SLX_UCLIB_PATH/sbin:\
-$SLX_UCLIB_PATH/usr/sbin
-LD_LIBRARY_PATH=$SLX_UCLIB_PATH/lib:$SLX_UCLIB_PATH/usr/lib 
-LD_LIBRARY_PATH=$LD_LIBRARY_PATH PATH=$PATH PS1="#" $@