Date: Thu, 26 May 2016 18:37:52 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r300765 - user/gjb/thermite Message-ID: <201605261837.u4QIbqxQ066821@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Thu May 26 18:37:51 2016 New Revision: 300765 URL: https://svnweb.freebsd.org/changeset/base/300765 Log: Resync from upstream: - Remove the pkgbase bits. - Disconnect upload_azure_image(), as FreeBSD on Azure has been taken over by Microsoft. Sponsored by: The FreeBSD Foundation Modified: user/gjb/thermite/thermite.sh Modified: user/gjb/thermite/thermite.sh ============================================================================== --- user/gjb/thermite/thermite.sh Thu May 26 18:35:37 2016 (r300764) +++ user/gjb/thermite/thermite.sh Thu May 26 18:37:51 2016 (r300765) @@ -282,12 +282,6 @@ ftp_stage() { _type="snapshots" ;; esac - if [ ! -z "${TURNITUPTOELEVEN}" ]; then - chroot ${CHROOTDIR} make -C /usr/src \ - TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - KERNCONF=${KERNEL} \ - packages >> ${logdir}/${_build}.log 2>&1 - fi mkdir -p "${ftpdir}/${_type}" rsync -avH ${CHROOTDIR}/R/ftp-stage/${_type}/* \ @@ -550,12 +544,10 @@ main() { runall build_chroots runall install_chroots runall build_release - if [ -z "${TURNITUPTOELEVEN}" ]; then - runall upload_ec2_ami - runall upload_azure_image - runall upload_gce_image - runall upload_vagrant_image - fi + runall upload_ec2_ami + #runall upload_azure_image + runall upload_gce_image + runall upload_vagrant_image } main "$@"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605261837.u4QIbqxQ066821>