diff options
| author | Renato Botelho <renato@netgate.com> | 2016-08-03 15:18:54 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-08-03 15:37:05 -0300 |
| commit | 6ebd280c9f655225d918a2eb0d3d70d987165429 (patch) | |
| tree | 048c93ec3ad06bf0f4efdb8229aba740d775b7ff | |
| parent | da0f70ed65b2f0f7d8831d3743c3d0f3e6aac382 (diff) | |
| download | pfsense-6ebd280c9f655225d918a2eb0d3d70d987165429.zip pfsense-6ebd280c9f655225d918a2eb0d3d70d987165429.tar.gz | |
Stop removing FreeBSD src, new clone script can detect if it's necessary
| -rw-r--r-- | build.conf.sample | 3 | ||||
| -rwxr-xr-x | build.sh | 6 | ||||
| -rw-r--r-- | tools/builder_common.sh | 8 |
3 files changed, 2 insertions, 15 deletions
diff --git a/build.conf.sample b/build.conf.sample index 389e70d..36755ca 100644 --- a/build.conf.sample +++ b/build.conf.sample @@ -30,9 +30,6 @@ export PRODUCT_URL="https://PRODUCT_URL/" # Do not clean FreeBSD obj dirs #export NO_CLEAN_FREEBSD_OBJ=YES -# Do not clean FreeBSD src dir -#export NO_CLEAN_FREEBSD_SRC=YES - # rsync data to upload snapshots #export RSYNCIP="your.snapshot.server" #export RSYNCUSER="username" @@ -26,7 +26,7 @@ usage() { echo " [ options ]: " echo " --flash-size|-f size(s) - a list of flash sizes to build with nanobsd i.e. '2g 4g'. Default: 2g" echo " --no-buildworld|-c - Will set NO_BUILDWORLD NO_BUILDKERNEL to not build kernel and world" - echo " --no-cleanobjdir|--no-cleanrepos|-d - Will not clean FreeBSD object built dir to allow restarting a build with NO_CLEAN" + echo " --no-cleanobjdir|-d - Will not clean FreeBSD object built dir to allow restarting a build with NO_CLEAN" echo " --resume-image-build|-r - Includes -c -d and also will just move directly to image creation using pre-staged data" echo " --setup - Install required repo and ports builder require to work" echo " --update-sources - Refetch FreeBSD sources" @@ -67,9 +67,8 @@ while test "$1" != ""; do export NO_BUILDWORLD=YES export NO_BUILDKERNEL=YES ;; - --no-cleanobjdir|--no-cleanrepos|-d) + --no-cleanobjdir|-d) export NO_CLEAN_FREEBSD_OBJ=YES - export NO_CLEAN_FREEBSD_SRC=YES ;; --flash-size|-f) shift @@ -84,7 +83,6 @@ while test "$1" != ""; do export NO_BUILDWORLD=YES export NO_BUILDKERNEL=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 a681cc2..2f1496b 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -825,14 +825,6 @@ clean_builder() { rm -rf $IMAGES_FINAL_DIR/* echo "Done!" - 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} - echo "Done!" - fi - fi - echo -n ">>> Cleaning previous builder logs..." if [ -d "$BUILDER_LOGS" ]; then rm -rf ${BUILDER_LOGS} |
