diff options
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile.azure | 4 | ||||
| -rw-r--r-- | release/Makefile.ec2 | 4 | ||||
| -rw-r--r-- | release/Makefile.mirrors | 4 | ||||
| -rw-r--r-- | release/tools/ec2.conf | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/release/Makefile.azure b/release/Makefile.azure index 92ddaf2..310b0eb 100644 --- a/release/Makefile.azure +++ b/release/Makefile.azure @@ -16,8 +16,8 @@ AZURE${VAR}!= grep -E ^AZURE${VAR} ${AZURE_UPLOAD_CONF} | awk -F' ' '{print $$2} . 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 diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index f4e5025..f0b4459 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -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 diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index ed10c55..d5e8949 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -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 diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index 4969ad5..9472ec5 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -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 |
