build/ports: clear plugins and core when redoing ports

Makefile

@@ -22,7 +22,7 @@ lint:
 # Bootstrap the build options if not set:
 
 NAME?=		OPNsense
-TYPE?=		opnsense
+TYPE?=		${NAME:tl}
 FLAVOUR?=	OpenSSL
 SETTINGS?=	16.1
 DEVICE?=	a10

build/common.sh

@@ -486,12 +486,7 @@ bootstrap_packages()
 
 	echo ">>> Bootstrapping packages in ${BASEDIR}"
 
-	for PKG in $({
-		cd ${BASEDIR}
-		# find all package files, omitting plugins
-		find .${PACKAGESDIR}/All -type f \
-		    \! -name "os-*" \! -name "ospriv-*"
-	}); do
+	for PKG in $(cd ${BASEDIR}; find .${PACKAGESDIR}/All -type f); do
 		# Adds all available packages and removes the
 		# ones that cannot be installed due to missing
 		# dependencies.  This behaviour is desired.

build/ports.sh

@@ -43,7 +43,8 @@ setup_chroot ${STAGEDIR}
 setup_distfiles ${STAGEDIR}
 
 extract_packages ${STAGEDIR}
-remove_packages ${STAGEDIR} ${@}
+remove_packages ${STAGEDIR} ${@} "os-*" "ospriv-*" ${PRODUCT_TYPE} \
+    ${PRODUCT_TYPE}-stable ${PRODUCT_TYPE}-devel
 bootstrap_packages ${STAGEDIR}
 
 echo ">>> Building packages..."