diff options
| author | ngie <ngie@FreeBSD.org> | 2017-03-21 05:15:10 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-03-21 05:15:10 +0000 |
| commit | 7f287bb3011f6829cdc220351252080da65dc214 (patch) | |
| tree | 679723e54500209fcd362ca9935c4af3a6d7be94 /tools/build | |
| parent | bce7b617018c250761c47f5c3f108e921967f532 (diff) | |
| download | FreeBSD-src-7f287bb3011f6829cdc220351252080da65dc214.zip FreeBSD-src-7f287bb3011f6829cdc220351252080da65dc214.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/build')
| -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 c79d2f2..bf09927 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -4438,9 +4438,14 @@ OLD_FILES+=usr/tests/usr.sbin/etcupdate/tzsetup_test OLD_DIRS+=usr/tests/usr.sbin/etcupdate .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 |
