build: minor tweaks

build/clean.sh

@@ -65,9 +65,12 @@ for ARG in ${@}; do
 		rm -f ${IMAGESDIR}/*-nano-${PRODUCT_ARCH}.*
 		;;
 	obj)
-		for DIR in $(find ${STAGEDIRPREFIX}${TOOLSDIR} -type d -depth 3); do
-			setup_stage ${DIR}
-		done
+		if [ -d ${STAGEDIRPREFIX}${TOOLSDIR} ]; then
+			for DIR in $(find ${STAGEDIRPREFIX}${TOOLSDIR} \
+			    -type d -depth 3); do
+				setup_stage ${DIR}
+			done
+		fi
 		for DIR in $(find /usr/obj -type d -depth 1); do
 			setup_stage ${DIR}
 			rm -rf ${DIR}

build/ports.sh

@@ -75,8 +75,6 @@ fi
 trap : 2
 
 if ! ${ENV_FILTER} chroot ${STAGEDIR} /bin/sh -es << EOF; then SELF=; fi
-export PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR}
-
 if ! pkg -N; then
 	make -C ${PORTSDIR}/ports-mgmt/pkg install
 fi
@@ -87,7 +85,8 @@ echo "${PORTS_LIST}" | while read PORT_ORIGIN; do
 	fi
 
 	echo ">>> Building \${PORT_ORIGIN}"
-	make -C ${PORTSDIR}/\${PORT_ORIGIN} install
+	make -C ${PORTSDIR}/\${PORT_ORIGIN} install \
+	    PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR}
 done
 EOF