diff options
| author | Renato Botelho <renato@netgate.com> | 2015-08-25 09:28:29 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-08-25 14:49:55 -0300 |
| commit | 04992be2bfd4a5f47e2077ef5623b7c72a705eea (patch) | |
| tree | 5ecf144d0b26518a73def81cab16393db99e5e61 /tools/builder_common.sh | |
| parent | eb31cdf1fee7082f526e1859082d7ef53c61722d (diff) | |
| download | pfsense-04992be2bfd4a5f47e2077ef5623b7c72a705eea.zip pfsense-04992be2bfd4a5f47e2077ef5623b7c72a705eea.tar.gz | |
Rename MAKEOBJDIRPREFIXFINAL to IMAGES_FINAL_DIR
Diffstat (limited to 'tools/builder_common.sh')
| -rw-r--r-- | tools/builder_common.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 7ac1613..2469ee7 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -43,10 +43,10 @@ # modification, are permitted provided that the following conditions are met: # -if [ "$MAKEOBJDIRPREFIXFINAL" != "" ]; then - mkdir -p $MAKEOBJDIRPREFIXFINAL +if [ -n "${IMAGES_FINAL_DIR}" -a "${IMAGES_FINAL_DIR}" != "/" ]; then + mkdir -p ${IMAGES_FINAL_DIR} else - echo "MAKEOBJDIRPREFIXFINAL is not defined" + echo "IMAGES_FINAL_DIR is not defined" print_error_pfS fi @@ -552,8 +552,8 @@ create_nanobsd_diskimage () { echo ">>> building NanoBSD(${1}) disk image with size ${_NANO_MEDIASIZE} for platform (${TARGET})..." | tee -a ${LOGFILE} echo "" > $BUILDER_LOGS/nanobsd_cmds.sh - IMG="${MAKEOBJDIRPREFIXFINAL}/${PRODUCT_NAME}-${PRODUCT_VERSION}-${_NANO_MEDIASIZE}-${TARGET}-${1}-${DATESTRING}.img" - IMGUPDATE="${MAKEOBJDIRPREFIXFINAL}/${PRODUCT_NAME}-${PRODUCT_VERSION}-${_NANO_MEDIASIZE}-${TARGET}-${1}-upgrade-${DATESTRING}.img" + IMG="${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-${PRODUCT_VERSION}-${_NANO_MEDIASIZE}-${TARGET}-${1}-${DATESTRING}.img" + IMGUPDATE="${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-${PRODUCT_VERSION}-${_NANO_MEDIASIZE}-${TARGET}-${1}-upgrade-${DATESTRING}.img" nanobsd_set_flash_details ${_NANO_MEDIASIZE} @@ -628,9 +628,9 @@ awk ' # for booting the image from a USB device to work. print "a 1" } - ' > ${MAKEOBJDIRPREFIXFINAL}/_.fdisk + ' > ${IMAGES_FINAL_DIR}/_.fdisk - MNT=${MAKEOBJDIRPREFIXFINAL}/_.mnt + MNT=${IMAGES_FINAL_DIR}/_.mnt mkdir -p ${MNT} dd if=/dev/zero of=${IMG} bs=${NANO_SECTS}b \ @@ -639,7 +639,7 @@ awk ' MD=$(mdconfig -a -t vnode -f ${IMG} -x ${NANO_SECTS} -y ${NANO_HEADS}) trap "mdconfig -d -u ${MD}; return" 1 2 15 EXIT - fdisk -i -f ${MAKEOBJDIRPREFIXFINAL}/_.fdisk ${MD} 2>&1 >> ${LOGFILE} + fdisk -i -f ${IMAGES_FINAL_DIR}/_.fdisk ${MD} 2>&1 >> ${LOGFILE} fdisk ${MD} 2>&1 >> ${LOGFILE} boot0cfg -B -b ${FINAL_CHROOT_DIR}/${NANO_BOOTLOADER} ${NANO_BOOT0CFG} ${MD} 2>&1 >> ${LOGFILE} @@ -766,7 +766,7 @@ awk ' unset IMGUPDATESIZE unset IMGSIZE - ls -lah $MAKEOBJDIRPREFIXFINAL + ls -lah $IMAGES_FINAL_DIR } # This routine creates a ova image that contains @@ -1037,7 +1037,7 @@ clean_obj_dir() { mkdir -p $KERNEL_BUILD_PATH echo -n ">>> Cleaning previously built images..." - rm -rf $MAKEOBJDIRPREFIXFINAL/* + rm -rf $IMAGES_FINAL_DIR/* echo "Done!" if [ -z "${NO_CLEANREPOS}" ]; then |
