update to SDK v0.27.0 #2428
Merged
update to SDK v0.27.0 #2428
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
bcressey
requested review from
jpculp,
markusboehme,
arnaldo2792 and
foersleo
jpculp
reviewed
Sep 15, 2022
bcressey
force-pushed
the
sdk-shenanigans
branch
from
3a92b5a
to
30e9902
Compare
arnaldo2792
reviewed
Sep 20, 2022
packages/glibc/glibc.spec
Outdated
| Patch0026: 0026-io-Add-fsync-call-in-tst-stat.patch | ||
| Patch0027: 0027-nss-Do-not-mention-NSS-test-modules-in-gnu-lib-names.patch | ||
| Patch0028: 0028-nss-Protect-against-errno-changes-in-function-lookup.patch | ||
| Patch001: 0001-stdlib-Suppress-gcc-diagnostic-that-char8_t-is-a-key.patch |
There was a problem hiding this comment.
There are 39 patches (or at least that's the last number in the patches' names), but only 6 are applied, is there a reason why the remaining patches are included but not applied? Also there are two patches that modify NOTES and NEWS, are they required even if they don't make any functional change?
There was a problem hiding this comment.
Whoops - that's my mistake. There were only six patches when I first added glibc 2.36, then the number grew 😀 I added the patches but forgot to update the spec.
As for the patches modifying NOTES and NEWS - the patch series is more maintainable if it's just "all patches to 2.36 since release" rather than cherry-picking a subset.
bcressey
force-pushed
the
sdk-shenanigans
branch
from
30e9902
to
4ec1c8e
Compare
|
Force push above:
|
Signed-off-by: Ben Cressey <[email protected]>
Fedora 36 automatically sets certain flags during RPM builds: https://fedoraproject.org/wiki/Changes/SetBuildFlagsBuildCheck Since the `set_cross_build_flags` macro will use these flags if they are specified in the environment, this causes the expected flags for cross-compilation to be ignored, leading to build failures. It's necessary to undefine the macro to suppress the new behavior. Unfortunately, that can't be done through the usual macro inheritance approach, because macros cannot be undefined, only reset. Therefore the `rpmbuild` invocation is modified to remove the definition. Signed-off-by: Ben Cressey <[email protected]>
Fedora 36 moved the RPM database to /usr: https://fedoraproject.org/wiki/Changes/RelocateRPMToUsr For Bottlerocket, /usr should be a symlink to the sysroot directory. If the RPM database is stored in /usr, then it will be created prior to installing any Bottlerocket packages, and create a conflict with the intended symlink. Ordinarily this would be changed in the shared macros, but doing that could confuse `rpm` during the package build step, since the SDK's rpm database is still in `/usr` and package builds require a mix of host and target packages to be installed. Instead the definition is overridden just before image creation, when host packages are no longer needed and the target packages have not yet been installed. Signed-off-by: Ben Cressey <[email protected]>
In 237946d, `-fno-semantic-interposition` was added to the default build flags. This allows the compiler to assume that exported symbols will not be interposed and to optimize accordingly, for example by inlining functions. `-Bsymbolic-functions` tells the linker to bind references to global function symbols to the definition inside the shared library, if any, which should be safe given that the compiler has already optimized the code under the assumption that those definitions will be used. Signed-off-by: Ben Cressey <[email protected]>
Signed-off-by: Ben Cressey <[email protected]>
Includes all patches since the initial release. Signed-off-by: Ben Cressey <[email protected]>
The 5.4 kernel was dropped in 42cdb1e, so all new releases will have a 5.10+ kernel. Signed-off-by: Ben Cressey <[email protected]>
The libdep plugin is always built now, so the option to build without plugins was removed. Signed-off-by: Ben Cressey <[email protected]>
Signed-off-by: Ben Cressey <[email protected]>
Signed-off-by: Ben Cressey <[email protected]>
bcressey
force-pushed
the
sdk-shenanigans
branch
from
4ec1c8e
to
e966e67
Compare
|
Force push for a rebase to pull in the lint fix. |
Signed-off-by: Ben Cressey <[email protected]>
bcressey
force-pushed
the
sdk-shenanigans
branch
from
e966e67
to
50459d8
Compare
Signed-off-by: Ben Cressey <[email protected]>
bcressey
force-pushed
the
sdk-shenanigans
branch
from
50459d8
to
71afd63
Compare
|
Force push applies |
Comment on lines
-42
to
-43
| -DBUILD_TFTPD=false | ||
| -DBUILD_TRACEROUTE6=false |
There was a problem hiding this comment.
I was curious why these cause trouble now, since they are/should be defined by iputils and the iputils build didn't change. All those options were already gone in the iputils build referenced here, but it wasn't until Meson 0.60 that passing unkonwn configure options causes build failures rather than warnings (source).
bcressey
force-pushed
the
sdk-shenanigans
branch
from
71afd63
to
1960477
Compare
jpculp
approved these changes
Sep 26, 2022
stmcginnis
approved these changes
Sep 26, 2022
arnaldo2792
approved these changes
Sep 26, 2022
markusboehme
approved these changes
Sep 26, 2022
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.
Issue number:
Fixes #2419
Fixes #2418
Fixes #2175
Description of changes:
Update to the latest SDK, from bottlerocket-os/bottlerocket-sdk#82.
This adds two workarounds for new
rpmbehavior in Fedora 36, and syncs glibc and binutils with the versions found in the SDK. The version of Rust used for CI builds is also updated to match 1.63.0 in the SDK. The newer meson lets us updatedbus-brokerto v32, and requires some minor changes toiputilsto drop unknown options.The only controversial change may be the addition of
-Bsymbolic-functionsto the default linker flags. There's some light background reading here and here. The quick summary is that I don't really expect problems since we've been using-fno-semantic-interpositionon the compiler side since 237946d, so it's hopefully just free performance at runtime from simplifying the dynamic linker's job. 🤞🏻Testing done:
Ran the quick tests for
aws-*using testsys. Everything passed except foraws-k8s-1.20onaarch64, which needs a custom conformance image, andaws-k8s-1.23, which needs a newer eksctl.Verified that
aws-k8s-1.22-nvidiastill works. Ran some basic smoke tests forvmware-devandvmware-k8s-1.22.Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.