From: Justin C. Sherrill <justin@shiningsilence.com>
Date: Thu, 1 Nov 2012 02:39:50 +0000 (-0400)
Subject: Make sure that upgrading to master doesn't happen automatically/accidentally.
X-Git-Tag: v3.2.2~42
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/80b03f6169a93b511f76ce45bbb042388205264b

Make sure that upgrading to master doesn't happen automatically/accidentally.
Users will stay with a stable release unless they choose to change.
Also, nrelease builds will build the correct release.
---

diff --git a/etc/Makefile.usr b/etc/Makefile.usr
index e5235605b9..07f226e444 100644
--- a/etc/Makefile.usr
+++ b/etc/Makefile.usr
@@ -86,11 +86,11 @@ src-create-repo:
 	cd ${.CURDIR}/src && \
 		git remote add origin git://${GITHOST}/dragonfly.git
 	cd ${.CURDIR}/src && git fetch origin
-	cd ${.CURDIR}/src && git branch master origin/master
+	cd ${.CURDIR}/src && git branch DragonFly_RELEASE_3_2 origin/DragonFly_RELEASE_3_2
 	cd ${.CURDIR}/src && git gc --aggressive
 
 src-create: src-create-repo
-	cd ${.CURDIR}/src && git checkout master
+	cd ${.CURDIR}/src && git checkout DragonFly_RELEASE_3_2
 	cd ${.CURDIR}/src && git pull
 
 src-create-shallow:
@@ -101,12 +101,12 @@ src-create-shallow:
 	cd ${.CURDIR}/src && \
 	    git remote add origin git://${GITHOST}/dragonfly.git
 	cd ${.CURDIR}/src && git fetch --depth=1 origin
-	cd ${.CURDIR}/src && git branch master origin/master
-	cd ${.CURDIR}/src && git checkout master
+	cd ${.CURDIR}/src && git branch DragonFly_RELEASE_3_2 origin/DragonFly_RELEASE_3_2
+	cd ${.CURDIR}/src && git checkout DragonFly_RELEASE_3_2
 	cd ${.CURDIR}/src && git pull
 
 src-checkout:
-	cd ${.CURDIR}/src && git checkout master
+	cd ${.CURDIR}/src && git checkout DragonFly_RELEASE_3_2
 
 src-update:
 	cd ${.CURDIR}/src && git pull