summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Schmelzer2010-10-04 18:53:57 +0200
committerSebastian Schmelzer2010-10-04 18:53:57 +0200
commitfa6c215f7bac38b9bd9e43d55725a3066ff57fe3 (patch)
tree328dd1444dbeeefe64e718f6cbf4e69dd625b58b
parentadd missing libraries (diff)
downloadcore-fa6c215f7bac38b9bd9e43d55725a3066ff57fe3.tar.gz
core-fa6c215f7bac38b9bd9e43d55725a3066ff57fe3.tar.xz
core-fa6c215f7bac38b9bd9e43d55725a3066ff57fe3.zip
remove uclibc stuff - part II
-rw-r--r--src/boot-env/preboot/rootfs/lib/libgcc_s.so.1bin0 -> 116600 bytes
-rw-r--r--src/boot-env/preboot/rootfs/lib/libm.so.6bin0 -> 149392 bytes
-rw-r--r--[l---------]src/boot-env/preboot/rootfs/lib/libncurses.so.5bin17 -> 231576 bytes
-rw-r--r--src/boot-env/preboot/rootfs/lib/libncursesw.so.5bin0 -> 282648 bytes
-rw-r--r--src/boot-env/preboot/rootfs/lib/libnsl.so.1bin0 -> 79676 bytes
-rwxr-xr-xsrc/boot-env/preboot/rootfs/lib/libpthread.so.0bin0 -> 117105 bytes
-rwxr-xr-xsrc/boot-env/preboot/rootfs/sbin/kdumpbin0 -> 6176 bytes
-rwxr-xr-xsrc/boot-env/preboot/rootfs/sbin/kexecbin0 -> 141392 bytes
-rwxr-xr-xsrc/boot-env/preboot/rootfs/usr/bin/clearbin5156 -> 3480 bytes
-rwxr-xr-xsrc/boot-env/preboot/rootfs/usr/bin/dialogbin108520 -> 150408 bytes
-rwxr-xr-xsrc/boot-env/preboot/rootfs/usr/bin/w3mbin1093832 -> 1193060 bytes
-rw-r--r--src/boot-env/preboot/rootfs/usr/lib/i686/cmov/libcrypto.so.0.9.8bin0 -> 1392124 bytes
-rw-r--r--src/boot-env/preboot/rootfs/usr/lib/i686/cmov/libssl.so.0.9.8bin0 -> 302032 bytes
l---------src/boot-env/preboot/rootfs/usr/lib/libcrypto.so1
-rwxr-xr-xsrc/boot-env/preboot/rootfs/usr/lib/libcrypto.so.0.9.8bin1143120 -> 0 bytes
-rw-r--r--src/boot-env/preboot/rootfs/usr/lib/libgc.so.1bin0 -> 143288 bytes
-rw-r--r--src/boot-env/preboot/rootfs/usr/lib/libgpm.so.2bin0 -> 19100 bytes
-rwxr-xr-xsrc/boot-env/preboot/rootfs/usr/sbin/kdumpbin5200 -> 0 bytes
-rwxr-xr-xsrc/boot-env/preboot/rootfs/usr/sbin/kexecbin104068 -> 0 bytes
-rw-r--r--src/os-plugins/plugins/dropbear/OpenSLX/OSPlugin/dropbear.pm2
-rw-r--r--src/os-plugins/plugins/dropbear/XX_dropbear.sh8
-rwxr-xr-xsrc/os-plugins/plugins/dropbear/files/dropbearmultibin160408 -> 0 bytes
-rw-r--r--src/os-plugins/plugins/dropbear/files/lib/libcrypt.so.1bin0 -> 38360 bytes
-rw-r--r--src/os-plugins/plugins/dropbear/files/lib/libutil.so.1bin0 -> 9748 bytes
-rwxr-xr-xsrc/os-plugins/plugins/dropbear/files/usr/bin/dbclientbin0 -> 122644 bytes
-rwxr-xr-xsrc/os-plugins/plugins/dropbear/files/usr/bin/dropbearkeybin0 -> 59264 bytes
-rwxr-xr-xsrc/os-plugins/plugins/dropbear/files/usr/sbin/dropbearbin0 -> 133720 bytes
-rw-r--r--src/os-plugins/plugins/qemukvm/OpenSLX/OSPlugin/qemukvm.pm6
-rwxr-xr-xsrc/os-plugins/plugins/wlanboot/files/bin/iwconfigbin17596 -> 0 bytes
-rwxr-xr-xsrc/os-plugins/plugins/wlanboot/files/bin/iweventbin13496 -> 0 bytes
-rwxr-xr-xsrc/os-plugins/plugins/wlanboot/files/bin/iwgetidbin9300 -> 0 bytes
-rwxr-xr-xsrc/os-plugins/plugins/wlanboot/files/bin/iwlistbin25840 -> 0 bytes
-rwxr-xr-xsrc/os-plugins/plugins/wlanboot/files/bin/iwprivbin9340 -> 0 bytes
-rwxr-xr-xsrc/os-plugins/plugins/wlanboot/files/bin/iwspybin9328 -> 0 bytes
-rw-r--r--src/os-plugins/plugins/wlanboot/files/bin/iwtest1
l---------src/os-plugins/plugins/wlanboot/files/lib/libiw.so1
-rwxr-xr-xsrc/os-plugins/plugins/wlanboot/files/lib/libiw.so.29bin25892 -> 0 bytes
-rw-r--r--src/os-plugins/plugins/wlanboot/files/lib/libiw.so.30bin0 -> 28252 bytes
-rwxr-xr-xsrc/os-plugins/plugins/wlanboot/files/sbin/iwconfigbin0 -> 20632 bytes
-rwxr-xr-xsrc/os-plugins/plugins/wlanboot/files/sbin/iweventbin0 -> 12112 bytes
-rwxr-xr-xsrc/os-plugins/plugins/wlanboot/files/sbin/iwgetidbin0 -> 7868 bytes
-rwxr-xr-xsrc/os-plugins/plugins/wlanboot/files/sbin/iwlistbin0 -> 26352 bytes
-rwxr-xr-xsrc/os-plugins/plugins/wlanboot/files/sbin/iwprivbin0 -> 9012 bytes
-rwxr-xr-xsrc/os-plugins/plugins/wlanboot/files/sbin/iwspybin0 -> 8236 bytes
-rwxr-xr-xsrc/tools/uclibc-wrapper28
-rwxr-xr-xtools/installer6
46 files changed, 10 insertions, 43 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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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="#" $@
diff --git a/tools/installer b/tools/installer
index 9345c31b..6010b1e2 100755
--- a/tools/installer
+++ b/tools/installer
@@ -225,8 +225,8 @@ prepare_install()
done
### deprecated.. ###
- ln -sf ${SLX_BASE_PATH}/share/uclib-rootfs/lib/ld-uClibc.so.0 \
- ${PREPARE_INSTALL_TARGET}/lib/ld-uClibc.so.0
+ #ln -sf ${SLX_BASE_PATH}/share/uclib-rootfs/lib/ld-uClibc.so.0 \
+ # ${PREPARE_INSTALL_TARGET}/lib/ld-uClibc.so.0
echo -e " [${LightGreen}ok${NC}]"
@@ -654,4 +654,4 @@ cleanup_tmpfiles
#make_source_tarball gzip
#make_source_tarball bzip2
#make_source_tarball lzma
-#git_version \ No newline at end of file
+#git_version