path: root/Makefile.libcompat
diff options
authorAlex Richardson <arichardson@FreeBSD.org>2018-06-29 21:15:26 +0000
committerAlex Richardson <arichardson@FreeBSD.org>2018-06-29 21:15:26 +0000
commit55a5b46aff84045feb84bad7afd8dffa34df33c5 (patch)
treea2009d6c89edc3515b5fe231aafa39e9e5ad75f2 /Makefile.libcompat
parent53ed3b32ae0487a5ea96e4eedbe8c2d8b44b471d (diff)
Don't change directory owner to root when building with -DNO_ROOT
Currently the mtree calls in Makefile.inc1 all change the directory owner to match the spec file. However, we should not be doing this during distributeworld if -DNO_ROOT is passed. Additionally, when creating the WORLDTMP directory hierachy there is no need to change the owner to root so we now always pass the -W flag when populating WORLDTMP. This is also required for building FreeBSD on Linux/Mac since the required groups/users will not exist there which is how I discovered this issue. Reviewed By: emaste, bdrewery, imp Approved By: brooks (mentor) Differential Revision: https://reviews.freebsd.org/D14185
Notes: svn path=/head/; revision=335805
Diffstat (limited to 'Makefile.libcompat')
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.libcompat b/Makefile.libcompat
index 83c18397fa98..eb4a247aa096 100644
--- a/Makefile.libcompat
+++ b/Makefile.libcompat
@@ -165,16 +165,16 @@ build${libcompat}: .PHONY
.endif # !defined(NO_CLEAN)
mkdir -p ${LIBCOMPATTMP}/usr/include
- mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
+ ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
-p ${LIBCOMPATTMP}/usr >/dev/null
- mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
+ ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.include.dist \
-p ${LIBCOMPATTMP}/usr/include >/dev/null
- mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
+ ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
-p ${LIBCOMPATTMP}/usr >/dev/null
.if ${MK_DEBUG_FILES} != "no"
- mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
+ ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
-p ${LIBCOMPATTMP}/usr/lib >/dev/null
- mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
+ ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
-p ${LIBCOMPATTMP}/usr/lib/debug/usr >/dev/null
mkdir -p ${WORLDTMP}