Date: Tue, 28 Jan 2014 22:19:30 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341664 - in head/Mk: . Scripts Message-ID: <201401282219.s0SMJUq4002083@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Tue Jan 28 22:19:30 2014 New Revision: 341664 URL: http://svnweb.freebsd.org/changeset/ports/341664 QAT: https://qat.redports.org/buildarchive/r341664/ Log: - Do not check for ${WRKDIR} in staged files, there are lots of false positives as some .o files may embed the source path [1] - Only check shebang of files with executable bit set Requested by: bapt [1] 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 Tue Jan 28 22:13:46 2014 (r341663) +++ head/Mk/Scripts/qa.sh Tue Jan 28 22:19:30 2014 (r341664) @@ -20,7 +20,7 @@ err() { shebang() { rc=0 - IFS="$LF" ; for f in `find ${STAGEDIR} -type f`; do + IFS="$LF" ; for f in `find ${STAGEDIR} -type f -perm +111`; do interp=$(sed -n -e '1s/^#![[:space:]]*\([^[:space:]]*\).*/\1/p;2q' $f) case "$interp" in "") ;; @@ -55,12 +55,10 @@ symlinks() { paths() { rc=0 IFS="$LF" ; for f in `find ${STAGEDIR} -type f`;do - for d in ${STAGEDIR} ${WRKDIR}; do - if grep -q ${d} ${f} ; then - err "${f} is referring to ${d}" - rc=1 - fi - done + if grep -q ${STAGEDIR} ${f} ; then + err "${f} is referring to ${STAGEDIR}" + rc=1 + fi done } Modified: head/Mk/bsd.stage.mk ============================================================================== --- head/Mk/bsd.stage.mk Tue Jan 28 22:13:46 2014 (r341663) +++ head/Mk/bsd.stage.mk Tue Jan 28 22:19:30 2014 (r341664) @@ -13,7 +13,6 @@ MAKE_ARGS+= ${DESTDIRNAME}=${STAGEDIR} QA_ENV+= STAGEDIR=${STAGEDIR} \ PREFIX=${PREFIX} \ LOCALBASE=${LOCALBASE} \ - WRKDIR=${WRKDIR} \ USESDESKTOPFILEUTILS=${USES:Mdesktop-file-utils} \ USESSHAREDMIMEINFO=${USES:Mshared-mime-info} \ "STRIP=${STRIP}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401282219.s0SMJUq4002083>