svn commit: r196595 - in stable/7/release: . scripts

[John Baldwin]

Author: jhb
Date: Thu Aug 27 17:16:42 2009
New Revision: 196595
URL: http://svn.freebsd.org/changeset/base/196595

Log:
  MFC 196521:
  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.

Modified:
  stable/7/release/   (props changed)
  stable/7/release/Makefile
  stable/7/release/scripts/lib32-make.sh
  stable/7/release/scripts/src-install.sh   (props changed)

Modified: stable/7/release/Makefile
==============================================================================
--- stable/7/release/Makefile	Thu Aug 27 17:16:23 2009	(r196594)
+++ stable/7/release/Makefile	Thu Aug 27 17:16:42 2009	(r196595)
@@ -653,7 +653,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: stable/7/release/scripts/lib32-make.sh
==============================================================================
--- stable/7/release/scripts/lib32-make.sh	Thu Aug 27 17:16:23 2009	(r196594)
+++ stable/7/release/scripts/lib32-make.sh	Thu Aug 27 17:16:42 2009	(r196595)
@@ -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