diff options
| author | ngie <ngie@FreeBSD.org> | 2017-03-21 05:13:14 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-03-21 05:13:14 +0000 |
| commit | 025daf32042ddca186b7df7dbc392e6aef170e09 (patch) | |
| tree | ae83ed31db4e7e6a080c889e5d0a1613a70f3ccd /tools | |
| parent | 183e2f0e8dba164bc64ad9ad043d4e803a72add4 (diff) | |
| download | FreeBSD-src-025daf32042ddca186b7df7dbc392e6aef170e09.zip FreeBSD-src-025daf32042ddca186b7df7dbc392e6aef170e09.tar.gz | |
MFC r314241,r315228:
r314241:
Fill in MK_RESCUE by finding paths in ${DESTDIR}/rescue and adding
them to OLD_FILES/OLD_DIRS, as necessary.
r315228:
Redirect standard error from find /rescue to /dev/null
This mutes noise from find when /rescue doesn't exist.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 247942a..6b329f2 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -7131,9 +7131,14 @@ OLD_FILES+=usr/share/man/man1/rlog.1.gz OLD_FILES+=usr/share/man/man5/rcsfile.5.gz .endif -#.if ${MK_RESCUE} == no -# to be filled in or replaced with a special target -#.endif +.if ${MK_RESCUE} == no +. if exists(${DESTDIR}${TESTSBASE}) +RESCUE_DIRS!=find ${DESTDIR}/rescue -type d 2>/dev/null | sed -e 's,^${DESTDIR}/,,'; echo +OLD_DIRS+=${RESCUE_DIRS} +RESCUE_FILES!=find ${DESTDIR}/rescue \! -type d 2>/dev/null | sed -e 's,^${DESTDIR}/,,'; echo +OLD_FILES+=${RESCUE_FILES} +. endif +.endif .if ${MK_ROUTED} == no OLD_FILES+=rescue/routed |
