summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2015-11-12 17:13:12 +0000
committerbdrewery <bdrewery@FreeBSD.org>2015-11-12 17:13:12 +0000
commita94dca0dd8a5fc8ebf927163b86a3d4bd6d30fc2 (patch)
tree413ecb3a09ef5fe0b66c954797fa627685c2fc81
parent91391a17b71fcb67e6d0bb56d9e7f9ada42fbee6 (diff)
downloadFreeBSD-src-a94dca0dd8a5fc8ebf927163b86a3d4bd6d30fc2.zip
FreeBSD-src-a94dca0dd8a5fc8ebf927163b86a3d4bd6d30fc2.tar.gz
META MODE: Don't set schg flags in the stagedir for distrib-dirs.
This recently started setting /var/empty to schg after r290628. Sponsored by: EMC / Isilon Storage Division
-rw-r--r--targets/pseudo/bootstrap-tools/Makefile6
-rw-r--r--targets/pseudo/stage/Makefile2
2 files changed, 4 insertions, 4 deletions
diff --git a/targets/pseudo/bootstrap-tools/Makefile b/targets/pseudo/bootstrap-tools/Makefile
index b0e62d5..aa6166c 100644
--- a/targets/pseudo/bootstrap-tools/Makefile
+++ b/targets/pseudo/bootstrap-tools/Makefile
@@ -43,10 +43,10 @@ BSARGS= DESTDIR= \
legacy: .MAKE .META
mkdir -p ${LEGACY_TOOLS}
- ${MAKE} -C ${SRCTOP}/etc distrib-dirs DESTDIR=${BTOOLSDIR} \
+ ${MAKE} -C ${SRCTOP}/etc distrib-dirs -DNO_FSCHG DESTDIR=${BTOOLSDIR} \
> $@.distrib-dirs_btoolsdir
- ${MAKE} -C ${SRCTOP}/etc distrib-dirs DESTDIR=${LEGACY_TOOLS} \
- > $@.distrib-dirs_legacy_tools
+ ${MAKE} -C ${SRCTOP}/etc distrib-dirs -DNO_FSCHG \
+ DESTDIR=${LEGACY_TOOLS} > $@.distrib-dirs_legacy_tools
${BSENV} ${MAKE} -C ${SRCTOP} -f Makefile.inc1 ${BSARGS} $@
touch $@
diff --git a/targets/pseudo/stage/Makefile b/targets/pseudo/stage/Makefile
index 55512e2..e1041a2 100644
--- a/targets/pseudo/stage/Makefile
+++ b/targets/pseudo/stage/Makefile
@@ -8,7 +8,7 @@ all:
# we don't need to see it.
stage-distrib-dirs: .META
mkdir -p ${STAGE_OBJTOP}
- ${.MAKE} -C ${SRCTOP}/etc distrib-dirs -DWITH_TESTS \
+ ${.MAKE} -C ${SRCTOP}/etc distrib-dirs -DNO_FSCHG -DWITH_TESTS \
DESTDIR=${STAGE_OBJTOP} > $@.distrib_dirs
touch $@
OpenPOWER on IntegriCloud