From cba4512a8ed100d37e12ff9d9d682d3f35f1161e Mon Sep 17 00:00:00 2001 From: ngie Date: Tue, 21 Mar 2017 05:15:10 +0000 Subject: [PATCH] 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. git-svn-id: svn://svn.freebsd.org/base/stable/10@315661 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- tools/build/mk/OptionalObsoleteFiles.inc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index c79d2f257..bf099272e 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 -- 2.45.0