svn commit: r366159 - in head/Mk: . Scripts

[Antoine Brodin]

Author: antoine
Date: Mon Aug 25 22:10:42 2014
New Revision: 366159
URL: http://svnweb.freebsd.org/changeset/ports/366159
QAT: https://qat.redports.org/buildarchive/r366159/

Log:
  Check that the plist doesn't reference the stage dir during stage-qa
  
  ====> Running Q/A tests (stage-qa)
  Error: '/usr/ports/www/claroline/work/.PLIST.mktmp' is referring to /usr/ports/www/claroline/work/stage
  *** Error code 1
  
  Differential Revision: https://reviews.freebsd.org/D685
  Reviewed by:	bdrewery
  With hat:	portmgr

Modified:
  head/Mk/Scripts/qa.sh
  head/Mk/bsd.stage.mk

Modified: head/Mk/Scripts/qa.sh
==============================================================================
--- head/Mk/Scripts/qa.sh	Mon Aug 25 22:06:03 2014	(r366158)
+++ head/Mk/Scripts/qa.sh	Mon Aug 25 22:10:42 2014	(r366159)
@@ -126,7 +126,7 @@ paths() {
 		rc=1
 	# Use heredoc to avoid losing rc from find|while subshell
 	done <<-EOF
-	$(find ${STAGEDIR} -type f -exec grep -l "${STAGEDIR}" {} +)
+	$(find ${TMPPLIST} ${STAGEDIR} -type f -exec grep -l "${STAGEDIR}" {} +)
 	EOF
 
 	return ${rc}

Modified: head/Mk/bsd.stage.mk
==============================================================================
--- head/Mk/bsd.stage.mk	Mon Aug 25 22:06:03 2014	(r366158)
+++ head/Mk/bsd.stage.mk	Mon Aug 25 22:10:42 2014	(r366159)
@@ -13,7 +13,8 @@ MAKE_ARGS+=	${DESTDIRNAME}=${STAGEDIR}
 QA_ENV+=	STAGEDIR=${STAGEDIR} \
 		PREFIX=${PREFIX} \
 		LOCALBASE=${LOCALBASE} \
-		"STRIP=${STRIP}"
+		"STRIP=${STRIP}" \
+		TMPPLIST=${TMPPLIST}
 .if !empty(USES:Mdesktop-file-utils)
 QA_ENV+=	USESDESKTOPFILEUTILS=yes
 .endif