From bcc68c8bd6a69ba5b47bbbd29406cc627a58bebf Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sat, 16 May 2015 13:25:53 +0200
Subject: [PATCH] build: route the cleaning of individual sets through clean
 target

---
 Makefile         |  1 -
 README.md        | 11 +++++++----
 build/base.sh    |  2 +-
 build/clean.sh   | 20 ++++++++++++++++----
 build/common.sh  |  4 ++--
 build/kernel.sh  |  2 +-
 build/release.sh |  2 +-
 7 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 334d1c5..a2ab9e8 100644
--- a/Makefile
+++ b/Makefile
@@ -19,4 +19,3 @@ ${BUILDSCRIPT}:
 	@cd build && sh ./${.TARGET}.sh \
 	    -f ${FLAVOUR} -n ${NAME} -v ${VERSION} ${ARGS}
 .endfor
-
diff --git a/README.md b/README.md
index 95bb3f2..641bb02 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,10 @@ via the clean script:
 
 Available options are:
 
-* images: remove all available images
-* obj: reset the kernel/base build directory
-* sets: remove all available sets
-* stage: reset the main staging area
+* images:	remove all available images
+* obj:		reset the kernel/base build directory
+* kernel:	remove the kernel set
+* base:		remove the base set
+* packages:	remove the packages set
+* release:	remove the release set
+* stage:	reset the main staging area
diff --git a/build/base.sh b/build/base.sh
index 433f224..428961e 100644
--- a/build/base.sh
+++ b/build/base.sh
@@ -29,7 +29,7 @@ set -e
 
 . ./common.sh && $(${SCRUB_ARGS})
 
-rm -f ${SETSDIR}/base-*-${ARCH}.txz
+./clean.sh base
 
 git_clear ${SRCDIR}
 git_describe ${SRCDIR}
diff --git a/build/clean.sh b/build/clean.sh
index 6edd285..c941da2 100644
--- a/build/clean.sh
+++ b/build/clean.sh
@@ -38,12 +38,24 @@ for ARG in ${@}; do
 		setup_stage /usr/obj
 		;;
 	images)
-		echo ">>> Removing ${IMAGESDIR}"
+		echo ">>> Removing images"
 		rm -rf ${IMAGESDIR}
 		;;
-	sets)
-		echo ">>> Removing ${SETSDIR}"
-		rm -rf ${SETSDIR}
+	kernel)
+		echo ">>> Removing kernel set"
+		rm -f ${SETSDIR}/kernel-*-${ARCH}.txz
+		;;
+	base)
+		echo ">>> Removing base set"
+		rm -f ${SETSDIR}/base-*-${ARCH}.txz
+		;;
+	packages)
+		echo ">>> Removing packages set"
+		rm -f ${SETSDIR}/packages-*_${PRODUCT_FLAVOUR}-${ARCH}.tar
+		;;
+	release)
+		echo ">>> Removing release set"
+		rm -f ${SETSDIR}/release-*_${PRODUCT_FLAVOUR}-${ARCH}.tar
 		;;
 	esac
 done
diff --git a/build/common.sh b/build/common.sh
index 6ae92fc..5b19a4c 100644
--- a/build/common.sh
+++ b/build/common.sh
@@ -50,7 +50,7 @@ while getopts n:f:v: OPT; do
 	esac
 done
 
-if [ -z "${PRODUCT_NAME}" -o -z "${PRODUCT_FLAVOUR}" -o -z "${PRODUCT_VERSION}"]; then
+if [ -z "${PRODUCT_NAME}" -o -z "${PRODUCT_FLAVOUR}" -o -z "${PRODUCT_VERSION}" ]; then
 	echo "Oops, please use the make targets to execute the build step." >&2
 	exit 1
 fi
@@ -259,7 +259,7 @@ install_packages()
 
 bundle_packages()
 {
-	rm -f ${SETSDIR}/packages-*_${PRODUCT_FLAVOUR}-${ARCH}.tar
+	sh ./clean.sh packages
 
 	# rebuild expected FreeBSD structure
 	mkdir -p ${1}/pkg-repo/Latest
diff --git a/build/kernel.sh b/build/kernel.sh
index 31eed1d..eb85843 100644
--- a/build/kernel.sh
+++ b/build/kernel.sh
@@ -29,7 +29,7 @@ set -e
 
 . ./common.sh && $(${SCRUB_ARGS})
 
-rm -f ${SETSDIR}/kernel-*-${ARCH}.txz
+./clean.sh kernel
 
 git_clear ${SRCDIR}
 git_describe ${SRCDIR}
diff --git a/build/release.sh b/build/release.sh
index 6976a77..41aa1cb 100644
--- a/build/release.sh
+++ b/build/release.sh
@@ -40,7 +40,7 @@ if [ -n "${1}" ]; then
 	fi
 fi
 
-rm -f ${SETSDIR}/release-*_${PRODUCT_FLAVOUR}-${ARCH}.tar
+sh ./clean.sh release images
 
 echo ">>> Creating images for ${PRODUCT_RELEASE}"