Date: Thu, 12 Jun 2014 13:59:15 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r267397 - projects/release-debugdist Message-ID: <201406121359.s5CDxFAg059881@svn.freebsd.org>
index | next in thread | raw e-mail
Author: gjb Date: Thu Jun 12 13:59:14 2014 New Revision: 267397 URL: http://svnweb.freebsd.org/changeset/base/267397 Log: Remove evaluations of MK_DEBUG_FILES where not needed. If DEBUG_DISTRIBUTIONS is empty, which is true if MK_DEBUG_FILES evaluates to 'no' above, the loop does nothing. Suggested by: emaste Sponsored by: The FreeBSD Foundation Modified: projects/release-debugdist/Makefile.inc1 Modified: projects/release-debugdist/Makefile.inc1 ============================================================================== --- projects/release-debugdist/Makefile.inc1 Thu Jun 12 13:48:52 2014 (r267396) +++ projects/release-debugdist/Makefile.inc1 Thu Jun 12 13:59:14 2014 (r267397) @@ -863,8 +863,7 @@ distributeworld installworld: _installch awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \ ${DESTDIR}/${DISTDIR}/${dist}.meta .endfor -.if ${MK_DEBUG_FILES} != "no" -. for dist in ${DEBUG_DISTRIBUTIONS} +.for dist in ${DEBUG_DISTRIBUTIONS} @# For each file that exists in this dist, print the corresponding @# line from the METALOG. This relies on the fact that @# a line containing only the filename will sort immediatly before @@ -873,8 +872,7 @@ distributeworld installworld: _installch find ./${dist}/usr/lib/debug | sort -u ${METALOG} - | \ awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \ ${DESTDIR}/${DISTDIR}/${dist}.debug.meta -. endfor -.endif +.endfor .endif .endif @@ -892,19 +890,17 @@ packageworld: .endif .endfor -.if ${MK_DEBUG_FILES} != "no" -. for dist in ${DEBUG_DISTRIBUTIONS} -. if defined(NO_ROOT) +.for dist in ${DEBUG_DISTRIBUTIONS} +. if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ tar cvJf ${DESTDIR}/${DISTDIR}/${dist}_debug.txz \ @${DESTDIR}/${DISTDIR}/${dist}.debug.meta -. else +. else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ tar cvJfL ${DESTDIR}/${DISTDIR}/${dist}_debug.txz \ usr/lib/debug -. endif -. endfor -.endif +. endif +.endfor # # reinstallhelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406121359.s5CDxFAg059881>