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

integrate macros into the SDK #117

Merged
merged 3 commits into from
Jun 21, 2023

Conversation

bcressey
Copy link
Contributor

Issue number:
#108

Description of changes:
Add macros to the SDK under /etc/rpm/macros.bottlerocket.

Changing the SDK in the main repo will trigger a full rebuild of all packages, making it a good time to also drop the target architecture from the package name.

Reworking the GRUB macros will eliminate the need to change them in bottlerocket-os/bottlerocket#3097, which will make shim the first stage bootloader.

Testing done:
Built variants in the main repo with the changes in bottlerocket-os/bottlerocket#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.

The package architecture can be set correctly at build time, so it's
not necessary to include it in the name.

Signed-off-by: Ben Cressey <[email protected]>
This allows us to add a different bootloader - like shim - that also
needs to know the EFI architecture name, without having to update the
macros again.

Signed-off-by: Ben Cressey <[email protected]>
Signed-off-by: Ben Cressey <[email protected]>
Copy link
Contributor

@webern webern left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good time to also drop the target architecture from the package name.

Nice.

@bcressey bcressey merged commit 67b317c into bottlerocket-os:develop Jun 21, 2023
@bcressey bcressey deleted the integrate-macros branch June 21, 2023 17:08
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.

3 participants