RDKOSS-954: Auto generated CVE report - #30
Merged
Conversation
Turn the error to waring for the multi arch build
There was a problem hiding this comment.
Pull request overview
This PR adjusts the layer CVE manifest generation flow to no longer hard-fail when a recipe is detected with multiple architectures during image CVE report creation, aligning with the goal of allowing multi-arch builds to complete.
Changes:
- Downgrade the “recipe has multiple arch” condition from
bb.fatal()tobb.warn()inlayer_cve_check_write_rootfs_manifest().
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
158
to
162
| if recipe in recipe_arch_map: | ||
| if recipe_arch_map[recipe] != arch: | ||
| bb.fatal("The recipe (%s) has configured with multiple arch (%s, %s)" %(recipe, recipe_arch_map[recipe], arch)) | ||
| bb.warn("The recipe (%s) has configured with multiple arch (%s, %s)" %(recipe, recipe_arch_map[recipe], arch)) | ||
| else: | ||
| recipe_arch_map[recipe] = arch |
| if recipe in recipe_arch_map: | ||
| if recipe_arch_map[recipe] != arch: | ||
| bb.fatal("The recipe (%s) has configured with multiple arch (%s, %s)" %(recipe, recipe_arch_map[recipe], arch)) | ||
| bb.warn("The recipe (%s) has configured with multiple arch (%s, %s)" %(recipe, recipe_arch_map[recipe], arch)) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Turn the error to waring for the multi arch build