Revert "Be less agressive with removal of files, do not touch tmp and…

… dependent .gits" This reverts commit 4dda4b7.
Nislaco · Sep 20, 2017 · 549d7d6 · 549d7d6
1 parent 4dda4b7
commit 549d7d6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -31,7 +31,7 @@ node('docker && linux-build') {
                   set +xe
                   export CCACHE_DIR=$WORKSPACE/ccache
                   ccache -M 0 -F 0
-                  git clean -fdx -e ccache tmp .repo
+                  git clean -ffdx -e ccache
                 '''
               }
 

diff --git a/rootfs/make_rootfs.sh b/rootfs/make_rootfs.sh
@@ -97,7 +97,7 @@ case $DISTRO in
 esac
 
 mkdir -p $BUILD
-TARBALL="tmp/$(basename $ROOTFS)"
+TARBALL="$TEMP/$(basename $ROOTFS)"
 
 mkdir -p "$BUILD"
 if [ ! -e "$TARBALL" ]; then
@@ -110,6 +110,7 @@ echo -n "Extracting ... "
 set -x
 tar -xf "$TARBALL" -C "$DEST" $TAR_OPTIONS
 echo "OK"
+rm -f "$TARBALL"
 
 # Add qemu emulation.
 cp /usr/bin/qemu-aarch64-static "$DEST/usr/bin"