diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-11-12 17:13:12 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-11-12 17:13:12 +0000 |
| commit | 30f1a936330908c8bf8cc313e2744086b23dcb24 (patch) | |
| tree | 413ecb3a09ef5fe0b66c954797fa627685c2fc81 | |
| parent | 15482f3f967a3a612ef86be1ca52c0ee258350e7 (diff) | |
| download | src-30f1a936330908c8bf8cc313e2744086b23dcb24.tar.gz src-30f1a936330908c8bf8cc313e2744086b23dcb24.zip | |
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
Notes
Notes:
svn path=/head/; revision=290719
| -rw-r--r-- | targets/pseudo/bootstrap-tools/Makefile | 6 | ||||
| -rw-r--r-- | targets/pseudo/stage/Makefile | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/targets/pseudo/bootstrap-tools/Makefile b/targets/pseudo/bootstrap-tools/Makefile index b0e62d58d7c4..aa6166c85ef0 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 55512e287eac..e1041a2c2742 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 $@ |