Revision 25c86b03
Added by Renato Botelho almost 8 years ago
| build.sh | ||
|---|---|---|
| 69 | 69 |
echo " --build-kernels - build all configured kernels" |
| 70 | 70 |
echo " --build-kernel argument - build specified kernel. Example --build-kernel KERNEL_NAME" |
| 71 | 71 |
echo " --install-extra-kernels argument - Put extra kernel(s) under /kernel image directory. Example --install-extra-kernels KERNEL_NAME_WRAP" |
| 72 |
echo " --snapshots - Build snapshots and upload them to RSYNCIP"
|
|
| 72 |
echo " --snapshots - Build snapshots" |
|
| 73 | 73 |
echo " --poudriere-snapshots - Update poudriere packages and send them to PKG_RSYNC_HOSTNAME" |
| 74 | 74 |
echo " --setup-poudriere - Install poudriere and create necessary jails and ports tree" |
| 75 | 75 |
echo " --create-unified-patch - Create a big patch with all changes done on FreeBSD" |
| 76 | 76 |
echo " --update-poudriere-jails [-a ARCH_LIST] - Update poudriere jails using current patch versions" |
| 77 | 77 |
echo " --update-poudriere-ports [-a ARCH_LIST]- Update poudriere ports tree" |
| 78 | 78 |
echo " --update-pkg-repo [-a ARCH_LIST]- Rebuild necessary ports on poudriere and update pkg repo" |
| 79 |
echo " --do-not-upload|-u - Do not upload pkgs or snapshots"
|
|
| 79 |
echo " --upload|-U - Upload pkgs and/or snapshots"
|
|
| 80 | 80 |
echo " -V VARNAME - print value of variable VARNAME" |
| 81 | 81 |
exit 1 |
| 82 | 82 |
} |
| ... | ... | |
| 88 | 88 |
unset _USE_OLD_DATESTRING |
| 89 | 89 |
unset pfPORTTOBUILD |
| 90 | 90 |
unset IMAGETYPE |
| 91 |
unset DO_NOT_UPLOAD
|
|
| 91 |
unset UPLOAD |
|
| 92 | 92 |
unset SNAPSHOTS |
| 93 | 93 |
unset POUDRIERE_SNAPSHOTS |
| 94 | 94 |
unset ARCH_LIST |
| ... | ... | |
| 196 | 196 |
--update-pkg-repo) |
| 197 | 197 |
BUILDACTION="update_pkg_repo" |
| 198 | 198 |
;; |
| 199 |
--do-not-upload|-u)
|
|
| 200 |
export DO_NOT_UPLOAD=1
|
|
| 199 |
--upload|-U)
|
|
| 200 |
export UPLOAD=1 |
|
| 201 | 201 |
;; |
| 202 | 202 |
all|none|*iso*|*ova*|*memstick*|*memstickserial*|*memstickadi*|*nanobsd*|*nanobsd-vga*|*fullupdate*) |
| 203 | 203 |
BUILDACTION="images" |
| ... | ... | |
| 291 | 291 |
snapshots_scp_files |
| 292 | 292 |
;; |
| 293 | 293 |
update_pkg_repo) |
| 294 |
if [ -z "${DO_NOT_UPLOAD}" -a ! -f /usr/local/bin/rsync ]; then
|
|
| 294 |
if [ -n "${UPLOAD}" -a ! -f /usr/local/bin/rsync ]; then
|
|
| 295 | 295 |
echo "ERROR: rsync is not installed, aborting..." |
| 296 | 296 |
exit 1 |
| 297 | 297 |
fi |
| ... | ... | |
| 307 | 307 |
exit 0 |
| 308 | 308 |
fi |
| 309 | 309 |
|
| 310 |
if [ -n "${SNAPSHOTS}" -a -z "${DO_NOT_UPLOAD}" ]; then
|
|
| 310 |
if [ -n "${SNAPSHOTS}" -a -n "${UPLOAD}" ]; then
|
|
| 311 | 311 |
_required=" \ |
| 312 | 312 |
RSYNCIP \ |
| 313 | 313 |
RSYNCUSER \ |
| ... | ... | |
| 508 | 508 |
fi |
| 509 | 509 |
|
| 510 | 510 |
if [ -n "${SNAPSHOTS}" ]; then
|
| 511 |
if [ "${IMAGETYPE}" = "none" -a -z "${DO_NOT_UPLOAD}" ]; then
|
|
| 511 |
if [ "${IMAGETYPE}" = "none" -a -n "${UPLOAD}" ]; then
|
|
| 512 | 512 |
pkg_repo_rsync "${CORE_PKG_PATH}"
|
| 513 | 513 |
elif [ "${IMAGETYPE}" != "none" ]; then
|
| 514 | 514 |
snapshots_copy_to_staging_iso_updates |
| 515 | 515 |
snapshots_copy_to_staging_nanobsd "${FLASH_SIZE}"
|
| 516 | 516 |
# SCP files to snapshot web hosting area |
| 517 |
if [ -z "${DO_NOT_UPLOAD}" ]; then
|
|
| 517 |
if [ -n "${UPLOAD}" ]; then
|
|
| 518 | 518 |
snapshots_scp_files |
| 519 | 519 |
fi |
| 520 | 520 |
fi |
| tools/build_snapshots.sh | ||
|---|---|---|
| 56 | 56 |
echo " -n: Do not build images, only core pkg repo" |
| 57 | 57 |
echo " -p: Update poudriere repo" |
| 58 | 58 |
echo " -r: Do not reset local changes" |
| 59 |
echo " -u: Do not upload snapshots"
|
|
| 59 |
echo " -U: Upload snapshots"
|
|
| 60 | 60 |
} |
| 61 | 61 |
|
| 62 | 62 |
export BUILDER_TOOLS=$(realpath $(dirname ${0}))
|
| ... | ... | |
| 64 | 64 |
|
| 65 | 65 |
NO_IMAGES="" |
| 66 | 66 |
NO_RESET="" |
| 67 |
NO_UPLOAD=""
|
|
| 67 |
UPLOAD="" |
|
| 68 | 68 |
LOOPED_SNAPSHOTS="" |
| 69 | 69 |
POUDRIERE_SNAPSHOTS="" |
| 70 | 70 |
|
| ... | ... | |
| 84 | 84 |
NO_RESET=1 |
| 85 | 85 |
;; |
| 86 | 86 |
u) |
| 87 |
NO_UPLOAD="-u"
|
|
| 87 |
UPLOAD="-U"
|
|
| 88 | 88 |
;; |
| 89 | 89 |
*) |
| 90 | 90 |
usage |
| ... | ... | |
| 108 | 108 |
export _sleeping=0 |
| 109 | 109 |
|
| 110 | 110 |
snapshot_update_status() {
|
| 111 |
${BUILDER_ROOT}/build.sh ${NO_UPLOAD} ${POUDRIERE_SNAPSHOTS} \
|
|
| 111 |
${BUILDER_ROOT}/build.sh ${UPLOAD} ${POUDRIERE_SNAPSHOTS} \
|
|
| 112 | 112 |
--snapshot-update-status "$*" |
| 113 | 113 |
} |
| 114 | 114 |
|
| ... | ... | |
| 221 | 221 |
|
| 222 | 222 |
if [ $rc -eq 0 ]; then |
| 223 | 223 |
exec_and_update_status \ |
| 224 |
${BUILDER_ROOT}/build.sh ${NO_UPLOAD} \
|
|
| 224 |
${BUILDER_ROOT}/build.sh ${UPLOAD} \
|
|
| 225 | 225 |
--update-pkg-repo |
| 226 | 226 |
rc=$? |
| 227 | 227 |
fi |
| ... | ... | |
| 232 | 232 |
|
| 233 | 233 |
if [ $rc -eq 0 ]; then |
| 234 | 234 |
exec_and_update_status \ |
| 235 |
${BUILDER_ROOT}/build.sh ${NO_UPLOAD} --flash-size \
|
|
| 235 |
${BUILDER_ROOT}/build.sh ${UPLOAD} --flash-size \
|
|
| 236 | 236 |
'2g 4g' --snapshots \ |
| 237 | 237 |
${IMAGES}
|
| 238 | 238 |
rc=$? |
| tools/builder_common.sh | ||
|---|---|---|
| 1964 | 1964 |
fi |
| 1965 | 1965 |
fi |
| 1966 | 1966 |
|
| 1967 |
if [ -n "${DO_NOT_UPLOAD}" ]; then
|
|
| 1967 |
if [ -z "${UPLOAD}" ]; then
|
|
| 1968 | 1968 |
return |
| 1969 | 1969 |
fi |
| 1970 | 1970 |
|
| ... | ... | |
| 2382 | 2382 |
|
| 2383 | 2383 |
LOGFILE=${BUILDER_LOGS}/poudriere.log
|
| 2384 | 2384 |
|
| 2385 |
if [ -z "${DO_NOT_UPLOAD}" -a -z "${PKG_RSYNC_HOSTNAME}" ]; then
|
|
| 2385 |
if [ -n "${UPLOAD}" -a -z "${PKG_RSYNC_HOSTNAME}" ]; then
|
|
| 2386 | 2386 |
echo ">>> ERROR: PKG_RSYNC_HOSTNAME is not set" |
| 2387 | 2387 |
print_error_pfS |
| 2388 | 2388 |
fi |
Also available in: Unified diff
Change default to never upload files and add a new option to do it