Date: Tue, 21 Mar 2017 05:15:10 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r315661 - stable/10/tools/build/mk Message-ID: <201703210515.v2L5FA0Y023143@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Tue Mar 21 05:15:10 2017 New Revision: 315661 URL: https://svnweb.freebsd.org/changeset/base/315661 Log: 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. Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/10/ (props changed) Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Tue Mar 21 05:13:14 2017 (r315660) +++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Tue Mar 21 05:15:10 2017 (r315661) @@ -4438,9 +4438,14 @@ OLD_FILES+=usr/tests/usr.sbin/etcupdate/ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703210515.v2L5FA0Y023143>