diff options
| author | Renato Botelho <renato@netgate.com> | 2016-08-01 16:31:33 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-08-01 16:31:33 -0300 |
| commit | 29cdd776aeb9531a745c773d7ebee84daaa891e5 (patch) | |
| tree | e924372e3a3a045752156af0a45afc197967c631 /tools/builder_common.sh | |
| parent | f2dd0a5588a48e63439e1b4c7f31d66e90797770 (diff) | |
| download | pfsense-29cdd776aeb9531a745c773d7ebee84daaa891e5.zip pfsense-29cdd776aeb9531a745c773d7ebee84daaa891e5.tar.gz | |
Add build_freebsd.sh and start using it
Diffstat (limited to 'tools/builder_common.sh')
| -rw-r--r-- | tools/builder_common.sh | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index bd3e7a2..d4ef70e 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -315,11 +315,10 @@ make_world() { return fi - makeargs="${MAKEJ}" - echo ">>> Building world for ${TARGET} architecture... (Starting - $(LC_ALL=C date))" | tee -a ${LOGFILE} - echo ">>> Builder is running the command: script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} buildworld" | tee -a ${LOGFILE} - (script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} buildworld || print_error_pfS;) | egrep '^>>>' | tee -a ${LOGFILE} - echo ">>> Building world for ${TARGET} architecture... (Finished - $(LC_ALL=C date))" | tee -a ${LOGFILE} + echo ">>> $(LC_ALL=C date) - Starting build world for ${TARGET} architecture..." | tee -a ${LOGFILE} + script -aq $LOGFILE ${SCRIPTS_DIR}/build_freebsd.sh -K -s ${FREEBSD_SRC_DIR} \ + || print_error_pfS + echo ">>> $(LC_ALL=C date) - Finished build world for ${TARGET} architecture..." | tee -a ${LOGFILE} LOGFILE=${BUILDER_LOGS}/installworld.${TARGET} echo ">>> LOGFILE set to $LOGFILE." | tee -a ${LOGFILE} @@ -1596,12 +1595,10 @@ buildkernel() { export KERNCONF=$(basename ${KERNELCONF}) fi - echo ">>> KERNCONFDIR: ${KERNCONFDIR}" - echo ">>> ARCH: ${TARGET_ARCH}" - - makeargs="${MAKEJ}" - echo ">>> Builder is running the command: script -aq $LOGFILE make $makeargs buildkernel KERNCONF=${KERNCONF}" | tee -a $LOGFILE - (script -q $LOGFILE make -C ${FREEBSD_SRC_DIR} $makeargs buildkernel KERNCONF=${KERNCONF} || print_error_pfS;) | egrep '^>>>' + echo ">>> $(LC_ALL=C date) - Starting build kernel for ${TARGET} architecture..." | tee -a ${LOGFILE} + script -aq $LOGFILE ${SCRIPTS_DIR}/build_freebsd.sh -W -s ${FREEBSD_SRC_DIR} \ + || print_error_pfS + echo ">>> $(LC_ALL=C date) - Finished build kernel for ${TARGET} architecture..." | tee -a ${LOGFILE} } # Imported from FreeSBIE |
