build: add SERVER knob and PLUGINSENV

Makefile

@@ -79,11 +79,13 @@ MIRRORS?=	https://opnsense.c0urier.net \
 		http://mirror.sfo12.us.leaseweb.net/opnsense \
 		http://mirror.fra10.de.leaseweb.net/opnsense \
 		http://mirror.ams1.nl.leaseweb.net/opnsense
+SERVER?=	user@does.not.exist
 _VERSION!=	date '+%Y%m%d%H%M'
 VERSION?=	${_VERSION}
 STAGEDIRPREFIX?=/usr/obj
 PORTSREFDIR?=	/usr/hardenedbsd-ports
 PORTSREFBRANCH?=master
+PLUGINSENV?=	PLUGIN_PHP=${PHP}
 PLUGINSDIR?=	/usr/plugins
 PLUGINSBRANCH?=	master
 PORTSDIR?=	/usr/ports
@@ -136,8 +138,8 @@ ${STEP}: lint-steps
 	    -b ${SRCBRANCH} -B ${PORTSBRANCH} -e ${PLUGINSBRANCH} \
 	    -g ${TOOLSBRANCH} -E ${COREBRANCH} -G ${PORTSREFBRANCH} \
 	    -H "${COREENV}" -Q "${QUICK}" -u "${UEFI:tl}" -U "${SUFFIX}" \
-	    -V "${ADDITIONS}" -O "${GITBASE}" -q "${PHP}" \
-	    ${${STEP}_ARGS}
+	    -V "${ADDITIONS}" -O "${GITBASE}" -q "${PHP}" -r "${SERVER}" \
+	    -h "${PLUGINENV}" ${${STEP}_ARGS}
 .endfor
 
 .for SCRIPT in ${SCRIPTS}

build/common.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2014-2017 Franco Fichtner <franco@opnsense.org>
+# Copyright (c) 2014-2018 Franco Fichtner <franco@opnsense.org>
 # Copyright (c) 2010-2011 Scott Ullrich <sullrich@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,7 @@
 
 set -e
 
-OPTS="a:B:b:C:c:d:E:e:F:f:G:g:H:K:k:L:l:m:n:O:o:P:p:Q:q:R:S:s:T:t:U:u:v:V:"
+OPTS="a:B:b:C:c:d:E:e:F:f:G:g:H:h:K:k:L:l:m:n:O:o:P:p:Q:q:R:r:S:s:T:t:U:u:v:V:"
 
 while getopts ${OPTS} OPT; do
 	case ${OPT} in
@@ -73,6 +73,9 @@ while getopts ${OPTS} OPT; do
 	H)
 		export COREENV=${OPTARG}
 		;;
+	h)
+		export PLUGINENV=${OPTARG}
+		;;
 	K)
 		if [ -n "${OPTARG}" ]; then
 			export PRODUCT_PUBKEY=${OPTARG}
@@ -121,6 +124,9 @@ while getopts ${OPTS} OPT; do
 	R)
 		export PORTSREFDIR=${OPTARG}
 		;;
+	r)
+		export PRODUCT_SERVER=${OPTARG}
+		;;
 	S)
 		export SRCDIR=${OPTARG}
 		;;
@@ -173,6 +179,7 @@ if [ -z "${PRODUCT_NAME}" -o \
     -z "${PRODUCT_MIRROR}" -o \
     -z "${PRODUCT_DEVICE}" -o \
     -z "${PRODUCT_SPEED}" -o \
+    -z "${PRODUCT_SERVER}" -o \
     -z "${PRODUCT_PHP}" -o \
     -z "${PRODUCT_KERNEL}" -o \
     -z "${PRODUCT_GITBASE}" -o \

build/download.sh

@@ -31,20 +31,10 @@ SELF=download
 
 . ./common.sh
 
-if [ -z "${1}" ]; then
-	echo ">> Missing download target"
-	exit 1
-fi
-
-SSHTARGET=${1}
-
-# remove first argument
-shift
-
 download()
 {
-	echo ">>> Downloading ${1}..."
-	scp -r ${SSHTARGET}:"${2}/${3}" ${2}
+	echo ">>> Downloading ${1} from ${PRODUCT_SERVER}..."
+	scp ${PRODUCT_SERVER}:"${2}/${3}" ${2}
 }
 
 for ARG in ${@}; do

build/plugins.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2015-2017 Franco Fichtner <franco@opnsense.org>
+# Copyright (c) 2015-2018 Franco Fichtner <franco@opnsense.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -83,9 +83,11 @@ for BRANCH in master ${PLUGINSBRANCH}; do
 	setup_copy ${STAGEDIR} ${PLUGINSDIR}
 	git_reset ${STAGEDIR}${PLUGINSDIR} ${BRANCH}
 
+	PLUGIN_ARGS="PLUGIN_ARCH=${PRODUCT_ARCH} ${PLUGINENV}"
+
 	for PLUGIN in ${PLUGINS_LIST}; do
-		PLUGIN_NAME=$(make -C ${STAGEDIR}${PLUGINSDIR}/${PLUGIN} name)
-		PLUGIN_DEPS=$(make -C ${STAGEDIR}${PLUGINSDIR}/${PLUGIN} depends)
+		PLUGIN_NAME=$(make -C ${STAGEDIR}${PLUGINSDIR}/${PLUGIN} ${PLUGIN_ARGS} name)
+		PLUGIN_DEPS=$(make -C ${STAGEDIR}${PLUGINSDIR}/${PLUGIN} ${PLUGIN_ARGS} depends)
 
 		if search_packages ${STAGEDIR} ${PLUGIN_NAME}; then
 			# already built
@@ -93,7 +95,7 @@ for BRANCH in master ${PLUGINSBRANCH}; do
 		fi
 
 		install_packages ${STAGEDIR} ${PLUGIN_DEPS}
-		custom_packages ${STAGEDIR} ${PLUGINSDIR}/${PLUGIN}
+		custom_packages ${STAGEDIR} ${PLUGINSDIR}/${PLUGIN} "${PLUGIN_ARGS}"
 	done
 done
 

build/upload.sh

@@ -31,20 +31,10 @@ SELF=upload
 
 . ./common.sh
 
-if [ -z "${1}" ]; then
-	echo ">> Missing upload target"
-	exit 1
-fi
-
-SSHTARGET=${1}
-
-# remove first argument
-shift
-
 upload()
 {
-	echo ">>> Uploading ${1}..."
-	(cd ${2}; scp ${3} ${SSHTARGET}:)
+	echo ">>> Uploading ${1} to ${PRODUCT_SERVER}..."
+	(cd ${2}; scp ${3} ${PRODUCT_SERVER}:)
 }
 
 for ARG in ${@}; do