build|composite: remove PRODUCT_FLAVOUR where irrelevant

build/distfiles.sh

@@ -58,7 +58,6 @@ echo "${PORTSLIST}" | while read PORT_ORIGIN; do
 	MAKE_ARGS="
 PACKAGES=${PACKAGESDIR}
 PRODUCT_ABI=${PRODUCT_ABI}
-PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR}
 TRYBROKEN=yes
 UNAME_r=\$(freebsd-version)
 USE_PACKAGE_DEPENDS=yes

build/ports.sh

@@ -111,7 +111,6 @@ clean.up.post.build" | while read PORT_ORIGIN; do
 PACKAGES=${PACKAGESDIR}-cache
 PRODUCT_ABI=${PRODUCT_ABI}
 PRODUCT_ARCH=${PRODUCT_ARCH}
-PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR}
 UNAME_r=\$(freebsd-version)
 "
 

build/skim.sh

@@ -80,7 +80,6 @@ while read PORT_ORIGIN PORT_BROKEN; do
 	MAKE_ARGS="
 __MAKE_CONF=${STAGEDIR}/make.conf
 PRODUCT_ABI=${PRODUCT_ABI}
-PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR}
 "
 
 	if [ ${FLAVOR} != ${PORT} ]; then

composite/distribution.sh

@@ -25,9 +25,9 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-eval "$(make print-PRODUCT_ARCH,PRODUCT_CORE,PRODUCT_FLAVOUR,SETSDIR)"
+eval "$(make print-PRODUCT_ARCH,PRODUCT_CORE,SETSDIR)"
 
-PACKAGESET=$(find ${SETSDIR} -name "packages-*-${PRODUCT_FLAVOUR}-${PRODUCT_ARCH}.tar")
+PACKAGESET=$(find ${SETSDIR} -name "packages-*-${PRODUCT_ARCH}.tar")
 
 if [ ! -f "${PACKAGESET}" ]; then
 	echo ">>> Cannot continue without packages set"

composite/factory.sh

@@ -25,9 +25,9 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-eval "$(make print-PRODUCT_ARCH,PRODUCT_CORE,PRODUCT_FLAVOUR,PRODUCT_ZFS,SETSDIR)"
+eval "$(make print-PRODUCT_ARCH,PRODUCT_CORE,PRODUCT_ZFS,SETSDIR)"
 
-PACKAGESET=$(find ${SETSDIR} -name "packages-*-${PRODUCT_FLAVOUR}-${PRODUCT_ARCH}.tar")
+PACKAGESET=$(find ${SETSDIR} -name "packages-*-${PRODUCT_ARCH}.tar")
 
 if [ ! -f "${PACKAGESET}" ]; then
 	echo ">>> Cannot continue without packages set"

composite/watch.sh

@@ -25,13 +25,12 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-eval "$(make print-LOGSDIR,PRODUCT_FLAVOUR)"
+eval "$(make print-LOGSDIR)"
 
 CURRENTDIR=$(find -s ${LOGSDIR} -type d -depth 1 \! -name latest | tail -n1)
 
 if [ -n "${CURRENTDIR}" ]; then
-	for CURRENTLOG in $(find ${CURRENTDIR} -name "??-${1:-ports}.log" -or \
-	    -name "??-${1:-ports}-${PRODUCT_FLAVOUR}.log"); do
+	for CURRENTLOG in $(find ${CURRENTDIR} -name "??-${1:-ports}.log"); do
 		tail -f ${CURRENTLOG}
 		break
 	done