From 52fc0d45448fb957fdebf3b8e352f8631dd7d86b Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 28 Sep 2016 01:57:43 +0200
Subject: [PATCH] build: force kernel and base set rewrite, clean late

---
 build/base.sh   | 5 +++--
 build/kernel.sh | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build/base.sh b/build/base.sh
index caa95a3..4b17630 100644
--- a/build/base.sh
+++ b/build/base.sh
@@ -42,8 +42,6 @@ git_describe ${SRCDIR}
 
 BASE_SET=${SETSDIR}/base-${REPO_VERSION}-${PRODUCT_ARCH}
 
-sh ./clean.sh ${SELF}
-
 setup_stage ${STAGEDIR}
 
 MAKE_ARGS="TARGET_ARCH=${PRODUCT_ARCH} TARGET=${PRODUCT_TARGET}"
@@ -51,8 +49,11 @@ MAKE_ARGS="${MAKE_ARGS} SRCCONF=${CONFIGDIR}/src.conf __MAKE_CONF="
 
 ${ENV_FILTER} make -s -C${SRCDIR} -j${CPUS} buildworld ${MAKE_ARGS} NO_CLEAN=yes
 ${ENV_FILTER} make -s -C${SRCDIR}/release obj ${MAKE_ARGS}
+rm -f $(make -C${SRCDIR}/release -V .OBJDIR)/base.txz
 ${ENV_FILTER} make -s -C${SRCDIR}/release base.txz ${MAKE_ARGS}
 
+sh ./clean.sh ${SELF}
+
 mv $(make -C${SRCDIR}/release -V .OBJDIR)/base.txz ${BASE_SET}.txz
 
 echo -n ">>> Generating obsolete file list... "
diff --git a/build/kernel.sh b/build/kernel.sh
index 1afd569..bb83ef8 100644
--- a/build/kernel.sh
+++ b/build/kernel.sh
@@ -42,8 +42,6 @@ git_describe ${SRCDIR}
 
 KERNEL_SET=${SETSDIR}/kernel-${REPO_VERSION}-${PRODUCT_ARCH}
 
-sh ./clean.sh ${SELF}
-
 BUILD_KERNEL="SMP"
 if [ -f ${CONFIGDIR}/${BUILD_KERNEL}.${PRODUCT_ARCH} ]; then
 	BUILD_KERNEL="${BUILD_KERNEL}.${PRODUCT_ARCH}"
@@ -57,8 +55,11 @@ MAKE_ARGS="${MAKE_ARGS} KERNCONF=${BUILD_KERNEL} __MAKE_CONF="
 
 ${ENV_FILTER} make -s -C${SRCDIR} -j${CPUS} buildkernel ${MAKE_ARGS} NO_KERNELCLEAN=yes
 ${ENV_FILTER} make -s -C${SRCDIR}/release obj ${MAKE_ARGS}
+rm -f $(make -C${SRCDIR}/release -V .OBJDIR)/kernel.txz
 ${ENV_FILTER} make -s -C${SRCDIR}/release kernel.txz ${MAKE_ARGS}
 
+sh ./clean.sh ${SELF}
+
 mv $(make -C${SRCDIR}/release -V .OBJDIR)/kernel.txz ${KERNEL_SET}.txz
 
 generate_signature ${KERNEL_SET}.txz