Page MenuHomeFreeBSD

depend-cleanup: apply big hammer for OpenSSL 3.0 update
ClosedPublic

Authored by emaste on Jun 24 2023, 6:13 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Oct 29, 4:45 AM
Unknown Object (File)
Sat, Oct 19, 9:44 AM
Unknown Object (File)
Sat, Oct 19, 8:48 AM
Unknown Object (File)
Sat, Oct 19, 8:48 AM
Unknown Object (File)
Oct 8 2024, 5:55 AM
Unknown Object (File)
Oct 5 2024, 4:55 AM
Unknown Object (File)
Oct 5 2024, 4:24 AM
Unknown Object (File)
Oct 4 2024, 8:47 PM
Subscribers

Details

Summary
If we find an object corresponding to a source file that existed in
OpenSSL 1.1.1 but not in 3.0 just remove all of the OpenSSL objdirs.

Sponsored by:   The FreeBSD Foundation

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

emaste created this revision.

Removing the directories in question worked for me, for a source upgrade from main-n263767-764464af4968 -> main-n263782-59833b089e78 on one of the three machines I tried this morning, so that seems fine to me.

However, on the two other machines (that have not successfully completed their upgrades), I find /usr/src/crypto/openssl/crypto/aria/aria.c, but I do not find .depend.aria.o (or, indeed, any file whose name starts with ".depend.aria") anywhere in $OBJTOP. (I am using META mode on all machines, in case that matters.)
So perhaps I am confused, but that seems like a problem.

In D40750#927121, @dhw wrote:

I do not find .depend.aria.o (or, indeed, any file whose name starts with ".depend.aria") anywhere in $OBJTOP. (I am using META mode on all machines, in case that matters.)

Mmm, this could be a general issue trying to use this approach with metamode -- but this script is already using this technique, e.g. for OpenZFS at line 47. I guess we could just use the existence of "$OBJTOP"/secure/lib/libcrypto/aria.o as the indicator that cleanup is needed.

Let me also see if @sjg has any suggestions.

I do find "$OBJTOP"/secure/lib/libcrypto/aria.o, so that seems "better" from my perspective. Yeah, @sjg is a good one to ask about these things. :-)

emaste edited the summary of this revision. (Show Details)

Simplify cleanup logic

That should work in my case, at least. Thanks!

This revision is now accepted and ready to land.Jun 24 2023, 8:00 PM

I have no better suggestion (though I may have missed earlier iteration)