Author: gjb
Date: Thu Jun 25 14:58:50 2015
New Revision: 284813
URL: https://svnweb.freebsd.org/changeset/base/284813
Log:
MFC r284780, r284811, r284812:
r284780:
Ensure ASSUME_ALWAYS_YES is set when deleting pkg(8) from the
DESTDIR, otherwise it can get stuck in ttyin.
r284811:
Consider PRERELEASE builds snapshots, in addition to CURRENT
and STABLE.
r284812:
Change the hour:minute delimiter from ':' to '-', since
the former is an invalid character in EC2 images.
Approved by: re (glebius, insta-MFC)
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/release/Makefile.azure
stable/10/release/Makefile.ec2
stable/10/release/Makefile.mirrors
stable/10/release/tools/ec2.conf
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/release/Makefile.azure
==============================================================================
--- stable/10/release/Makefile.azure Thu Jun 25 14:24:06 2015
(r284812)
+++ stable/10/release/Makefile.azure Thu Jun 25 14:58:50 2015
(r284813)
@@ -16,8 +16,8 @@ AZURE${VAR}!= grep -E ^AZURE${VAR} ${AZU
. endfor
.endif
-.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT"
-SNAPSHOT_DATE!= date +-%Y-%m-%d-%H:%M
+.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} ==
"PRERELEASE"
+SNAPSHOT_DATE!= date +-%Y-%m-%d-%H-%M
.endif
AZURE_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE}.vhd
Modified: stable/10/release/Makefile.ec2
==============================================================================
--- stable/10/release/Makefile.ec2 Thu Jun 25 14:24:06 2015
(r284812)
+++ stable/10/release/Makefile.ec2 Thu Jun 25 14:58:50 2015
(r284813)
@@ -5,8 +5,8 @@
# Makefile for creating an EC2 AMI from a disk image.
#
-.if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE"
-AMINAMESUFFIX!= date +-%Y-%m-%d-%H:%M
+.if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} ==
"PRERELEASE"
+AMINAMESUFFIX!= date +-%Y-%m-%d-%H-%M
.endif
.if defined(EC2PUBLIC)
PUBLISH= --public
Modified: stable/10/release/Makefile.mirrors
==============================================================================
--- stable/10/release/Makefile.mirrors Thu Jun 25 14:24:06 2015
(r284812)
+++ stable/10/release/Makefile.mirrors Thu Jun 25 14:58:50 2015
(r284813)
@@ -27,7 +27,7 @@ EMBEDDED= 1
.endif
# snapshot
-.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT"
+.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} ==
"PRERELEASE"
SNAPSHOT= 1
TLD?= ${FTPDIR}/snapshots
. if !defined(SVNREVISION) || empty(SVNREVISION)
@@ -63,7 +63,7 @@ BOARDNAME:= ${KERNCONF}
. else
OLDNAME:= ${KERNCONF}
. endif
-. if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT"
+. if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} ==
"PRERELEASE"
SNAPSHOT= 1
. endif
IMAGES:= img
Modified: stable/10/release/tools/ec2.conf
==============================================================================
--- stable/10/release/tools/ec2.conf Thu Jun 25 14:24:06 2015
(r284812)
+++ stable/10/release/tools/ec2.conf Thu Jun 25 14:58:50 2015
(r284813)
@@ -32,7 +32,7 @@ vm_extra_pre_umount() {
# catalogue and install or update pkg when the instance first
# launches, so these files would just be replaced anyway; removing
# them from the image allows it to boot faster.
- pkg -c ${DESTDIR} delete -f -y pkg
+ env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} delete -f -y pkg
rm ${DESTDIR}/var/db/pkg/repo-*.sqlite
# The size of the EC2 root disk can be configured at instance launch
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
