diff options
author | Renato Botelho <renato@netgate.com> | 2016-08-01 16:49:15 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-08-01 16:49:15 -0300 |
commit | 468f236dab9eafa8c39403ce66c50b153fbb1d42 (patch) | |
tree | 7a3d5339db501d019fa970aea66c089276e238f9 /tools/builder_common.sh | |
parent | 29cdd776aeb9531a745c773d7ebee84daaa891e5 (diff) | |
download | pfsense-468f236dab9eafa8c39403ce66c50b153fbb1d42.zip pfsense-468f236dab9eafa8c39403ce66c50b153fbb1d42.tar.gz |
Add install_freebsd.sh and use it
Diffstat (limited to 'tools/builder_common.sh')
-rw-r--r-- | tools/builder_common.sh | 47 |
1 files changed, 18 insertions, 29 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index d4ef70e..61b379a 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -326,37 +326,25 @@ make_world() { [ -d "${INSTALLER_CHROOT_DIR}" ] \ || mkdir -p ${INSTALLER_CHROOT_DIR} - makeargs="${MAKEJ} DESTDIR=${INSTALLER_CHROOT_DIR}" - echo ">>> Installing 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} installworld" | tee -a ${LOGFILE} - (script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} installworld || print_error_pfS;) | egrep '^>>>' | tee -a ${LOGFILE} - cp ${FREEBSD_SRC_DIR}/release/rc.local ${INSTALLER_CHROOT_DIR}/etc - echo ">>> Installing world for ${TARGET} architecture... (Finished - $(LC_ALL=C date))" | tee -a ${LOGFILE} - - echo ">>> Distribution 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} distribution " | tee -a ${LOGFILE} - (script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} distribution || print_error_pfS;) | egrep '^>>>' | tee -a ${LOGFILE} - echo ">>> Distribution world for ${TARGET} architecture... (Finished - $(LC_ALL=C date))" | tee -a ${LOGFILE} - - makeargs="${MAKEJ} WITHOUT_BSDINSTALL=1 DESTDIR=${STAGE_CHROOT_DIR}" - echo ">>> Installing 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} installworld" | tee -a ${LOGFILE} - (script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} installworld || print_error_pfS;) | egrep '^>>>' | tee -a ${LOGFILE} - echo ">>> Installing world for ${TARGET} architecture... (Finished - $(LC_ALL=C date))" | tee -a ${LOGFILE} - - echo ">>> Distribution 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} distribution " | tee -a ${LOGFILE} - (script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} distribution || print_error_pfS;) | egrep '^>>>' | tee -a ${LOGFILE} - echo ">>> Distribution world for ${TARGET} architecture... (Finished - $(LC_ALL=C date))" | tee -a ${LOGFILE} + echo ">>> Installing world with bsdinstall for ${TARGET} architecture..." | tee -a ${LOGFILE} + script -aq $LOGFILE ${SCRIPTS_DIR}/install_freebsd.sh -i -K \ + -s ${FREEBSD_SRC_DIR} \ + -d ${INSTALLER_CHROOT_DIR} \ + || print_error_pfS + + echo ">>> Installing world without bsdinstall for ${TARGET} architecture..." | tee -a ${LOGFILE} + script -aq $LOGFILE ${SCRIPTS_DIR}/install_freebsd.sh -K \ + -s ${FREEBSD_SRC_DIR} \ + -d ${STAGE_CHROOT_DIR} \ + || print_error_pfS + # XXX It must go to the scripts [ -d "${STAGE_CHROOT_DIR}/usr/local/bin" ] \ || mkdir -p ${STAGE_CHROOT_DIR}/usr/local/bin - makeargs="${MAKEJ} DESTDIR=${STAGE_CHROOT_DIR}" + makeargs="DESTDIR=${STAGE_CHROOT_DIR}" echo ">>> Building and installing crypto tools and athstats 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}/tools/tools/crypto ${makeargs} clean all install " | tee -a ${LOGFILE} (script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR}/tools/tools/crypto ${makeargs} clean all install || print_error_pfS;) | egrep '^>>>' | tee -a ${LOGFILE} # XXX FIX IT -# echo ">>> Builder is running the command: script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR}/tools/tools/ath/athstats ${makeargs} clean all install" | tee -a ${LOGFILE} # (script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR}/tools/tools/ath/athstats ${makeargs} clean all install || print_error_pfS;) | egrep '^>>>' | tee -a ${LOGFILE} echo ">>> Building and installing crypto tools and athstats for ${TARGET} architecture... (Finished - $(LC_ALL=C date))" | tee -a ${LOGFILE} @@ -1616,10 +1604,11 @@ installkernel() { fi mkdir -p ${STAGE_CHROOT_DIR}/boot - makeargs="${MAKEJ} DESTDIR=${_destdir}" - echo ">>> Builder is running the command: script -aq $LOGFILE make ${makeargs} installkernel KERNCONF=${KERNCONF}" | tee -a $LOGFILE - (script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} installkernel KERNCONF=${KERNCONF} || print_error_pfS;) | egrep '^>>>' - gzip -f9 ${_destdir}/boot/kernel/kernel + echo ">>> Installing kernel (${KERNCONF}) for ${TARGET} architecture..." | tee -a ${LOGFILE} + script -aq $LOGFILE ${SCRIPTS_DIR}/install_freebsd.sh -W -D -z \ + -s ${FREEBSD_SRC_DIR} \ + -d ${_destdir} \ + || print_error_pfS } # Launch is ran first to setup a few variables that we need |