diff --git a/.gitignore b/.gitignore index c94f27247a..10f8e8dd1b 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,11 @@ mkpkg-temp # private working directory /.work/ + +# symlinks... +/sources +/.work + +# backup files +*.orig + diff --git a/scripts/autoreconf b/scripts/autoreconf index 5178992235..9116b1498e 100755 --- a/scripts/autoreconf +++ b/scripts/autoreconf @@ -24,7 +24,7 @@ [ ! -f "$PKG_BUILD/configure.in" -a ! -f "$PKG_BUILD/configure.ac" ] && echo "configure.in or configure.ac not found" && exit 1 -printf "%${INDENT}c AUTORECONF $1\n" >&$SILENT_OUT +printf "%${INDENT}c AUTORECONF $1\n" ' '>&$SILENT_OUT export INDENT=$((${INDENT:-1}+$INDENT_SIZE)) do_autoreconf $PKG_BUILD diff --git a/scripts/build b/scripts/build index 80d4be9b16..cd735432dd 100755 --- a/scripts/build +++ b/scripts/build @@ -50,7 +50,7 @@ fi if [ ! -f $STAMP ]; then rm -f $STAMP - printf "%${INDENT}c BUILD $1\n" >&$SILENT_OUT + printf "%${INDENT}c BUILD $1\n" ' '>&$SILENT_OUT export INDENT=$((${INDENT:-1}+$INDENT_SIZE)) for p in $PKG_BUILD_DEPENDS; do diff --git a/scripts/create_addon b/scripts/create_addon index f72c049742..b1e6c9a841 100755 --- a/scripts/create_addon +++ b/scripts/create_addon @@ -43,7 +43,7 @@ fi $SCRIPTS/build $@ -printf "%${INDENT}c CREATE ADDON $1\n" >&$SILENT_OUT +printf "%${INDENT}c CREATE ADDON $1\n" ' '>&$SILENT_OUT export INDENT=$((${INDENT:-1}+$INDENT_SIZE)) if [ -f $PKG_DIR/addon ]; then diff --git a/scripts/get b/scripts/get index e1639ab056..d901d9114e 100755 --- a/scripts/get +++ b/scripts/get @@ -58,7 +58,7 @@ if [ -n "$PKG_URL" ]; then rm -f $STAMP - printf "%${INDENT}c GET $1\n" >&$SILENT_OUT + printf "%${INDENT}c GET $1\n" ' '>&$SILENT_OUT export INDENT=$((${INDENT:-1}+$INDENT_SIZE)) until [ -f "$STAMP" ] || $WGET_CMD $i || $WGET_CMD $PACKAGE_MIRROR; do diff --git a/scripts/install b/scripts/install index 86b9bca7e8..beb266c95e 100755 --- a/scripts/install +++ b/scripts/install @@ -65,7 +65,7 @@ fi $SCRIPTS/build $@ -printf "%${INDENT}c INSTALL $1\n" >&$SILENT_OUT +printf "%${INDENT}c INSTALL $1\n" ' '>&$SILENT_OUT export INDENT=$((${INDENT:-1}+$INDENT_SIZE)) for p in $PKG_DEPENDS; do diff --git a/scripts/unpack b/scripts/unpack index a7c88580bb..dee9593ff1 100755 --- a/scripts/unpack +++ b/scripts/unpack @@ -47,7 +47,7 @@ done [ -f "$STAMP" ] && exit 0 -printf "%${INDENT}c UNPACK $1\n" >&$SILENT_OUT +printf "%${INDENT}c UNPACK $1\n" ' '>&$SILENT_OUT export INDENT=$((${INDENT:-1}+$INDENT_SIZE)) rm -rf $BUILD/$1[-_][0-9]* @@ -82,10 +82,10 @@ for i in $PKG_DIR/patches/$PKG_NAME-$PKG_VERSION*.patch ; do PATCH=`basename $i` PT=`echo $PATCH | sed 's/.*\.\(.*\)$/\1/'` if [ "$PT" != "patch" -a "$PT" != "$TARGET_ARCH" ]; then - printf "%${INDENT}c SKIP PATCH: $i\n" >&$SILENT_OUT + printf "%${INDENT}c SKIP PATCH: $i\n" ' '>&$SILENT_OUT continue; else - printf "%${INDENT}c APPLY PATCH: $i\n" >&$SILENT_OUT + printf "%${INDENT}c APPLY PATCH: $i\n" ' '>&$SILENT_OUT cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT fi fi @@ -94,7 +94,7 @@ done [ -f "$PKG_DIR/unpack" ] && $PKG_DIR/unpack $@ >&$VERBOSE_OUT for config in `find $BUILD/$1* -name config.guess | sed 's/config.guess//'`; do - printf "%${INDENT}c FIXCONFIG: $config\n" >&$SILENT_OUT + printf "%${INDENT}c FIXCONFIG: $config\n" ' '>&$SILENT_OUT [ -f "$config/config.guess" ] && cp -f $SCRIPTS/configtools/config.guess $config [ -f "$config/config.sub" ] && cp -f $SCRIPTS/configtools/config.sub $config