Merge branch 'opnsense:master' into master

Makefile

@@ -24,8 +24,8 @@
 # SUCH DAMAGE.
 
 STEPS=		audit arm base boot chroot clean clone compress confirm \
-		connect core distfiles download dvd fingerprint info kernel \
-		kyua list make.conf nano options packages plugins ports \
+		connect core distfiles download dvd fingerprint info \
+		kernel list make.conf nano options packages plugins ports \
 		prefetch print rebase release rename serial sign skim \
 		sync test update upload verify vga vm xtools
 SCRIPTS=	custom distribution factory hotfix nightly watch

build/clean.sh

@@ -79,10 +79,6 @@ for ARG in ${@}; do
 		echo ">>> Removing kernel set"
 		rm -f ${SETSDIR}/kernel-*-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.*
 		;;
-	kyua)
-		echo ">>> Removing kyua set"
-		rm -f ${SETSDIR}/kyua-*-${PRODUCT_ARCH}.*
-		;;
 	logs)
 		setup_stage ${LOGSDIR}
 		;;

build/common.sh

@@ -771,7 +771,7 @@ find_set()
 	aux|packages|release)
 		echo $(find ${SETSDIR} -name "${1}-*-${PRODUCT_ARCH}.tar")
 		;;
-	kyua|xtools)
+	xtools)
 		echo $(find ${SETSDIR} -name "${1}-*-${PRODUCT_ARCH}.txz")
 		;;
 	*)

build/upload.sh

@@ -42,7 +42,7 @@ for ARG in ${@}; do
 	arm|dvd|nano|serial|vga|vm)
 		upload ${ARG} ${IMAGESDIR} "*-${ARG}-*${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}*"
 		;;
-	aux|distfiles|kyua|packages|release)
+	aux|distfiles|packages|release)
 		upload ${ARG} ${SETSDIR} "${ARG}-*"
 		;;
 	base|kernel)

composite/hotfix.sh

@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-TARGET=${1%%-*}
+TARGET=${1}
 MSGS=
 
 set -e
@@ -72,7 +72,7 @@ else
 	ARG_CORE=
 
 	# figure out which stage a package belongs to
-	for PACKAGE in $(echo ${1} | tr ',' ' '); do
+	for PACKAGE in $(echo ${TARGET} | tr ',' ' '); do
 		if [ -z "${PRODUCT_CORES%%*"${PACKAGE}"*}" ]; then
 			if [ -n "${ARG_CORE}" ]; then
 				ARG_CORE="${ARG_CORE},"