From owner-svn-src-all@FreeBSD.ORG Mon Aug 24 21:55:43 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 81439106568F; Mon, 24 Aug 2009 21:55:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 704D18FC14; Mon, 24 Aug 2009 21:55:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7OLth6j007457; Mon, 24 Aug 2009 21:55:43 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7OLthjE007453; Mon, 24 Aug 2009 21:55:43 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200908242155.n7OLthjE007453@svn.freebsd.org> From: John Baldwin Date: Mon, 24 Aug 2009 21:55:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196521 - in head/release: . scripts X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Aug 2009 21:55:43 -0000 Author: jhb Date: Mon Aug 24 21:55:43 2009 New Revision: 196521 URL: http://svn.freebsd.org/changeset/base/196521 Log: Fix a few issues with the lib32 dist so that it includes ldd32. - Use a better find invocation to purge empty directories from all the dist trees during a release build. The previous version did not purge directories whose contents were all empty directories. - Explicitly blacklist a few files from the lib32 dist instead of using a whitelist. A better longterm solution is to fix the few offenders to not install data files during a lib32 install. MFC after: 3 days Modified: head/release/Makefile head/release/scripts/lib32-make.sh Modified: head/release/Makefile ============================================================================== --- head/release/Makefile Mon Aug 24 21:51:46 2009 (r196520) +++ head/release/Makefile Mon Aug 24 21:55:43 2009 (r196521) @@ -696,7 +696,7 @@ release.5: # Remove all the directories we don't need. -cd ${RD}/trees && \ (find ${OTHER_DISTS} -path '*/var/empty' | xargs chflags noschg; \ - find ${OTHER_DISTS} -depth -type d -empty -print | xargs rmdir) + find ${OTHER_DISTS} -depth -type d -empty -delete) touch ${.TARGET} # Modified: head/release/scripts/lib32-make.sh ============================================================================== --- head/release/scripts/lib32-make.sh Mon Aug 24 21:51:46 2009 (r196520) +++ head/release/scripts/lib32-make.sh Mon Aug 24 21:55:43 2009 (r196521) @@ -5,4 +5,4 @@ # Clean the dust. cd ${RD}/trees/lib32 && \ - find . ! -path '*/libexec/*' ! -path '*/usr/lib32/*' -delete + find . '(' -path '*/usr/share/*' -or -path '*/usr/lib/*' ')' -delete