Fix fallout from #204 #210
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
samueldr
force-pushed
the
fix/204-fallout
branch
from
2b8c0a9
to
0a78c3e
Compare
This uses the actual output expected by the build, rather than hoping menuconfig gives the same result. For kernels prior to 5.8 it wasn't an issue. Starting with 5.8 the build environment will influence the actual configuration used. We're stripping some information when comparing. The exact TEXT_VERSION string will change according to whether it's a native or cross compilation. Finally, minor version bumps are not relevant here.
This is needed because the build environment differs in the kernel normalization step compared to the build step.
This is a temporary measure. The last changes have proven that we can't just overrideAttrs things willy-nilly like that, and that the whole builder is in need of a revamp. Let's wait for the revamp, and do the minimum work required to fix the normalization for existing builds.
samueldr
force-pushed
the
fix/204-fallout
branch
from
0a78c3e
to
b4ff3a5
Compare
|
This required a bunch of changes because of the way the This tells me the builder is in need of a rewrite sooner than expected, for additional good reasons though. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In #204 the kernel builder was set to be strict.
All configs were re-normalized, and all the (zero) configs that changed were committed.
Note that no builds were done, since no configs changed.
It turns out that since version 5.8 of the kernel, there is a configuration option for which the build environment matters
Using the previous method to normalize would not properly prep the environment for the few "compiler identification" options. The new method does...
... except just as I'm writing those words I realize it might not because it's only been tested with cross builds.
We might need to strip some of the config options when comparing the output in the build.
Something like:
Also probably for those options:
Since otherwise a compiler version bump will change those values too and force a normalize round for mainline-based kernels.
TODO