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
This commit is contained in:
parent
2fcd493c4b
commit
7b0eef0b32
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=196521
@ -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}
|
||||
|
||||
#
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user