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

os: prepare for forthcoming build system changes #4006

Merged

Conversation

bcressey
Copy link
Contributor

Issue number:

Related: bottlerocket-os/twoliter#207

Description of changes:
Prepare for two changes in the next release of twoliter:

  • set the BUILDSYS_DEPRECATED_FEATURE_VARIANT_SENSITIVITY flag to opt into variant-sensitivity
  • skip including root.json if not available in the build

Testing done:
Built variants with the older and newer versions of twoliter.

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.

For now, the os package still relies on variant sensitivity to ensure
that any programs that depend on the model are built with the correct
data structure. The next version of Twoliter will support this, but
only when the compatibility feature flag is set in the environment.

Older versions of Twoliter made the intended root.json available as
a file to be packaged, while newer versions install it directly in
the final image. Include the file if it exists, otherwise skip it.

Signed-off-by: Ben Cressey <[email protected]>
@bcressey bcressey merged commit 635cea8 into bottlerocket-os:develop May 29, 2024
33 checks passed
@bcressey bcressey deleted the prepare-os-for-build-changes branch May 29, 2024 22:20
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