From 020d1eac63e5cafb6c5d8076b121d53c83cd0723 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 7 May 2015 08:37:22 +0200
Subject: [PATCH] build: always bootstrap target directories

---
 build/base.sh     | 1 -
 build/common.sh   | 5 ++++-
 build/iso.sh      | 2 --
 build/kernel.sh   | 1 -
 build/memstick.sh | 2 --
 build/nano.sh     | 2 --
 build/packages.sh | 1 -
 7 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/build/base.sh b/build/base.sh
index 063efb0..a70c5ba 100755
--- a/build/base.sh
+++ b/build/base.sh
@@ -29,7 +29,6 @@ set -e
 
 . ./common.sh
 
-mkdir -p ${SETSDIR}
 rm -f ${SETSDIR}/base-*-${ARCH}.txz
 
 git_clear ${SRCDIR}
diff --git a/build/common.sh b/build/common.sh
index df557e0..3aec53f 100755
--- a/build/common.sh
+++ b/build/common.sh
@@ -32,12 +32,15 @@ export PRODUCT_VERSION=${PRODUCT_VERSION:-"`date '+%Y%m%d%H%M'`"}
 export PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR:-"OpenSSL"}
 export PRODUCT_NAME="OPNsense"
 
-# build directories
+# define target directories
 export STAGEDIR="/usr/local/stage"
 export PACKAGESDIR="/tmp/packages"
 export IMAGESDIR="/tmp/images"
 export SETSDIR="/tmp/sets"
 
+# bootstrap target directories
+mkdir -p ${STAGEDIR} ${PACKAGESDIR} ${IMAGESDIR} ${SETSDIR}
+
 # code reositories
 export TOOLSDIR="/usr/tools"
 export PORTSDIR="/usr/ports"
diff --git a/build/iso.sh b/build/iso.sh
index c802f4e..dddadf5 100755
--- a/build/iso.sh
+++ b/build/iso.sh
@@ -32,8 +32,6 @@ set -e
 # rewrite the disk label, because we're install media
 LABEL="${LABEL}_Install"
 
-mkdir -p ${IMAGESDIR}
-
 setup_stage ${STAGEDIR}
 setup_base ${STAGEDIR}
 setup_kernel ${STAGEDIR}
diff --git a/build/kernel.sh b/build/kernel.sh
index e36b1b1..fe7f334 100755
--- a/build/kernel.sh
+++ b/build/kernel.sh
@@ -29,7 +29,6 @@ set -e
 
 . ./common.sh
 
-mkdir -p ${SETSDIR}
 rm -f ${SETSDIR}/kernel-*-${ARCH}.txz
 
 git_clear ${SRCDIR}
diff --git a/build/memstick.sh b/build/memstick.sh
index f3a1853..1860b5c 100755
--- a/build/memstick.sh
+++ b/build/memstick.sh
@@ -33,8 +33,6 @@ set -e
 # rewrite the disk label, because we're install media
 LABEL="${LABEL}_Install"
 
-mkdir -p ${IMAGESDIR}
-
 setup_stage ${STAGEDIR}
 setup_base ${STAGEDIR}
 setup_kernel ${STAGEDIR}
diff --git a/build/nano.sh b/build/nano.sh
index 13988d4..1aa79de 100755
--- a/build/nano.sh
+++ b/build/nano.sh
@@ -34,8 +34,6 @@ set -e
 . ${SRCDIR}/tools/tools/nanobsd/FlashDevice.sub
 sub_FlashDevice sandisk 2g
 
-mkdir -p ${IMAGESDIR}
-
 setup_stage ${STAGEDIR}
 setup_base ${STAGEDIR}
 setup_kernel ${STAGEDIR}
diff --git a/build/packages.sh b/build/packages.sh
index 4451813..b5506e4 100755
--- a/build/packages.sh
+++ b/build/packages.sh
@@ -29,7 +29,6 @@ set -e
 
 . ./common.sh
 
-mkdir -p ${SETSDIR}
 rm -f ${SETSDIR}/packages-*-${ARCH}.tar
 
 setup_stage ${STAGEDIR}