Date: Mon, 24 Aug 2009 21:55:43 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r196521 - in head/release: . scripts Message-ID: <200908242155.n7OLthjE007453@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908242155.n7OLthjE007453>