From 04992be2bfd4a5f47e2077ef5623b7c72a705eea Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Tue, 25 Aug 2015 09:28:29 -0300 Subject: Rename MAKEOBJDIRPREFIXFINAL to IMAGES_FINAL_DIR --- tools/build_snapshots.sh | 7 +++---- tools/builder_common.sh | 20 ++++++++++---------- tools/builder_defaults.sh | 14 +++++++------- 3 files changed, 20 insertions(+), 21 deletions(-) (limited to 'tools') diff --git a/tools/build_snapshots.sh b/tools/build_snapshots.sh index c621c35..efecfae 100755 --- a/tools/build_snapshots.sh +++ b/tools/build_snapshots.sh @@ -153,8 +153,8 @@ copy_to_staging_nanobsd() { mkdir -p $STAGINGAREA/nanobsd mkdir -p $STAGINGAREA/nanobsdupdates - cp $MAKEOBJDIRPREFIXFINAL/$FILENAMEFULL $STAGINGAREA/nanobsd/ 2>/dev/null - cp $MAKEOBJDIRPREFIXFINAL/$FILENAMEUPGRADE $STAGINGAREA/nanobsdupdates 2>/dev/null + cp $IMAGES_FINAL_DIR/$FILENAMEFULL $STAGINGAREA/nanobsd/ 2>/dev/null + cp $IMAGES_FINAL_DIR/$FILENAMEUPGRADE $STAGINGAREA/nanobsdupdates 2>/dev/null if [ -f $STAGINGAREA/nanobsd/$FILENAMEFULL ]; then md5 $STAGINGAREA/nanobsd/$FILENAMEFULL > $STAGINGAREA/nanobsd/$FILENAMEFULL.md5 2>/dev/null @@ -283,8 +283,7 @@ cleanup_builds() { # Remove prior builds update_status ">>> Cleaning up after prior builds..." rm -rf $STAGINGAREA/* - rm -f $UPDATESDIR/* # Keep updates dir slimmed down - rm -rf $MAKEOBJDIRPREFIXFINAL/* + rm -rf $IMAGES_FINAL_DIR/* (cd ${BUILDER_ROOT} && ./build.sh --clean-builder) } 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 diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index f3a6ac6..daf0600 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -124,7 +124,7 @@ if [ ! -d ${SCRATCHDIR} ]; then fi # Area that the final image will appear in -export MAKEOBJDIRPREFIXFINAL=${MAKEOBJDIRPREFIXFINAL:-${SCRATCHDIR}/${PRODUCT_NAME}/} +export IMAGES_FINAL_DIR=${IMAGES_FINAL_DIR:-${SCRATCHDIR}/${PRODUCT_NAME}/} export BUILDER_LOGS=${BUILDER_LOGS:-${BUILDER_ROOT}/logs} if [ ! -d ${BUILDER_LOGS} ]; then @@ -149,7 +149,7 @@ export SRCDIR=${SRCDIR:-/usr/${PRODUCT_NAME}src/src.${GIT_REPO_BRANCH_OR_TAG}} export MEMORYDISK_SIZE=${MEMORYDISK_SIZE:-"768M"} # OVF/vmdk parms -export OVFPATH=${OVFPATH:-${MAKEOBJDIRPREFIXFINAL}} +export OVFPATH=${OVFPATH:-${IMAGES_FINAL_DIR}} # Name of ovf file included inside OVA archive export OVFFILE=${OVFFILE:-${PRODUCT_NAME}.ovf} # On disk name of VMDK file included in OVA @@ -286,11 +286,11 @@ export CORE_PKG_PATH=${CORE_PKG_PATH:-"${SCRATCHDIR}/core_pkg"} export CORE_PKG_TMP=${CORE_PKG_TMP:-"${SCRATCHDIR}/core_pkg_tmp"} # General builder output filenames -export UPDATESDIR=${UPDATESDIR:-$MAKEOBJDIRPREFIXFINAL/updates} -export ISOPATH=${ISOPATH:-${MAKEOBJDIRPREFIXFINAL}/${PRODUCT_NAME}-LiveCD-${PRODUCT_VERSION}-${TARGET}-${DATESTRING}.iso} -export MEMSTICKPATH=${MEMSTICKPATH:-${MAKEOBJDIRPREFIXFINAL}/${PRODUCT_NAME}-memstick-${PRODUCT_VERSION}-${TARGET}-${DATESTRING}.img} -export MEMSTICKSERIALPATH=${MEMSTICKSERIALPATH:-${MAKEOBJDIRPREFIXFINAL}/${PRODUCT_NAME}-memstick-serial-${PRODUCT_VERSION}-${TARGET}-${DATESTRING}.img} -export MEMSTICKADIPATH=${MEMSTICKADIPATH:-${MAKEOBJDIRPREFIXFINAL}/${PRODUCT_NAME}-memstick-ADI-${PRODUCT_VERSION}-${TARGET}-${DATESTRING}.img} +export UPDATESDIR=${UPDATESDIR:-${IMAGES_FINAL_DIR}/updates} +export ISOPATH=${ISOPATH:-${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-LiveCD-${PRODUCT_VERSION}-${TARGET}-${DATESTRING}.iso} +export MEMSTICKPATH=${MEMSTICKPATH:-${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-memstick-${PRODUCT_VERSION}-${TARGET}-${DATESTRING}.img} +export MEMSTICKSERIALPATH=${MEMSTICKSERIALPATH:-${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-memstick-serial-${PRODUCT_VERSION}-${TARGET}-${DATESTRING}.img} +export MEMSTICKADIPATH=${MEMSTICKADIPATH:-${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-memstick-ADI-${PRODUCT_VERSION}-${TARGET}-${DATESTRING}.img} # set full-update update filename export UPDATES_TARBALL_FILENAME=${UPDATES_TARBALL_FILENAME:-"${UPDATESDIR}/${PRODUCT_NAME}-Full-Update-${PRODUCT_VERSION}-${TARGET}-${DATESTRING}.tgz"} -- cgit v1.1