From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Mon, 22 Mar 2010 20:08:40 +0000 (-0700)
Subject: nrelease - Unconditionally rm -rf /usr/release/root
X-Git-Url: https://gitweb.dragonflybsd.org/~syl/dragonfly.git/commitdiff_plain/92b0ebb9720ab8395e8ca713baf439b389d5fea2

nrelease - Unconditionally rm -rf /usr/release/root

* rm -rf /usr/release/root even for quick nrelease builds to prevent
  stuff from an img build getting into an iso build.
---

diff --git a/nrelease/Makefile b/nrelease/Makefile
index 73a9417b1a..40c78f1782 100644
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -245,8 +245,14 @@ buildkernel1 buildkernel2:
 # MAKEOBJDIRPREFIX for targets that are not run through the buildworld and 
 # buildkernel mechanism.
 #
+# Unconditionally clean out /usr/release/root so a previous img build
+# does not blow up a future quick iso build
+#
 buildiso:
-	if [ ! -d ${ISOROOT} ]; then mkdir -p ${ISOROOT}; fi
+	-rm -rf ${ISOROOT}
+	-chflags -R noschg ${ISOROOT}
+	rm -rf ${ISOROOT}
+	mkdir -p ${ISOROOT}
 	if [ ! -d ${NRLOBJDIR}/nrelease ]; then mkdir -p ${NRLOBJDIR}/nrelease; fi
 	( cd ${.CURDIR}/..; make -DWANT_INSTALLER DESTDIR=${ISOROOT} installworld )
 	( cd ${.CURDIR}/../etc; MAKEOBJDIRPREFIX=${NRLOBJDIR}/nrelease \