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
Details
Diff Detail
- Repository
- rG FreeBSD src repository
- Lint
Lint Not Applicable - Unit
Tests Not Applicable
Event Timeline
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.
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. :-)