Skip to content

Revert "Merge pull request #328 from rpkelly/sbom-build-dir"#337

Merged
vigh-m merged 2 commits intobottlerocket-os:developfrom
rpkelly:revert-sbom-build-dir
Mar 5, 2026
Merged

Revert "Merge pull request #328 from rpkelly/sbom-build-dir"#337
vigh-m merged 2 commits intobottlerocket-os:developfrom
rpkelly:revert-sbom-build-dir

Conversation

@rpkelly
Copy link
Contributor

@rpkelly rpkelly commented Mar 5, 2026

This commit causes a conflict with the metatdata package generated by twoliter. Since this commit attempts to allow more types of packages to generate SBOMs, the metadata packages now attempts to generate an sbom. Unfortunately, it already has a subpackage called sbom.

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.

vigh-m
vigh-m previously approved these changes Mar 5, 2026
vigh-m added 2 commits March 5, 2026 11:53
This reverts commit 8c48f1b.

Signed-off-by: Vighnesh Maheshwari <vighmah@amazon.com>
…e generation"

This reverts commit d8f7d0d.

Signed-off-by: Vighnesh Maheshwari <vighmah@amazon.com>
@vigh-m vigh-m force-pushed the revert-sbom-build-dir branch from eb65356 to a7b7d14 Compare March 5, 2026 19:54
@vigh-m
Copy link
Contributor

vigh-m commented Mar 5, 2026

⬆️ Updated to revert the commits from #328 instead of the merge commit

@vigh-m vigh-m dismissed their stale review March 5, 2026 20:00

I updated the change and shouldn't approve my own change

@vigh-m vigh-m merged commit c132c11 into bottlerocket-os:develop Mar 5, 2026
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.

5 participants