From owner-svn-ports-head@FreeBSD.ORG Mon Apr 21 18:42:16 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2772418C; Mon, 21 Apr 2014 18:42:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EDB2A1895; Mon, 21 Apr 2014 18:42:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3LIgFmJ073012; Mon, 21 Apr 2014 18:42:15 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3LIgFl9073011; Mon, 21 Apr 2014 18:42:15 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201404211842.s3LIgFl9073011@svn.freebsd.org> From: Bryan Drewery Date: Mon, 21 Apr 2014 18:42:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351701 - head/Mk/Scripts X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Apr 2014 18:42:16 -0000 Author: bdrewery Date: Mon Apr 21 18:42:15 2014 New Revision: 351701 URL: http://svnweb.freebsd.org/changeset/ports/351701 QAT: https://qat.redports.org/buildarchive/r351701/ Log: - Split MTREE check into its own check - Split dependency-owned check its own and make into a non-fatal warning. This is not black-and-white. Python/Rubygem ports cleanup the lib dir for every installed package, and for python/ruby-gems too. This is fine, the extensions should not clean them up then; the error is valid here. However, there's other frameworks which don't cleanup in the master package and yield unexpected results. An example is that php does not cleanup etc/php itself. Only extensions do. So if an extension depends on another extension it will complain that the dependent extension owns etc/php, so we remove from bsd.php.mk, now it's a leftover. The proper place is in the php port itself, but it's unknown how many other cases there are like this. So for now make this non-fatal and into a warning. This is all mostly moot once pkg auto handles directories anyhow. With hat: portmgr Discussed with: antoine Modified: head/Mk/Scripts/check-stagedir.sh Modified: head/Mk/Scripts/check-stagedir.sh ============================================================================== --- head/Mk/Scripts/check-stagedir.sh Mon Apr 21 18:31:10 2014 (r351700) +++ head/Mk/Scripts/check-stagedir.sh Mon Apr 21 18:42:15 2014 (r351701) @@ -275,17 +275,29 @@ sort -u ${WRKDIR}/.plist-dirs-unsorted-n # Anything listed in plist and in restricted-dirs is a failure. I.e., # it's owned by a run-time dependency or one of the MTREEs. -echo "===> Checking for directories owned by dependencies or MTREEs" -cat ${WRKDIR}/.mtree ${WRKDIR}/.run-depends-dirs | sort -u \ - >${WRKDIR}/.restricted-dirs +echo "===> Checking for directories owned by MTREEs" +cat ${WRKDIR}/.mtree | sort -u >${WRKDIR}/.restricted-dirs +: >${WRKDIR}/.invalid-plist-mtree +comm -12 ${WRKDIR}/.plist-dirs-sorted-no-comments ${WRKDIR}/.restricted-dirs \ + | sort_dfs | sed "${sed_dirs}" \ + >>${WRKDIR}/.invalid-plist-mtree || : +if [ -s "${WRKDIR}/.invalid-plist-mtree" ]; then + ret=1 + while read line; do + echo "Error: Owned by MTREE: ${line}" >&2 + done < ${WRKDIR}/.invalid-plist-mtree +fi + +echo "===> Checking for directories handled by dependencies" +cat ${WRKDIR}/.run-depends-dirs | sort -u >${WRKDIR}/.restricted-dirs : >${WRKDIR}/.invalid-plist-dependencies comm -12 ${WRKDIR}/.plist-dirs-sorted-no-comments ${WRKDIR}/.restricted-dirs \ | sort_dfs | sed "${sed_dirs}" \ >>${WRKDIR}/.invalid-plist-dependencies || : if [ -s "${WRKDIR}/.invalid-plist-dependencies" ]; then - ret=1 +# ret=1 while read line; do - echo "Error: Owned by dependency: ${line}" >&2 + echo "Warning: Possibly owned by dependency: ${line}" >&2 done < ${WRKDIR}/.invalid-plist-dependencies fi