diff options
author | Renato Botelho <renato@netgate.com> | 2015-08-25 11:01:27 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-08-25 14:49:57 -0300 |
commit | 2abc3e80248a26214c17d2a62d122b0870e13204 (patch) | |
tree | 5a072639440029875166964ded99ac3f0bf6656a | |
parent | 3b5bba5c14322c42d12e59acff2dfccc9f744ab2 (diff) | |
download | pfsense-2abc3e80248a26214c17d2a62d122b0870e13204.zip pfsense-2abc3e80248a26214c17d2a62d122b0870e13204.tar.gz |
Rename NO_CLEANFREEBSDOBJDIR -> NO_CLEAN_FREEBSD_OBJ and NO_CLEANREPOS -> NO_CLEAN_FREEBSD_SRC
-rwxr-xr-x | build.sh | 8 | ||||
-rw-r--r-- | tools/builder_common.sh | 4 |
2 files changed, 6 insertions, 6 deletions
@@ -95,8 +95,8 @@ while test "$1" != ""; do export NO_BUILDKERNEL=YES ;; --no-cleanobjdir|--no-cleanrepos|-d) - export NO_CLEANFREEBSDOBJDIR=YES - export NO_CLEANREPOS=YES + export NO_CLEAN_FREEBSD_OBJ=YES + export NO_CLEAN_FREEBSD_SRC=YES ;; --flash-size|-f) shift @@ -110,8 +110,8 @@ while test "$1" != ""; do --resume-image-build|-r) export NO_BUILDWORLD=YES export NO_BUILDKERNEL=YES - export NO_CLEANFREEBSDOBJDIR=YES - export NO_CLEANREPOS=YES + export NO_CLEAN_FREEBSD_OBJ=YES + export NO_CLEAN_FREEBSD_SRC=YES _SKIP_REBUILD_PRESTAGE=YES _USE_OLD_DATESTRING=YES ;; diff --git a/tools/builder_common.sh b/tools/builder_common.sh index fe431cd..15aa435 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -1019,7 +1019,7 @@ clean_builder() { echo "Done." fi - if [ -z "${NO_CLEANFREEBSDOBJDIR}" -a -d "${FREEBSD_SRC_DIR}" ]; then + if [ -z "${NO_CLEAN_FREEBSD_OBJ}" -a -d "${FREEBSD_SRC_DIR}" ]; then OBJTREE=$(env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} make -C ${FREEBSD_SRC_DIR} -V OBJTREE) if [ -d "${OBJTREE}" ]; then echo -n ">>> Cleaning FreeBSD objects dir staging..." @@ -1041,7 +1041,7 @@ clean_builder() { rm -rf $IMAGES_FINAL_DIR/* echo "Done!" - if [ -z "${NO_CLEANREPOS}" ]; then + if [ -z "${NO_CLEAN_FREEBSD_SRC}" ]; then if [ -d "$FREEBSD_SRC_DIR" ]; then echo -n ">>> Ensuring $FREEBSD_SRC_DIR is clean..." rm -rf ${FREEBSD_SRC_DIR} |