From af155d650dab6ca255e5e245a6644b0b2a756c56 Mon Sep 17 00:00:00 2001
From: David Halls <dahalls@gmail.com>
Date: Wed, 30 Mar 2016 06:42:29 +0100
Subject: [PATCH] Keep all .built files at single level

---
 .circle-ci/deps.sh       | 2 +-
 runtime_scripts/build.sh | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.circle-ci/deps.sh b/.circle-ci/deps.sh
index 2c6b93c..90da855 100755
--- a/.circle-ci/deps.sh
+++ b/.circle-ci/deps.sh
@@ -6,7 +6,7 @@ sudo apt-get purge -y apache2 cassandra elasticsearch mongodb-org mysql-server \
 sudo apt-get autoremove -y
 
 sudo apt-get update -qq
-sudo apt-get install -y e2tools qemu-kvm parted mtools syslinux syslinux-common coreutils squashfs-tools bsdtar btrfs-tools user-mode-linux slirp
+sudo apt-get install -y e2tools qemu-kvm parted mtools syslinux syslinux-common coreutils squashfs-tools bsdtar btrfs-tools
 
 #service --status-all
 free -m
diff --git a/runtime_scripts/build.sh b/runtime_scripts/build.sh
index 856c77c..3d2a7bf 100755
--- a/runtime_scripts/build.sh
+++ b/runtime_scripts/build.sh
@@ -59,7 +59,8 @@ for pkg in "${PACKAGES[@]}"; do
   vdir="DIR_$pkg"
   vsrc="SRC_$pkg"
   vbld="BLD_$pkg"
-  if [ -z "$Interactive" -a -n "${!vbld}" -a ! -e "${!vdir}.built" ]; then
+  builtf="$(echo "${!vdir}" | tr / _).built"
+  if [ -z "$Interactive" -a -n "${!vbld}" -a ! -e "$builtf" ]; then
     echo "+$pkg" | tee /dev/tty
     binf="$HERE/host/${!vsrc}-$heddle_arch.tar.xz"
     if [ -f "$binf" ]; then
@@ -98,7 +99,7 @@ for pkg in "${PACKAGES[@]}"; do
       fi
       popd
     fi
-    touch "${!vdir}.built"
+    touch "$builtf"
     echo "-$pkg" | tee /dev/tty
   fi
   if type PST_$pkg 2> /dev/null | grep -q function; then