Date: Tue, 6 Dec 2016 07:33:50 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r309605 - in stable: 10 11 9 Message-ID: <201612060733.uB67XoiR044010@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Tue Dec 6 07:33:49 2016 New Revision: 309605 URL: https://svnweb.freebsd.org/changeset/base/309605 Log: MFC r309332: Cleanup old debug dirs in delete-old-dirs target Any .debug or .symbols files under /usr/lib/debug which correspond to OLD_FILES entries in ObsoleteFiles.inc are also automatically cleaned up by the delete-old target. Make this also apply to any OLD_DIRS entries. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D8683 Modified: stable/11/Makefile.inc1 Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/10/Makefile.inc1 stable/9/Makefile.inc1 (contents, props changed) Directory Properties: stable/10/ (props changed) stable/9/ (props changed) Modified: stable/11/Makefile.inc1 ============================================================================== --- stable/11/Makefile.inc1 Tue Dec 6 06:15:28 2016 (r309604) +++ stable/11/Makefile.inc1 Tue Dec 6 07:33:49 2016 (r309605) @@ -2345,6 +2345,11 @@ delete-old-dirs: .PHONY elif [ -L "${DESTDIR}/$${dir}" ]; then \ echo "${DESTDIR}/$${dir} is a link, please remove everything manually."; \ fi; \ + if [ -d "${DESTDIR}${DEBUGDIR}/$${dir}" ]; then \ + rmdir -v "${DESTDIR}${DEBUGDIR}/$${dir}" || true; \ + elif [ -L "${DESTDIR}${DEBUGDIR}/$${dir}" ]; then \ + echo "${DESTDIR}${DEBUGDIR}/$${dir} is a link, please remove everything manually."; \ + fi; \ done @echo ">>> Old directories removed" @@ -2359,6 +2364,11 @@ check-old-dirs: .PHONY elif [ -L "${DESTDIR}/$${dir}" ]; then \ echo "${DESTDIR}/$${dir} is a link, please remove everything manually."; \ fi; \ + if [ -d "${DESTDIR}${DEBUGDIR}/$${dir}" ]; then \ + echo "${DESTDIR}${DEBUGDIR}/$${dir}"; \ + elif [ -L "${DESTDIR}${DEBUGDIR}/$${dir}" ]; then \ + echo "${DESTDIR}${DEBUGDIR}/$${dir} is a link, please remove everything manually."; \ + fi; \ done delete-old: delete-old-files delete-old-dirs .PHONY
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612060733.uB67XoiR044010>