check/delete-old: Auto-generate lib32 entries for libraries.
ClosedPublic
Actions

Authored by jhb on Dec 7 2021, 7:07 PM.

Details

Reviewers

emaste
imp

Commits

rG84d246823ece: check/delete-old: Auto-generate lib32 entries for libraries.
rG77da558ceb09: check/delete-old: Auto-generate lib32 entries for libraries.

Summary

Add usr/lib32/libfoo.so.N for lib/libfoo.so.N.

Add usr/lib32/foo for usr/lib/foo.

Treat casper libraries special since they are installed to /usr/lib32 instead of /usr/lib32/casper and thus map usr/lib/casper/foo to usr/lib32/foo.

Note that OLD_DIRS entries are not duplicated, only OLD_FILES and
OLD_LIBS.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 43218
Build 40106: arc lint + arc unit

Event Timeline

jhb created this revision.Dec 7 2021, 7:07 PM

Herald added subscribers: jonathan, imp. · View Herald TranscriptDec 7 2021, 7:07 PM

jhb requested review of this revision.Dec 7 2021, 7:07 PM

Harbormaster completed remote builds in B43218: Diff 99669.Dec 7 2021, 7:07 PM

imp accepted this revision.Dec 7 2021, 7:11 PM

This revision is now accepted and ready to land.Dec 7 2021, 7:11 PM

Remaining references to lib32 in *.inc. Most of these are the MK_LIB32 bits:

> grep lib32 ObsoleteFiles.inc tools/build/mk/OptionalObsoleteFiles.inc 
ObsoleteFiles.inc:# 20200601: OpenSSL 32-bit compat engines moved to /usr/lib32/engines
ObsoleteFiles.inc:OLD_LIBS+=usr/lib32/capi.so
ObsoleteFiles.inc:OLD_LIBS+=usr/lib32/padlock.so
ObsoleteFiles.inc:OLD_LIBS+=usr/lib32/lib4758cca.so
ObsoleteFiles.inc:OLD_LIBS+=usr/lib32/libaep.so
ObsoleteFiles.inc:OLD_LIBS+=usr/lib32/libatalla.so
ObsoleteFiles.inc:OLD_LIBS+=usr/lib32/libcapi.so
ObsoleteFiles.inc:OLD_LIBS+=usr/lib32/libchil.so
ObsoleteFiles.inc:OLD_LIBS+=usr/lib32/libcswift.so
ObsoleteFiles.inc:OLD_LIBS+=usr/lib32/libgost.so
ObsoleteFiles.inc:OLD_LIBS+=usr/lib32/libnuron.so
ObsoleteFiles.inc:OLD_LIBS+=usr/lib32/libsureware.so
ObsoleteFiles.inc:OLD_LIBS+=usr/lib32/libubsec.so
ObsoleteFiles.inc:OLD_DIRS+=usr/lib32/private
ObsoleteFiles.inc:OLD_FILES+=usr/lib/debug/usr/lib32/i18n
ObsoleteFiles.inc:OLD_FILES+=usr/lib/debug/usr/lib32/private
tools/build/mk/OptionalObsoleteFiles.inc:OLD_DIRS+=usr/lib32/dtrace
tools/build/mk/OptionalObsoleteFiles.inc:OLD_FILES+=etc/mtree/BSD.lib32.dist
tools/build/mk/OptionalObsoleteFiles.inc:.  if exists(${DESTDIR}/usr/lib32)
tools/build/mk/OptionalObsoleteFiles.inc:LIB32_DIRS!=find ${DESTDIR}/usr/lib32 -type d \
tools/build/mk/OptionalObsoleteFiles.inc:LIB32_FILES!=find ${DESTDIR}/usr/lib32 \! -type d \
tools/build/mk/OptionalObsoleteFiles.inc:LIB32_LIBS!=find ${DESTDIR}/usr/lib32 \! -type d \
tools/build/mk/OptionalObsoleteFiles.inc:.    if exists(${DESTDIR}/usr/lib/debug/usr/lib32)
tools/build/mk/OptionalObsoleteFiles.inc:DEBUG_LIB32_DIRS!=find ${DESTDIR}/usr/lib/debug/usr/lib32 -type d \
tools/build/mk/OptionalObsoleteFiles.inc:DEBUG_LIB32_FILES!=find ${DESTDIR}/usr/lib/debug/usr/lib32 \! -type d \
tools/build/mk/OptionalObsoleteFiles.inc:DEBUG_LIB32_LIBS!=find ${DESTDIR}/usr/lib/debug/usr/lib32 \! -type d \

Makefile.inc1
3221	So this is how I tested this was by starting with the stock version of this and generating before/after output and comparing those. I won't include the list-* targets in the commit, but kind of useful for them to exist in the history perhaps. Alternatively, it might reduce some duplication if the check/delete-old-* targets invoked list-old-* to generate the list of files.

What do you think about implementing check-old-* and delete-old-* by invoking list-old-*? Perhaps we could have only one instance of the :Mlib/*:S,^lib,usr/lib32,,

Makefile
157	Makefile defines existing check-old-{files,libs} as: # check-old-files - List obsolete files. # check-old-libs - List obsolete libraries. We should add new targets to Makefile's comment, and update the description for those two.
ObsoleteFiles.inc
9	Should we add a note in this large comment about the automatically generated entries? (including already-existing handling for /usr/lib/debug)

emaste added inline comments.Dec 7 2021, 7:20 PM

Makefile.inc1
3221	Yes I was looking at this / entering my comments before I saw this new comment. I think leaving them in and invoking them from check-old-* or delete-old-* is fine, or you could have delete-old-* invoke check-old-*

So I've found an annoying edge case. :( When a library moves from /usr/lib to /lib, we add a rule to remove /usr/lib32/libfoo.so.1 even though it is valid with this logic. (libbe.so.1 is an example of this)

I'm not quite sure how to resolve that edge case cleanly.

jhb added a parent revision: D33327: Add list-old-{dirs,files,libs} targets..Dec 7 2021, 11:00 PM

Rebase on change to add list-old-* targets.

This revision now requires review to proceed.Dec 7 2021, 11:30 PM

Harbormaster completed remote builds in B43223: Diff 99677.Dec 7 2021, 11:31 PM

In D33324#753463, @jhb wrote:

I'm not quite sure how to resolve that edge case cleanly.

Ah, this is annoying. The best idea I've got is to introduce a new var (MOVED_LIBS or OLD_MOVED_LIBS, say) and specify libs that moved there, and then avoid the lib32 special case for them.

jhb added a parent revision: D33777: Remove redundant OLD_FILES entries for debug symbols..Jan 6 2022, 11:09 PM

jhb added a parent revision: D33849: Use MOVED_LIBS for the libalias modules being moved to /lib..Jan 11 2022, 7:33 PM

In D33324#753492, @emaste wrote:

In D33324#753463, @jhb wrote:

I'm not quite sure how to resolve that edge case cleanly.

Ah, this is annoying. The best idea I've got is to introduce a new var (MOVED_LIBS or OLD_MOVED_LIBS, say) and specify libs that moved there, and then avoid the lib32 special case for them.

So I've implemented MOVED_LIBS and added it as two earlier commits in this series (stack) and this now seems to work reliably (and finds several stale things on my desktop that aren't currently listed).

Ping.

emaste accepted this revision.Jan 20 2022, 8:52 PM

This revision is now accepted and ready to land.Jan 20 2022, 8:52 PM

jhb closed this revision.Jan 21 2022, 5:57 PM

jhb added a commit: rG77da558ceb09: check/delete-old: Auto-generate lib32 entries for libraries..

jhb added a commit: rG84d246823ece: check/delete-old: Auto-generate lib32 entries for libraries..Jul 29 2022, 7:43 PM