diff options
| author | Michael Neves | 2013-03-13 17:09:52 +0100 |
|---|---|---|
| committer | Michael Neves | 2013-03-13 17:09:52 +0100 |
| commit | d61f3679476568493779f6a4055e09bb05dc1884 (patch) | |
| tree | 0033de8a5286118c87ca0f41b132a2d0ed847622 /remote/setup_tools | |
| parent | vmchooser tool not finished (diff) | |
| parent | stage3.1 'debug' to drop a shell (diff) | |
| download | tm-scripts-d61f3679476568493779f6a4055e09bb05dc1884.tar.gz tm-scripts-d61f3679476568493779f6a4055e09bb05dc1884.tar.xz tm-scripts-d61f3679476568493779f6a4055e09bb05dc1884.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/setup_tools')
| -rwxr-xr-x | remote/setup_tools | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/remote/setup_tools b/remote/setup_tools index 4ddd0ef0..63fa3f09 100755 --- a/remote/setup_tools +++ b/remote/setup_tools @@ -132,31 +132,11 @@ copyfileswithdependencies () fi } -get_basic_libs () { - - [ ! -d ${INIT_DIR} ] && mkdir ${INIT_DIR} - - # copy libc and ld-linux separatly - pinfo "Adding basic libs" - BASICLIBS="" - for i in $(ldd ${SHELL}) - do - if [ $(echo $i | grep '^/' | grep -c ld) -eq 1 -o $(echo $i | grep '^/' | grep -c libc.so) -eq 1 ]; - then - pdebug "Adding $i" - BASICLIBS="${BASICLIBS} $i $(readlink -f "$i")" - fi - done - tar -cp ${BASICLIBS} | tar -xp -C ${INIT_DIR} - local RET=$? - [ "x$RET" != "x0" ] && perror "Could not tar-copy to $INIT_DIR" -} - generate_stage32 () { initial_checks - get_basic_libs + tarcopy "$(list_basic_libs)" "${INIT_DIR}" # if no arguments assume all. if [ "x$1" = "x" -o "x$1" = "xall" ]; then @@ -246,7 +226,7 @@ clean_tools() { clean_tool() { TOOLDIR=${TOOL_DIR}/$1 - pinfo "Cleaning ${TOOLDIR}..." + pinfo "Cleaning '${TOOLDIR}'..." #[ -e ${TOOLDIR}/build/list_wanted_stage3.2 ] && cd ${INIT_DIR} \ # && xargs rm < ${TOOLDIR}/build/list_wanted_stage3.2 #[ -d ${TOOLDIR}/data ] && cd ${INIT_DIR} \ |