build: rename DEVELBRANCH to EXTRABRANCH

We can switch it to any other branch depending on requirements.

Makefile

@@ -102,9 +102,7 @@ COREBRANCH?=	stable/${SETTINGS}
 COREENV?=	CORE_PHP=${PHP} CORE_ABI=${SETTINGS} CORE_PYTHON=${PYTHON}
 SRCDIR?=	/usr/src
 SRCBRANCH?=	stable/${SETTINGS}
-
-# for plugins and core
-DEVELBRANCH?=	#master
+EXTRABRANCH?=	# master
 
 # A couple of meta-targets for easy use and ordering:
 
@@ -155,7 +153,7 @@ ${STEP}: lint-steps
 	    -H "${COREENV}" -u "${UEFI:tl}" -U "${SUFFIX}" \
 	    -V "${ADDITIONS}" -O "${GITBASE}"  -r "${SERVER}" \
 	    -q "${VERSIONS}" -h "${PLUGINSENV}" -I "${UPLOADDIR}" \
-	    -D "${DEVELBRANCH}" -A "${PORTSREFURL}" ${${STEP}_ARGS}
+	    -D "${EXTRABRANCH}" -A "${PORTSREFURL}" ${${STEP}_ARGS}
 .endfor
 
 .for SCRIPT in ${SCRIPTS}

README.md

@@ -418,7 +418,7 @@ A fully contained nightly build for the system is invoked using:
 To allow the nightly build to build both release and development packages
 use:
 
-    # make nightly DEVELBRANCH=master
+    # make nightly EXTRABRANCH=master
 
 Nightly builds are the only builds that write and archive logs under:
 

build/common.sh

@@ -57,7 +57,7 @@ while getopts ${OPTS} OPT; do
 		export PRODUCT_DEVICE=${OPTARG}
 		;;
 	D)
-		export DEVELBRANCH=${OPTARG}
+		export EXTRABRANCH=${OPTARG}
 		;;
 	E)
 		export COREBRANCH=${OPTARG}

build/core.sh

@@ -47,7 +47,7 @@ remove_packages ${STAGEDIR} ${@}
 install_packages ${STAGEDIR} pkg git
 lock_packages ${STAGEDIR}
 
-for BRANCH in ${DEVELBRANCH} ${COREBRANCH}; do
+for BRANCH in ${EXTRABRANCH} ${COREBRANCH}; do
 	setup_copy ${STAGEDIR} ${COREDIR}
 	git_reset ${STAGEDIR}${COREDIR} ${BRANCH}
 

build/plugins.sh

@@ -73,7 +73,7 @@ remove_packages ${STAGEDIR} ${@}
 install_packages ${STAGEDIR} pkg git
 lock_packages ${STAGEDIR}
 
-for BRANCH in ${DEVELBRANCH} ${PLUGINSBRANCH}; do
+for BRANCH in ${EXTRABRANCH} ${PLUGINSBRANCH}; do
 	setup_copy ${STAGEDIR} ${PLUGINSDIR}
 	git_reset ${STAGEDIR}${PLUGINSDIR} ${BRANCH}
 

build/rewind.sh

@@ -31,8 +31,8 @@ SELF=rewind
 
 . ./common.sh
 
-if [ -n "${DEVELBRANCH}" ]; then
-	echo ">>> Cannot rewind, please unset DEVELBRANCH=${DEVELBRANCH}"
+if [ -n "${EXTRABRANCH}" ]; then
+	echo ">>> Cannot rewind, please unset EXTRABRANCH=${EXTRABRANCH}"
 	exit 1
 fi
 

build/update.sh

@@ -41,11 +41,11 @@ for ARG in ${ARGS}; do
 
 	case ${ARG} in
 	core)
-		BRANCHES="${DEVELBRANCH} ${COREBRANCH}"
+		BRANCHES="${EXTRABRANCH} ${COREBRANCH}"
 		DIR=${COREDIR}
 		;;
 	plugins)
-		BRANCHES="${DEVELBRANCH} ${PLUGINSBRANCH}"
+		BRANCHES="${EXTRABRANCH} ${PLUGINSBRANCH}"
 		DIR=${PLUGINSDIR}
 		;;
 	ports)