Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.14.x] cherry-pick: update SDK to 0.33.0 #3225

Merged
merged 6 commits into from
Jun 23, 2023

Conversation

etungsten
Copy link
Contributor

Issue number:
N/A

Description of changes:
See #3213

Testing done:
See #3213

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.

@bcressey
Copy link
Contributor

Also need 67c7bd7 for the 0.33.0 bump.

bcressey added 6 commits June 23, 2023 13:48
Signed-off-by: Ben Cressey <bcressey@amazon.com>
(cherry picked from commit 67c7bd7)
Signed-off-by: Ben Cressey <bcressey@amazon.com>
(cherry picked from commit 6aed1b9)
This causes the RPM package architecture to match the target's rather
than the host's. By default, `dnf` and `rpm` will ignore non-native
RPMs, but both can be forced to use them.

When the package architecture is set correctly, it's not necessary to
include the architecture in the package name, and the macros in the
SDK no longer do so. Fix up various places in the image build process
that assumed the architecture would be present.

Signed-off-by: Ben Cressey <bcressey@amazon.com>
(cherry picked from commit 78013d3)
This was used as a quick way to disable debuginfo generation, but it
creates ambiguity when using the RPM's architecture to indicate what
target the package was built for.

These packages capture the architecture in the sysroot-based paths
used for installed files, so they are not actually arch-agnostic in
the sense that "noarch" implies.

Signed-off-by: Ben Cressey <bcressey@amazon.com>
(cherry picked from commit 827c051)
Signed-off-by: Ben Cressey <bcressey@amazon.com>
(cherry picked from commit 39cd56a)
Signed-off-by: Ben Cressey <bcressey@amazon.com>
(cherry picked from commit 70362d3)
@etungsten
Copy link
Contributor Author

Also need 67c7bd7 for the 0.33.0 bump.

Push above adds the missing commit

@stmcginnis
Copy link
Contributor

Do we need to manually bust the cache to clean things up?

@etungsten etungsten merged commit 2db3031 into bottlerocket-os:1.14.x Jun 23, 2023
@etungsten etungsten deleted the cherrypick-3213 branch June 23, 2023 22:06
@stmcginnis stmcginnis mentioned this pull request Jun 26, 2023
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants