build: allow to place packages/plugins in the final image

Makefile

@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2016 Franco Fichtner <franco@opnsense.org>
+# Copyright (c) 2015-2017 Franco Fichtner <franco@opnsense.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -47,7 +47,7 @@ SETTINGS?=	16.7
 
 CONFIG?=	${TOOLSDIR}/config/${SETTINGS}/build.conf
 
-.include "${CONFIG}"
+.-include "${CONFIG}"
 
 # Bootstrap the build options if not set:
 
@@ -58,6 +58,7 @@ FLAVOUR?=	OpenSSL
 _ARCH!=		uname -p
 ARCH?=		${_ARCH}
 KERNEL?=	SMP
+ADDITIONS?=	#os-intel-em
 DEVICE?=	a10
 SPEED?=		115200
 UEFI?=		yes
@@ -121,5 +122,5 @@ ${STEP}: lint
 	    -m ${MIRRORS:Ox:[1]} -o "${STAGEDIRPREFIX}" -c ${SPEED} \
 	    -b ${SRCBRANCH} -B ${PORTSBRANCH} -e ${PLUGINSBRANCH} \
 	    -g ${TOOLSBRANCH} -E ${COREBRANCH} -u "${UEFI:tl}" \
-	    -U "${SUFFIX}" ${${STEP}_ARGS}
+	    -U "${SUFFIX}" -V "${ADDITIONS}" ${${STEP}_ARGS}
 .endfor

README.md

@@ -50,6 +50,7 @@ Available early build options are:
 
 Available build options are:
 
+* ADDITIONS:	a list of packages/plugins to add to images
 * ARCH:		the target architecture if not native
 * DEVICE:	loads device-specific modifications, e.g. "a10" (default)
 * FLAVOUR:	"OpenSSL" (default), "LibreSSL", "Base"

build/common.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2014-2016 Franco Fichtner <franco@opnsense.org>
+# Copyright (c) 2014-2017 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:K:k:L:l:m:n:o:P:p:R:S:s:T:t:U:u:v:"
+OPTS="a:B:b:C:c:d:E:e:f:F:g:K:k:L:l:m:n:o:P:p:R:S:s:T:t:U:u:v:V:"
 SCRUB_ARGS=":"
 
 while getopts ${OPTS} OPT; do
@@ -175,6 +175,10 @@ while getopts ${OPTS} OPT; do
 		export PRODUCT_VERSION=${OPTARG}
 		SCRUB_ARGS=${SCRUB_ARGS};shift;shift
 		;;
+	V)
+		export PRODUCT_ADDITIONS=${OPTARG}
+		SCRUB_ARGS=${SCRUB_ARGS};shift;shift
+		;;
 	*)
 		echo "${0}: Unknown argument '${OPT}'" >&2
 		exit 1
@@ -722,7 +726,7 @@ clean_packages()
 setup_packages()
 {
 	extract_packages ${1}
-	install_packages ${@} ${PRODUCT_PKGNAME}
+	install_packages ${@} ${PRODUCT_PKGNAME} ${PRODUCT_ADDITIONS}
 	clean_packages ${1}
 }