From 58d7f6a72b92cf2bf4be5811dbf40a84055b041e Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Fri, 14 Jun 2013 09:29:05 -0400 Subject: [PATCH] tools-uclibc: remove useless debugging code --- tools-uclibc/fixup.sh | 29 ---------------------- tools-uclibc/run-armv7a.sh | 48 ++++++------------------------------ tools-uclibc/run-mips32r2.sh | 48 ++++++------------------------------ tools-uclibc/run-mipsel3.sh | 48 ++++++------------------------------ tools-uclibc/run.sh | 48 ++++++------------------------------ 5 files changed, 32 insertions(+), 189 deletions(-) delete mode 100755 tools-uclibc/fixup.sh diff --git a/tools-uclibc/fixup.sh b/tools-uclibc/fixup.sh deleted file mode 100755 index 98bc241e..00000000 --- a/tools-uclibc/fixup.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -# This just fixes up the symbolic links -# to the latest stage{1,2,3} tarballs - -mydate=$1 -mypwd=/var/tmp/catalyst/builds - -find ${mypwd} -type f -size 0 -exec rm {} + -find -L ${mypwd} -type l -exec rm {} + - -for arch in amd64 i686; do - for flavor in hardened vanilla; do - for s in 1 2 3; do - file=stage${s}-${arch}-uclibc-${flavor}-${mydate}.tar.bz2 - link=stage${s}-${arch}-uclibc-${flavor}.tar.bz2 - cd "${mypwd}/${flavor}/${arch}" - if [[ -f ${file} ]]; then - ln -sf ${file} ${link} - else - echo "!!! ${file} doesn't exist!" - echo "!!! make sure \${mydate} is right!" - exit 1 - fi - done - done -done - -tree ${mypwd} diff --git a/tools-uclibc/run-armv7a.sh b/tools-uclibc/run-armv7a.sh index 48e89ea2..e5152a50 100755 --- a/tools-uclibc/run-armv7a.sh +++ b/tools-uclibc/run-armv7a.sh @@ -1,12 +1,5 @@ #!/bin/bash -# -# Usage: ./run-armv7a.sh -# where -# = "", it will actually do the runs -# = "test", it will just pretend -# - source /etc/catalyst/catalyst.conf mydate=`date +%Y%m%d` @@ -54,7 +47,6 @@ EOF do_stages() { local arch=$1 local flavor=$2 - local pretend=$3 for s in 1 2 3; do local tgpath="${storedir}/builds/${flavor}/${arch}" @@ -69,20 +61,11 @@ do_stages() { return 1 fi - if [[ "x${pretend}" != "xtest" ]]; then - banner ${s} ${arch} ${flavor} - catalyst -f stage${s}-${arch}-uclibc-${flavor}.conf \ - | tee -a zzz.log \ - > stage${s}-${arch}-uclibc-${flavor}.log \ - 2> stage${s}-${arch}-uclibc-${flavor}.err - else - touch stage${s}-${arch}-uclibc-${flavor}.log - touch stage${s}-${arch}-uclibc-${flavor}.err - touch "${tgpath}/${target}" - echo "PRETEND: catalyst -f stage${s}-${arch}-uclibc-${flavor}.conf \ " - echo "PRETEND: > stage${s}-${arch}-uclibc-${flavor}.log \ " - echo "PRETEND: 2> stage${s}-${arch}-uclibc-${flavor}.err" - fi + banner ${s} ${arch} ${flavor} + catalyst -f stage${s}-${arch}-uclibc-${flavor}.conf \ + | tee -a zzz.log \ + > stage${s}-${arch}-uclibc-${flavor}.log \ + 2> stage${s}-${arch}-uclibc-${flavor}.err if [[ -f "${tgpath}/${target}" ]]; then rm -f "${tgpath}/${tglink}" @@ -107,17 +90,9 @@ do_stages() { # main() { - local pretend=$1 - >zzz.log - if [[ "x${pretend}" != "xtest" ]]; then - catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err - else - >snapshot.log - >snapshot.err - echo "PRETEND: catalyst -s current > snapshot.log 2> snapshot.err" - fi + catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err for arch in armv7a; do for flavor in hardened vanilla; do @@ -127,21 +102,14 @@ main() { for arch in armv7a; do for flavor in hardened vanilla; do - do_stages ${arch} ${flavor} ${pretend} + do_stages ${arch} ${flavor} ret=$? if [[ $? == 1 ]]; then - echo "FAILURE at ${arch} ${flavor} ${pretend} " | tee zzz.log + echo "FAILURE at ${arch} ${flavor} " | tee zzz.log return 1 fi done done - - if [[ "x${pretend}" == "xtest" ]]; then - tree /var/tmp/catalyst/builds - echo - echo "!!! Run fixup.sh to clean up!" - echo - fi } main $1 & diff --git a/tools-uclibc/run-mips32r2.sh b/tools-uclibc/run-mips32r2.sh index e549f19f..446772be 100755 --- a/tools-uclibc/run-mips32r2.sh +++ b/tools-uclibc/run-mips32r2.sh @@ -1,12 +1,5 @@ #!/bin/bash -# -# Usage: ./run-mips32r2.sh -# where -# = "", it will actually do the runs -# = "test", it will just pretend -# - source /etc/catalyst/catalyst.conf mydate=`date +%Y%m%d` @@ -53,7 +46,6 @@ EOF do_stages() { local arch=$1 local flavor=$2 - local pretend=$3 for s in 1 2 3; do local tgpath="${storedir}/builds/${flavor}/${arch}" @@ -68,20 +60,11 @@ do_stages() { return 1 fi - if [[ "x${pretend}" != "xtest" ]]; then - banner ${s} ${arch} ${flavor} - catalyst -f stage${s}-${arch}-uclibc-${flavor}.conf \ - | tee -a zzz.log \ - > stage${s}-${arch}-uclibc-${flavor}.log \ - 2> stage${s}-${arch}-uclibc-${flavor}.err - else - touch stage${s}-${arch}-uclibc-${flavor}.log - touch stage${s}-${arch}-uclibc-${flavor}.err - touch "${tgpath}/${target}" - echo "PRETEND: catalyst -f stage${s}-${arch}-uclibc-${flavor}.conf \ " - echo "PRETEND: > stage${s}-${arch}-uclibc-${flavor}.log \ " - echo "PRETEND: 2> stage${s}-${arch}-uclibc-${flavor}.err" - fi + banner ${s} ${arch} ${flavor} + catalyst -f stage${s}-${arch}-uclibc-${flavor}.conf \ + | tee -a zzz.log \ + > stage${s}-${arch}-uclibc-${flavor}.log \ + 2> stage${s}-${arch}-uclibc-${flavor}.err if [[ -f "${tgpath}/${target}" ]]; then rm -f "${tgpath}/${tglink}" @@ -106,17 +89,9 @@ do_stages() { # main() { - local pretend=$1 - >zzz.log - if [[ "x${pretend}" != "xtest" ]]; then - catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err - else - >snapshot.log - >snapshot.err - echo "PRETEND: catalyst -s current > snapshot.log 2> snapshot.err" - fi + catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err for arch in mips32r2; do for flavor in hardened vanilla; do @@ -126,21 +101,14 @@ main() { for arch in mips32r2; do for flavor in hardened vanilla; do - do_stages ${arch} ${flavor} ${pretend} + do_stages ${arch} ${flavor} ret=$? if [[ $? == 1 ]]; then - echo "FAILURE at ${arch} ${flavor} ${pretend} " | tee zzz.log + echo "FAILURE at ${arch} ${flavor} " | tee zzz.log return 1 fi done done - - if [[ "x${pretend}" == "xtest" ]]; then - tree /var/tmp/catalyst/builds - echo - echo "!!! Run fixup.sh to clean up!" - echo - fi } main $1 & diff --git a/tools-uclibc/run-mipsel3.sh b/tools-uclibc/run-mipsel3.sh index d9ef241e..87fc1b74 100755 --- a/tools-uclibc/run-mipsel3.sh +++ b/tools-uclibc/run-mipsel3.sh @@ -1,12 +1,5 @@ #!/bin/bash -# -# Usage: ./run-mipsel3.sh -# where -# = "", it will actually do the runs -# = "test", it will just pretend -# - source /etc/catalyst/catalyst.conf mydate=`date +%Y%m%d` @@ -53,7 +46,6 @@ EOF do_stages() { local arch=$1 local flavor=$2 - local pretend=$3 for s in 1 2 3; do local tgpath="${storedir}/builds/${flavor}/${arch}" @@ -68,20 +60,11 @@ do_stages() { return 1 fi - if [[ "x${pretend}" != "xtest" ]]; then - banner ${s} ${arch} ${flavor} - catalyst -f stage${s}-${arch}-uclibc-${flavor}.conf \ - | tee -a zzz.log \ - > stage${s}-${arch}-uclibc-${flavor}.log \ - 2> stage${s}-${arch}-uclibc-${flavor}.err - else - touch stage${s}-${arch}-uclibc-${flavor}.log - touch stage${s}-${arch}-uclibc-${flavor}.err - touch "${tgpath}/${target}" - echo "PRETEND: catalyst -f stage${s}-${arch}-uclibc-${flavor}.conf \ " - echo "PRETEND: > stage${s}-${arch}-uclibc-${flavor}.log \ " - echo "PRETEND: 2> stage${s}-${arch}-uclibc-${flavor}.err" - fi + banner ${s} ${arch} ${flavor} + catalyst -f stage${s}-${arch}-uclibc-${flavor}.conf \ + | tee -a zzz.log \ + > stage${s}-${arch}-uclibc-${flavor}.log \ + 2> stage${s}-${arch}-uclibc-${flavor}.err if [[ -f "${tgpath}/${target}" ]]; then rm -f "${tgpath}/${tglink}" @@ -106,17 +89,9 @@ do_stages() { # main() { - local pretend=$1 - >zzz.log - if [[ "x${pretend}" != "xtest" ]]; then - catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err - else - >snapshot.log - >snapshot.err - echo "PRETEND: catalyst -s current > snapshot.log 2> snapshot.err" - fi + catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err for arch in mipsel3; do for flavor in hardened vanilla; do @@ -126,21 +101,14 @@ main() { for arch in mipsel3; do for flavor in hardened vanilla; do - do_stages ${arch} ${flavor} ${pretend} + do_stages ${arch} ${flavor} ret=$? if [[ $? == 1 ]]; then - echo "FAILURE at ${arch} ${flavor} ${pretend} " | tee zzz.log + echo "FAILURE at ${arch} ${flavor} " | tee zzz.log return 1 fi done done - - if [[ "x${pretend}" == "xtest" ]]; then - tree /var/tmp/catalyst/builds - echo - echo "!!! Run fixup.sh to clean up!" - echo - fi } main $1 & diff --git a/tools-uclibc/run.sh b/tools-uclibc/run.sh index a896e66d..45e0266c 100755 --- a/tools-uclibc/run.sh +++ b/tools-uclibc/run.sh @@ -1,12 +1,5 @@ #!/bin/bash -# -# Usage: ./run.sh -# where -# = "", it will actually do the runs -# = "test", it will just pretend -# - source /etc/catalyst/catalyst.conf mydate=`date +%Y%m%d` @@ -64,7 +57,6 @@ EOF do_stages() { local arch=$1 local flavor=$2 - local pretend=$3 for s in 1 2 3; do local tgpath="${storedir}/builds/${flavor}/${arch}" @@ -79,20 +71,11 @@ do_stages() { return 1 fi - if [[ "x${pretend}" != "xtest" ]]; then - banner ${s} ${arch} ${flavor} - catalyst -f stage${s}-${arch}-uclibc-${flavor}.conf \ - | tee -a zzz.log \ - > stage${s}-${arch}-uclibc-${flavor}.log \ - 2> stage${s}-${arch}-uclibc-${flavor}.err - else - touch stage${s}-${arch}-uclibc-${flavor}.log - touch stage${s}-${arch}-uclibc-${flavor}.err - touch "${tgpath}/${target}" - echo "PRETEND: catalyst -f stage${s}-${arch}-uclibc-${flavor}.conf \ " - echo "PRETEND: > stage${s}-${arch}-uclibc-${flavor}.log \ " - echo "PRETEND: 2> stage${s}-${arch}-uclibc-${flavor}.err" - fi + banner ${s} ${arch} ${flavor} + catalyst -f stage${s}-${arch}-uclibc-${flavor}.conf \ + | tee -a zzz.log \ + > stage${s}-${arch}-uclibc-${flavor}.log \ + 2> stage${s}-${arch}-uclibc-${flavor}.err if [[ -f "${tgpath}/${target}" ]]; then rm -f "${tgpath}/${tglink}" @@ -117,19 +100,11 @@ do_stages() { # main() { - local pretend=$1 - >zzz.log undo_grsec - if [[ "x${pretend}" != "xtest" ]]; then - catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err - else - >snapshot.log - >snapshot.err - echo "PRETEND: catalyst -s current > snapshot.log 2> snapshot.err" - fi + catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err for arch in amd64 i686; do for flavor in hardened vanilla; do @@ -139,21 +114,14 @@ main() { for arch in amd64 i686; do for flavor in hardened vanilla; do - do_stages ${arch} ${flavor} ${pretend} + do_stages ${arch} ${flavor} ret=$? if [[ $? == 1 ]]; then - echo "FAILURE at ${arch} ${flavor} ${pretend} " | tee zzz.log + echo "FAILURE at ${arch} ${flavor}" | tee zzz.log return 1 fi done done - - if [[ "x${pretend}" == "xtest" ]]; then - tree /var/tmp/catalyst/builds - echo - echo "!!! Run fixup.sh to clean up!" - echo - fi } main $1 &