summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-03-01 12:08:48 -0300
committerRenato Botelho <renato@netgate.com>2016-03-01 12:19:38 -0300
commitacd5c0cd7289a3e0c1d2ec41cc7b49572dbf90f1 (patch)
tree07a517770c97ad9c051594579228b5c81da86ccf
parente04de268bdd402dda7455e39bab1e609ffd64dd0 (diff)
downloadpfsense-acd5c0cd7289a3e0c1d2ec41cc7b49572dbf90f1.zip
pfsense-acd5c0cd7289a3e0c1d2ec41cc7b49572dbf90f1.tar.gz
Use a function to create nanobsd image filename and reduce duplicated code
-rw-r--r--tools/builder_common.sh30
-rw-r--r--tools/builder_defaults.sh4
2 files changed, 28 insertions, 6 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 1de516e..83244c8 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -477,6 +477,24 @@ make_world() {
unset makeargs
}
+nanobsd_image_filename() {
+ local _size="$1"
+ local _type="$2"
+ local _upgrade="$3"
+
+ if [ -z "$upgrade" ]; then
+ local _template=${NANOBSD_IMG_TEMPLATE}
+ else
+ local _template=${NANOBSD_UPGRADE_TEMPLATE}
+ fi
+
+ echo "$_template" | sed \
+ -e "s,%%SIZE%%,${_size},g" \
+ -e "s,%%TYPE%%,${_type},g"
+
+ return 0
+}
+
# This routine originated in nanobsd.sh
nanobsd_set_flash_details () {
a1=$(echo $1 | tr '[:upper:]' '[:lower:]')
@@ -587,8 +605,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="${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-${PRODUCT_VERSION}-${_NANO_MEDIASIZE}-${TARGET}-${1}${TIMESTAMP_SUFFIX}.img"
- IMGUPDATE="${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-${PRODUCT_VERSION}-${_NANO_MEDIASIZE}-${TARGET}-${1}-upgrade${TIMESTAMP_SUFFIX}.img"
+ IMG="${IMAGES_FINAL_DIR}/$(nanobsd_image_filename ${_NANO_MEDIASIZE} ${1})"
+ IMGUPDATE="${IMAGES_FINAL_DIR}/$(nanobsd_image_filename ${_NANO_MEDIASIZE} ${1} 1)"
nanobsd_set_flash_details ${_NANO_MEDIASIZE}
@@ -2266,8 +2284,8 @@ snapshots_create_latest_symlink() {
snapshots_copy_to_staging_nanobsd() {
for NANOTYPE in nanobsd nanobsd-vga; do
for FILESIZE in ${1}; do
- FILENAMEFULL="${PRODUCT_NAME}-${PRODUCT_VERSION}-${FILESIZE}-${TARGET}-${NANOTYPE}${TIMESTAMP_SUFFIX}.img.gz"
- FILENAMEUPGRADE="${PRODUCT_NAME}-${PRODUCT_VERSION}-${FILESIZE}-${TARGET}-${NANOTYPE}-upgrade${TIMESTAMP_SUFFIX}.img.gz"
+ FILENAMEFULL="$(nanobsd_image_filename ${FILESIZE} ${NANOTYPE}).gz"
+ FILENAMEUPGRADE="$(nanobsd_image_filename ${FILESIZE} ${NANOTYPE} 1).gz"
mkdir -p $STAGINGAREA/nanobsd
mkdir -p $STAGINGAREA/nanobsdupdates
@@ -2379,13 +2397,13 @@ snapshots_scp_files() {
ssh ${RSYNCUSER}@${RSYNCIP} "rm -f ${RSYNCPATH}/.updaters/latest-nanobsd-vga-${i}.img.gz"
ssh ${RSYNCUSER}@${RSYNCIP} "rm -f ${RSYNCPATH}/.updaters/latest-nanobsd-vga-${i}.img.gz.sha256"
- FILENAMEUPGRADE="${PRODUCT_NAME}-${PRODUCT_VERSION}-${i}-${TARGET}-nanobsd-upgrade${TIMESTAMP_SUFFIX}.img.gz"
+ FILENAMEUPGRADE="$(nanobsd_image_filename ${i} nanobsd 1).gz"
ssh ${RSYNCUSER}@${RSYNCIP} "ln -s ${RSYNCPATH}/updates/${FILENAMEUPGRADE} \
${RSYNCPATH}/.updaters/latest-nanobsd-${i}.img.gz"
ssh ${RSYNCUSER}@${RSYNCIP} "ln -s ${RSYNCPATH}/updates/${FILENAMEUPGRADE}.sha256 \
${RSYNCPATH}/.updaters/latest-nanobsd-${i}.img.gz.sha256"
- FILENAMEUPGRADE="${PRODUCT_NAME}-${PRODUCT_VERSION}-${i}-${TARGET}-nanobsd-vga-upgrade${TIMESTAMP_SUFFIX}.img.gz"
+ FILENAMEUPGRADE="$(nanobsd_image_filename ${i} nanobsd-vga 1).gz"
ssh ${RSYNCUSER}@${RSYNCIP} "ln -s ${RSYNCPATH}/updates/${FILENAMEUPGRADE} \
${RSYNCPATH}/.updaters/latest-nanobsd-vga-${i}.img.gz"
ssh ${RSYNCUSER}@${RSYNCIP} "ln -s ${RSYNCPATH}/updates/${FILENAMEUPGRADE}.sha256 \
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index 7649179..f996546 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -339,6 +339,10 @@ export OVAPATH=${OVAPATH:-"${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-${PRODUCT_VERSION
# set full-update update filename
export UPDATES_TARBALL_FILENAME=${UPDATES_TARBALL_FILENAME:-"${UPDATESDIR}/${PRODUCT_NAME}-Full-Update-${PRODUCT_VERSION}-${TARGET}${TIMESTAMP_SUFFIX}.tgz"}
+# nanobsd templates
+export NANOBSD_IMG_TEMPLATE=${NANOBSD_IMG_TEMPLATE:-"${PRODUCT_NAME}-${PRODUCT_VERSION}-%%SIZE%%-${TARGET}-%%TYPE%%${TIMESTAMP_SUFFIX}.img"}
+export NANOBSD_UPGRADE_TEMPLATE=${NANOBSD_UPGRADE_TEMPLATE:-"${PRODUCT_NAME}-${PRODUCT_VERSION}-%%SIZE%%-${TARGET}-%%TYPE%%-upgrade${TIMESTAMP_SUFFIX}.img"}
+
# Rsync data to send snapshots
export RSYNCUSER=${RSYNCUSER:-"snapshots"}
export RSYNCPATH=${RSYNCPATH:-"/usr/local/www/snapshots/${TARGET}/${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}"}
OpenPOWER on IntegriCloud