From fa6c215f7bac38b9bd9e43d55725a3066ff57fe3 Mon Sep 17 00:00:00 2001 From: Sebastian Schmelzer Date: Mon, 4 Oct 2010 18:53:57 +0200 Subject: remove uclibc stuff - part II --- .../plugins/dropbear/OpenSLX/OSPlugin/dropbear.pm | 2 +- src/os-plugins/plugins/dropbear/XX_dropbear.sh | 8 +++----- src/os-plugins/plugins/dropbear/files/dropbearmulti | Bin 160408 -> 0 bytes .../plugins/dropbear/files/lib/libcrypt.so.1 | Bin 0 -> 38360 bytes src/os-plugins/plugins/dropbear/files/lib/libutil.so.1 | Bin 0 -> 9748 bytes src/os-plugins/plugins/dropbear/files/usr/bin/dbclient | Bin 0 -> 122644 bytes .../plugins/dropbear/files/usr/bin/dropbearkey | Bin 0 -> 59264 bytes .../plugins/dropbear/files/usr/sbin/dropbear | Bin 0 -> 133720 bytes .../plugins/qemukvm/OpenSLX/OSPlugin/qemukvm.pm | 6 +++--- src/os-plugins/plugins/wlanboot/files/bin/iwconfig | Bin 17596 -> 0 bytes src/os-plugins/plugins/wlanboot/files/bin/iwevent | Bin 13496 -> 0 bytes src/os-plugins/plugins/wlanboot/files/bin/iwgetid | Bin 9300 -> 0 bytes src/os-plugins/plugins/wlanboot/files/bin/iwlist | Bin 25840 -> 0 bytes src/os-plugins/plugins/wlanboot/files/bin/iwpriv | Bin 9340 -> 0 bytes src/os-plugins/plugins/wlanboot/files/bin/iwspy | Bin 9328 -> 0 bytes src/os-plugins/plugins/wlanboot/files/bin/iwtest | 1 - src/os-plugins/plugins/wlanboot/files/lib/libiw.so | 1 - src/os-plugins/plugins/wlanboot/files/lib/libiw.so.29 | Bin 25892 -> 0 bytes src/os-plugins/plugins/wlanboot/files/lib/libiw.so.30 | Bin 0 -> 28252 bytes src/os-plugins/plugins/wlanboot/files/sbin/iwconfig | Bin 0 -> 20632 bytes src/os-plugins/plugins/wlanboot/files/sbin/iwevent | Bin 0 -> 12112 bytes src/os-plugins/plugins/wlanboot/files/sbin/iwgetid | Bin 0 -> 7868 bytes src/os-plugins/plugins/wlanboot/files/sbin/iwlist | Bin 0 -> 26352 bytes src/os-plugins/plugins/wlanboot/files/sbin/iwpriv | Bin 0 -> 9012 bytes src/os-plugins/plugins/wlanboot/files/sbin/iwspy | Bin 0 -> 8236 bytes 25 files changed, 7 insertions(+), 11 deletions(-) delete mode 100755 src/os-plugins/plugins/dropbear/files/dropbearmulti create mode 100644 src/os-plugins/plugins/dropbear/files/lib/libcrypt.so.1 create mode 100644 src/os-plugins/plugins/dropbear/files/lib/libutil.so.1 create mode 100755 src/os-plugins/plugins/dropbear/files/usr/bin/dbclient create mode 100755 src/os-plugins/plugins/dropbear/files/usr/bin/dropbearkey create mode 100755 src/os-plugins/plugins/dropbear/files/usr/sbin/dropbear delete mode 100755 src/os-plugins/plugins/wlanboot/files/bin/iwconfig delete mode 100755 src/os-plugins/plugins/wlanboot/files/bin/iwevent delete mode 100755 src/os-plugins/plugins/wlanboot/files/bin/iwgetid delete mode 100755 src/os-plugins/plugins/wlanboot/files/bin/iwlist delete mode 100755 src/os-plugins/plugins/wlanboot/files/bin/iwpriv delete mode 100755 src/os-plugins/plugins/wlanboot/files/bin/iwspy delete mode 100644 src/os-plugins/plugins/wlanboot/files/bin/iwtest delete mode 120000 src/os-plugins/plugins/wlanboot/files/lib/libiw.so delete mode 100755 src/os-plugins/plugins/wlanboot/files/lib/libiw.so.29 create mode 100644 src/os-plugins/plugins/wlanboot/files/lib/libiw.so.30 create mode 100755 src/os-plugins/plugins/wlanboot/files/sbin/iwconfig create mode 100755 src/os-plugins/plugins/wlanboot/files/sbin/iwevent create mode 100755 src/os-plugins/plugins/wlanboot/files/sbin/iwgetid create mode 100755 src/os-plugins/plugins/wlanboot/files/sbin/iwlist create mode 100755 src/os-plugins/plugins/wlanboot/files/sbin/iwpriv create mode 100755 src/os-plugins/plugins/wlanboot/files/sbin/iwspy (limited to 'src/os-plugins/plugins') 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 Binary files a/src/os-plugins/plugins/dropbear/files/dropbearmulti and /dev/null 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 Binary files /dev/null and b/src/os-plugins/plugins/dropbear/files/lib/libcrypt.so.1 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 Binary files /dev/null and b/src/os-plugins/plugins/dropbear/files/lib/libutil.so.1 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 Binary files /dev/null and b/src/os-plugins/plugins/dropbear/files/usr/bin/dbclient 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 Binary files /dev/null and b/src/os-plugins/plugins/dropbear/files/usr/bin/dropbearkey 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 Binary files /dev/null and b/src/os-plugins/plugins/dropbear/files/usr/sbin/dropbear 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 Binary files a/src/os-plugins/plugins/wlanboot/files/bin/iwconfig and /dev/null 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 Binary files a/src/os-plugins/plugins/wlanboot/files/bin/iwevent and /dev/null 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 Binary files a/src/os-plugins/plugins/wlanboot/files/bin/iwgetid and /dev/null 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 Binary files a/src/os-plugins/plugins/wlanboot/files/bin/iwlist and /dev/null 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 Binary files a/src/os-plugins/plugins/wlanboot/files/bin/iwpriv and /dev/null 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 Binary files a/src/os-plugins/plugins/wlanboot/files/bin/iwspy and /dev/null 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 Binary files a/src/os-plugins/plugins/wlanboot/files/lib/libiw.so.29 and /dev/null 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 Binary files /dev/null and b/src/os-plugins/plugins/wlanboot/files/lib/libiw.so.30 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 Binary files /dev/null and b/src/os-plugins/plugins/wlanboot/files/sbin/iwconfig 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 Binary files /dev/null and b/src/os-plugins/plugins/wlanboot/files/sbin/iwevent 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 Binary files /dev/null and b/src/os-plugins/plugins/wlanboot/files/sbin/iwgetid 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 Binary files /dev/null and b/src/os-plugins/plugins/wlanboot/files/sbin/iwlist 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 Binary files /dev/null and b/src/os-plugins/plugins/wlanboot/files/sbin/iwpriv 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 Binary files /dev/null and b/src/os-plugins/plugins/wlanboot/files/sbin/iwspy differ -- cgit v1.2.3-55-g7522