Skip to content

Commit

Permalink
Keep all .built files at single level
Browse files Browse the repository at this point in the history
  • Loading branch information
davedoesdev committed Mar 30, 2016
1 parent c9e38c6 commit af155d6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .circle-ci/deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions runtime_scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit af155d6

Please sign in to comment.