| 477 |
477 |
unset makeargs
|
| 478 |
478 |
}
|
| 479 |
479 |
|
|
480 |
nanobsd_image_filename() {
|
|
481 |
local _size="$1"
|
|
482 |
local _type="$2"
|
|
483 |
local _upgrade="$3"
|
|
484 |
|
|
485 |
if [ -z "$upgrade" ]; then
|
|
486 |
local _template=${NANOBSD_IMG_TEMPLATE}
|
|
487 |
else
|
|
488 |
local _template=${NANOBSD_UPGRADE_TEMPLATE}
|
|
489 |
fi
|
|
490 |
|
|
491 |
echo "$_template" | sed \
|
|
492 |
-e "s,%%SIZE%%,${_size},g" \
|
|
493 |
-e "s,%%TYPE%%,${_type},g"
|
|
494 |
|
|
495 |
return 0
|
|
496 |
}
|
|
497 |
|
| 480 |
498 |
# This routine originated in nanobsd.sh
|
| 481 |
499 |
nanobsd_set_flash_details () {
|
| 482 |
500 |
a1=$(echo $1 | tr '[:upper:]' '[:lower:]')
|
| ... | ... | |
| 587 |
605 |
echo ">>> building NanoBSD(${1}) disk image with size ${_NANO_MEDIASIZE} for platform (${TARGET})..." | tee -a ${LOGFILE}
|
| 588 |
606 |
echo "" > $BUILDER_LOGS/nanobsd_cmds.sh
|
| 589 |
607 |
|
| 590 |
|
IMG="${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-${PRODUCT_VERSION}-${_NANO_MEDIASIZE}-${TARGET}-${1}${TIMESTAMP_SUFFIX}.img"
|
| 591 |
|
IMGUPDATE="${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-${PRODUCT_VERSION}-${_NANO_MEDIASIZE}-${TARGET}-${1}-upgrade${TIMESTAMP_SUFFIX}.img"
|
|
608 |
IMG="${IMAGES_FINAL_DIR}/$(nanobsd_image_filename ${_NANO_MEDIASIZE} ${1})"
|
|
609 |
IMGUPDATE="${IMAGES_FINAL_DIR}/$(nanobsd_image_filename ${_NANO_MEDIASIZE} ${1} 1)"
|
| 592 |
610 |
|
| 593 |
611 |
nanobsd_set_flash_details ${_NANO_MEDIASIZE}
|
| 594 |
612 |
|
| ... | ... | |
| 2266 |
2284 |
snapshots_copy_to_staging_nanobsd() {
|
| 2267 |
2285 |
for NANOTYPE in nanobsd nanobsd-vga; do
|
| 2268 |
2286 |
for FILESIZE in ${1}; do
|
| 2269 |
|
FILENAMEFULL="${PRODUCT_NAME}-${PRODUCT_VERSION}-${FILESIZE}-${TARGET}-${NANOTYPE}${TIMESTAMP_SUFFIX}.img.gz"
|
| 2270 |
|
FILENAMEUPGRADE="${PRODUCT_NAME}-${PRODUCT_VERSION}-${FILESIZE}-${TARGET}-${NANOTYPE}-upgrade${TIMESTAMP_SUFFIX}.img.gz"
|
|
2287 |
FILENAMEFULL="$(nanobsd_image_filename ${FILESIZE} ${NANOTYPE}).gz"
|
|
2288 |
FILENAMEUPGRADE="$(nanobsd_image_filename ${FILESIZE} ${NANOTYPE} 1).gz"
|
| 2271 |
2289 |
mkdir -p $STAGINGAREA/nanobsd
|
| 2272 |
2290 |
mkdir -p $STAGINGAREA/nanobsdupdates
|
| 2273 |
2291 |
|
| ... | ... | |
| 2379 |
2397 |
ssh ${RSYNCUSER}@${RSYNCIP} "rm -f ${RSYNCPATH}/.updaters/latest-nanobsd-vga-${i}.img.gz"
|
| 2380 |
2398 |
ssh ${RSYNCUSER}@${RSYNCIP} "rm -f ${RSYNCPATH}/.updaters/latest-nanobsd-vga-${i}.img.gz.sha256"
|
| 2381 |
2399 |
|
| 2382 |
|
FILENAMEUPGRADE="${PRODUCT_NAME}-${PRODUCT_VERSION}-${i}-${TARGET}-nanobsd-upgrade${TIMESTAMP_SUFFIX}.img.gz"
|
|
2400 |
FILENAMEUPGRADE="$(nanobsd_image_filename ${i} nanobsd 1).gz"
|
| 2383 |
2401 |
ssh ${RSYNCUSER}@${RSYNCIP} "ln -s ${RSYNCPATH}/updates/${FILENAMEUPGRADE} \
|
| 2384 |
2402 |
${RSYNCPATH}/.updaters/latest-nanobsd-${i}.img.gz"
|
| 2385 |
2403 |
ssh ${RSYNCUSER}@${RSYNCIP} "ln -s ${RSYNCPATH}/updates/${FILENAMEUPGRADE}.sha256 \
|
| 2386 |
2404 |
${RSYNCPATH}/.updaters/latest-nanobsd-${i}.img.gz.sha256"
|
| 2387 |
2405 |
|
| 2388 |
|
FILENAMEUPGRADE="${PRODUCT_NAME}-${PRODUCT_VERSION}-${i}-${TARGET}-nanobsd-vga-upgrade${TIMESTAMP_SUFFIX}.img.gz"
|
|
2406 |
FILENAMEUPGRADE="$(nanobsd_image_filename ${i} nanobsd-vga 1).gz"
|
| 2389 |
2407 |
ssh ${RSYNCUSER}@${RSYNCIP} "ln -s ${RSYNCPATH}/updates/${FILENAMEUPGRADE} \
|
| 2390 |
2408 |
${RSYNCPATH}/.updaters/latest-nanobsd-vga-${i}.img.gz"
|
| 2391 |
2409 |
ssh ${RSYNCUSER}@${RSYNCIP} "ln -s ${RSYNCPATH}/updates/${FILENAMEUPGRADE}.sha256 \
|
Added by Renato Botelho over 9 years ago
Use a function to create nanobsd image filename and reduce duplicated code