aws-greengrass-component-sdk: remove stale v1.0.1 files from master - #15576
Merged
rpcme merged 1 commit intoApr 27, 2026
Merged
Conversation
These files were superseded by the v1.0.2 upgrade on master-next but remain on master due to divergent history from a prior force-push. Remove them so the master-next to master release merge is clean.
This was referenced Apr 27, 2026
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
1 participant
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.
Problem
The release PR #15575 (master-next → master) fails because
_1.0.1.bbon master still references patches that were removed on master-next during the v1.0.2 upgrade.Git cannot resolve this during merge because the rename chain diverged due to a prior force-push to master (now prevented by branch protection).
Fix
Explicitly delete the stale files from master:
aws-greengrass-component-sdk_1.0.1.bb(superseded by_1.0.2.bbon master-next)0001-Add-timespec-blocklist-and-portable-struct-for-cross.patch(upstreamed in v1.0.2)0002-Fix-timespec-types-for-32-bit-platforms.patch(upstreamed in v1.0.2)Process
This is a one-time cleanup of damage from the prior force-push.