8000 kernel-6.1: fix kernel-devel requirement by bcressey · Pull Request #163 · bottlerocket-os/bottlerocket-core-kit · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

kernel-6.1: fix kernel-devel requirement #163

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

Merged
merged 1 commit into from
Sep 27, 2024

Conversation

bcressey
Copy link
Contributor

Issue number:
N/A

Description of changes:
Older versions of Twoliter might not define either the positive or negative versions of the erofs image feature, which would result in neither of the kernel-devel subpackages getting installed. Fix this by always installing the squashed version unless the positive form of the erofs image feature is present.

Testing done:
Built aws-ecs-2 with the released version of Twoliter 0.4.6, which does not support the erofs image feature.

Before this change, it failed to build with this error:

  8.666 /host/build/tools/rpm2img: line 255: /tmp/tmp.Z7V67CvhLc/usr/share/bottlerocket/application-inventory.json: No such file or directory

After, the build completed. I confirmed that the "squashed" version was installed:

❯ rg squashed target/x86_64/debug/build/aws-ecs-2*/output
647:#18 7.005 bottlerocket-kernel-6.1-devel-squashed-6.1.109-1.1727405070.ce58ab78.br1.x86_64

Using a local build of Twoliter which does support the erofs image feature, I confirmed that the "unpacked" version was installed after enabling the feature:

❯ rg unpacked target/x86_64/debug/build/aws-dev-*/output
613:#18 6.861 bottlerocket-kernel-6.1-devel-unpacked-6.1.109-1.1727405070.ce58ab78.br1.x86_64

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.

Older versions of Twoliter might not define either the positive or
negative versions of the erofs image feature, which would result in
neither of the kernel-devel subpackages getting installed. Fix this
by always installing the squashed version unless the positive form of
the erofs image feature is present.

Signed-off-by: Ben Cressey <
8000
;bcressey@amazon.com>
@bcressey bcressey requested review from cbgbt and yeazelm September 27, 2024 03:28
Copy link
Contributor
@yeazelm yeazelm left a comment

Choose a reason for hiding this comment

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

Nice!

@bcressey bcressey merged commit 6af3893 into bottlerocket-os:develop Sep 27, 2024
2 checks passed
@bcressey bcressey deleted the fix-no-erofs branch September 27, 2024 04:30
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
0