build: always bootstrap target directories

This commit is contained in:
Franco Fichtner 2015-05-07 08:37:22 +02:00
parent da79c50876
commit 020d1eac63
7 changed files with 4 additions and 10 deletions

View File

@ -29,7 +29,6 @@ set -e
. ./common.sh . ./common.sh
mkdir -p ${SETSDIR}
rm -f ${SETSDIR}/base-*-${ARCH}.txz rm -f ${SETSDIR}/base-*-${ARCH}.txz
git_clear ${SRCDIR} git_clear ${SRCDIR}

View File

@ -32,12 +32,15 @@ export PRODUCT_VERSION=${PRODUCT_VERSION:-"`date '+%Y%m%d%H%M'`"}
export PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR:-"OpenSSL"} export PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR:-"OpenSSL"}
export PRODUCT_NAME="OPNsense" export PRODUCT_NAME="OPNsense"
# build directories # define target directories
export STAGEDIR="/usr/local/stage" export STAGEDIR="/usr/local/stage"
export PACKAGESDIR="/tmp/packages" export PACKAGESDIR="/tmp/packages"
export IMAGESDIR="/tmp/images" export IMAGESDIR="/tmp/images"
export SETSDIR="/tmp/sets" export SETSDIR="/tmp/sets"
# bootstrap target directories
mkdir -p ${STAGEDIR} ${PACKAGESDIR} ${IMAGESDIR} ${SETSDIR}
# code reositories # code reositories
export TOOLSDIR="/usr/tools" export TOOLSDIR="/usr/tools"
export PORTSDIR="/usr/ports" export PORTSDIR="/usr/ports"

View File

@ -32,8 +32,6 @@ set -e
# rewrite the disk label, because we're install media # rewrite the disk label, because we're install media
LABEL="${LABEL}_Install" LABEL="${LABEL}_Install"
mkdir -p ${IMAGESDIR}
setup_stage ${STAGEDIR} setup_stage ${STAGEDIR}
setup_base ${STAGEDIR} setup_base ${STAGEDIR}
setup_kernel ${STAGEDIR} setup_kernel ${STAGEDIR}

View File

@ -29,7 +29,6 @@ set -e
. ./common.sh . ./common.sh
mkdir -p ${SETSDIR}
rm -f ${SETSDIR}/kernel-*-${ARCH}.txz rm -f ${SETSDIR}/kernel-*-${ARCH}.txz
git_clear ${SRCDIR} git_clear ${SRCDIR}

View File

@ -33,8 +33,6 @@ set -e
# rewrite the disk label, because we're install media # rewrite the disk label, because we're install media
LABEL="${LABEL}_Install" LABEL="${LABEL}_Install"
mkdir -p ${IMAGESDIR}
setup_stage ${STAGEDIR} setup_stage ${STAGEDIR}
setup_base ${STAGEDIR} setup_base ${STAGEDIR}
setup_kernel ${STAGEDIR} setup_kernel ${STAGEDIR}

View File

@ -34,8 +34,6 @@ set -e
. ${SRCDIR}/tools/tools/nanobsd/FlashDevice.sub . ${SRCDIR}/tools/tools/nanobsd/FlashDevice.sub
sub_FlashDevice sandisk 2g sub_FlashDevice sandisk 2g
mkdir -p ${IMAGESDIR}
setup_stage ${STAGEDIR} setup_stage ${STAGEDIR}
setup_base ${STAGEDIR} setup_base ${STAGEDIR}
setup_kernel ${STAGEDIR} setup_kernel ${STAGEDIR}

View File

@ -29,7 +29,6 @@ set -e
. ./common.sh . ./common.sh
mkdir -p ${SETSDIR}
rm -f ${SETSDIR}/packages-*-${ARCH}.tar rm -f ${SETSDIR}/packages-*-${ARCH}.tar
setup_stage ${STAGEDIR} setup_stage ${STAGEDIR}