diff options
author | Jonathan Bauer | 2013-02-14 16:02:01 +0100 |
---|---|---|
committer | Jonathan Bauer | 2013-02-14 16:02:01 +0100 |
commit | 5bbedbe7b55dde3fabe7dc4797522b77495df6be (patch) | |
tree | 514c84e6efdf3513f4aeaf7545443107c4f96c2b /remote/setup_tools | |
parent | fix path for gtk-pixbuf? (diff) | |
download | tm-scripts-5bbedbe7b55dde3fabe7dc4797522b77495df6be.tar.gz tm-scripts-5bbedbe7b55dde3fabe7dc4797522b77495df6be.tar.xz tm-scripts-5bbedbe7b55dde3fabe7dc4797522b77495df6be.zip |
debug output cleaned a bit
Diffstat (limited to 'remote/setup_tools')
-rwxr-xr-x | remote/setup_tools | 89 |
1 files changed, 51 insertions, 38 deletions
diff --git a/remote/setup_tools b/remote/setup_tools index ef498960..bb1895d0 100755 --- a/remote/setup_tools +++ b/remote/setup_tools @@ -44,20 +44,25 @@ copyfileswithdependencies () [ ! -d build ] && echo "No build directory for ${TOOL} found." && return cd build - [ "x$DEBUG" != "x1" ] && echo "Logging to build_stage32.log" && exec 6>&1 > build_stage32.log COPYFILES_LIST="list_wanted_stage3.2" [ -e ${COPYFILES_LIST} ] && rm ${COPYFILES_LIST} - + + + echo -e "\n\n*********************************************************" + echo "*" + echo "* Copying required binaries from config file..." + echo "*" + echo -e "*********************************************************\n\n" for FILENAME in ${REQUIRED_BINARIES} do FILE=$(find . -name ${FILENAME} -type f -executable | xargs grep -l ELF) if [ -z "$FILE" ]; then - echo "No Binary found for ${FILENAME}. Skipping." + echo -e "\tNo Binary found for ${FILENAME}. Skipping." echo "-----------------------------------------------------------------" continue fi - echo "Found ${FILENAME} at ${FILE}" + echo -e "\tFound ${FILENAME} at ${FILE}" echo ${FILE} >> ${COPYFILES_LIST} # fetch dependencies # quick fix to exclude libc*, else it copies unneeded libs... @@ -66,14 +71,14 @@ copyfileswithdependencies () ldd_exit_code=$? if [ "x$ldd_exit_code" != "x0" ]; then - echo "ldd $FILE failed." + echo -e "\tldd $FILE failed." continue fi for i in $(ldd ${FILE} |awk '{print $1 $2 $3}'|grep -v ld-linux|grep -v libc.so*|grep -v linux-gate|grep -v linux-vdso) do arrIN=(${i//=>/ }) - echo -e -n "\t${arrIN[0]}" - LOCAL_MATCHES=$(find . -name $(echo ${arrIN[0]}|awk -F "." '{print $1}').*) + echo -en "\t\t${arrIN[0]}" + LOCAL_MATCHES=$(find . -name $(echo ${arrIN[0]}|awk -F "." '{print $1}').so*) if [ "x${LOCAL_MATCHES}" != "x" ]; then for llib in ${LOCAL_MATCHES}; @@ -97,7 +102,7 @@ copyfileswithdependencies () fi fi done - echo "-----------------------------------------------------------------" + echo -e "\t-------------------------------------------------------------------------------------------------------------" done for LIB in ${REQUIRED_LIBRARIES} @@ -108,49 +113,56 @@ copyfileswithdependencies () done done - echo "Copying required directories from config file..." + echo -e "\n\n*********************************************************" + echo "*" + echo "* Copying required directories from config file..." + echo "*" + echo -e "*********************************************************\n\n" for ENTRY in ${REQUIRED_DIRECTORIES} do echo ".${ENTRY}" >> ${COPYFILES_LIST} - for LIB in $(find .${ENTRY} -type f -not -name "*.a" | xargs grep -l ELF) + for BIN in $(find .${ENTRY} -type f -not -name "*.a" | xargs grep -l ELF) do - for i in $(ldd ${LIB} |awk '{print $1 $2 $3}'|grep -v ld-linux|grep -v libc.so*|grep -v linux-gate|grep -v linux-vdso) + echo -e "\tSearching libs for ${BIN}..." + for i in $(ldd ${BIN} |awk '{print $1 $2 $3}'|grep -v ld-linux|grep -v libc.so*|grep -v linux-gate|grep -v linux-vdso) do arrIN=(${i//=>/ }) - echo "--------------------------------------------------------" - echo "Searching ${arrIN[0]} under $(pwd)..." - LOCAL_MATCHES=$(find . -name $(echo ${arrIN[0]}|awk -F "." '{print $1}').*) + echo -e "\t\t---------------------------------------------------------" + echo -ne "\t\tSearching ${arrIN[0]} under $(pwd)..." + LOCAL_MATCHES=$(find . -name $(echo ${arrIN[0]}|awk -F "." '{print $1}').so*) if [ "x${LOCAL_MATCHES}" != "x" ]; then for llib in ${LOCAL_MATCHES}; do - echo "Copying ${llib}" + echo -en "\n\t\tCopying ${llib}" echo ${llib} >> ${COPYFILES_LIST} done + echo "" else - echo "Did not found ${arrIN[0]} in $(pwd)" + echo " not found." if [ ! -z ${arrIN[1]} ]; then - echo -n "Trying ${arrIN[1]} ..." - echo " found! Copying." + echo -e "\t\tCopying from system ${arrIN[1]} ..." echo ${arrIN[1]} >> ${COPYFILES_LIST} [ -L ${arrIN[1]} ] && echo $(readlink -f ${arrIN[1]}) >> ${COPYFILES_LIST} fi fi done - echo "Copied ${LIB}." - echo "-----------------------------------------------------------------" + echo -e "\tCopied $BIN" + echo -e "\t-------------------------------------------------------------------------------------------------------------" done done - echo "Copying required files from config file..." + echo "*********************************************************" + echo "*" + echo "* Copying required files from config file..." + echo "*" + echo "*********************************************************" for ENTRY in ${REQUIRED_FILES} do echo ".${ENTRY}" >> ${COPYFILES_LIST} done - # reset pipes - [ "x$DEBUG" != "x1" ] && exec 1>&6 6>&- #copy to initramfsdir echo "[stage32] Completed file list generation at ${TOOL_DIR}/${TOOL}/build/${COPYFILES_LIST}." @@ -167,43 +179,43 @@ get_basic_libs () { # copy libc and ld-linux separatly echo "----------------------------------------------------" - echo "Looking for libc and ld-linux used for ${SHELL}..." 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 - echo "Found basic lib at: $i" + echo "Copied $i" BASICLIBS="${BASICLIBS} $i $(readlink -f "$i")" fi done (tar -cpv ${BASICLIBS} | tar -xpv -C ${INIT_DIR}) &>/dev/null - echo "Basic libs copied." } generate_stage32 () { initial_checks + get_basic_libs + # if no arguments assume all. if [ "x$1" = "x" -o "x$1" = "xall" ]; then tools=$(ls ${TOOL_DIR}) set -- $tools fi - # first copy libc and ld-linux - get_basic_libs - # now iterate over given tools and copy them cd ${TOOL_DIR} while (( "$#" )); do - TOOL=$1 + TOOL=$1 if [ -d ${TOOL} ]; then - echo "###############################################################" - echo "# BUILDING $TOOL" - echo "###############################################################" - + echo "###################################################################################" + echo "# BUILDING $TOOL" + echo "#" + + [ "x$DEBUG" != "x1" ] \ + && echo "Logging to ${TOOL_DIR}/${TOOL}/stage32.log" \ + && exec 6>&1 > ${TOOL_DIR}/${TOOL}/stage32.log cd ${TOOL} read_config read_build @@ -214,15 +226,16 @@ generate_stage32 () { post_copy cd ${TOOL_DIR} - echo "###############################################################" - echo "# COMPLETED $TOOL" - echo "###############################################################" + # reset pipes + [ "x$DEBUG" != "x1" ] && exec 1>&6 6>&- + echo "#" + echo "# DONE" + echo "###################################################################################" else echo "Tool directory not found." fi shift done - } clean_tools() { |