diff options
| author | jhb <jhb@FreeBSD.org> | 2009-08-24 21:55:43 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2009-08-24 21:55:43 +0000 |
| commit | d68fc145ce48ff5fd4f7a8e59445789c6e8cd7e6 (patch) | |
| tree | 7e15dcff765595415f3817b53dad6adb5e2d567f /release | |
| parent | de920e4e3fb4815142222ca80f8c56e7e375c438 (diff) | |
| download | FreeBSD-src-d68fc145ce48ff5fd4f7a8e59445789c6e8cd7e6.zip FreeBSD-src-d68fc145ce48ff5fd4f7a8e59445789c6e8cd7e6.tar.gz | |
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
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 2 | ||||
| -rw-r--r-- | release/scripts/lib32-make.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/release/Makefile b/release/Makefile index 26038c4..18b1dc9 100644 --- a/release/Makefile +++ b/release/Makefile @@ -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} # diff --git a/release/scripts/lib32-make.sh b/release/scripts/lib32-make.sh index 37e16d4..99bbee4 100644 --- a/release/scripts/lib32-make.sh +++ b/release/scripts/lib32-make.sh @@ -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 |
