Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Feb 2019 21:24:45 +0000 (UTC)
From:      Enji Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r343845 - head/share/mk
Message-ID:  <201902062124.x16LOjAs022315@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Wed Feb  6 21:24:44 2019
New Revision: 343845
URL: https://svnweb.freebsd.org/changeset/base/343845

Log:
  Clean up all directories created by `make hier`
  
  The logic I introduced in r322511 unfortunately left chflags schg'ed
  directories behind created by `make hier` (in the stock /etc/mtree
  files, this is limited to /var/empty).
  
  The proposed change calls `chflags -R 0` and `rm -Rf ...` to clean all
  of the directories that could not be removed by `${MAKE} clean`.
  `${MAKE} clean` in bsd.obj.mk calls `cleandir`/`cleanobj`, which handles
  the first directory tree walk/removal.
  
  Approved by:	emaste (mentor)
  MFC after:	1 week
  Differential Revision: https://reviews.freebsd.org/D18641

Modified:
  head/share/mk/suite.test.mk

Modified: head/share/mk/suite.test.mk
==============================================================================
--- head/share/mk/suite.test.mk	Wed Feb  6 20:18:22 2019	(r343844)
+++ head/share/mk/suite.test.mk	Wed Feb  6 21:24:44 2019	(r343845)
@@ -120,5 +120,7 @@ beforecheck:
 #       etc.
 aftercheck:
 	@cd ${.CURDIR} && ${MAKE} clean
+	@chflags -R 0 "${DESTDIR}"
+	@rm -Rf "${DESTDIR}"
 
 .endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902062124.x16LOjAs022315>