fix: migrate overlay files before running stage or prime (#1617)
Metadata
Current evaluation
Merged cherry-pick of canonical/craft-parts#1617. Resolves changelog conflicts and migrates overlay files before stage or prime execution. Approved by two reviewers and merged following CI validation.
Suggested action: —
No scores available.
Issue body
This is a cherry pick of https://github.com/canonical/craft-parts/pull/1617; the only changes were to fix conflicts in the changelog.
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| qwen/qwen3.6-35b-a3b | — | — | Merged cherry-pick of canonical/craft-parts#1617. Resolves changelog conflicts and migrates overlay files before stage or prime execution. Approved by two reviewers and merged following CI validation. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged to fix overlay file migration before stage or prime execution. Cherry-picked from craft-parts#1617, requiring only changelog conflict resolutions. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #1617 fix: migrate overlay files before running stage or prime | craft-parts | merged | Merged fix that migrates overlay files before stage or prime steps. Resolves a state tracking bug causing priming failures with symlinks. Approved by reviewers and passed all CI checks. | |
| #121 overlay: migrate overlay data to stage and prime (CRAFT-468, CRAFT-82) | craft-parts | merged | Merged after two approvals and CI. Migrates overlay data to stage and prime, translates overlayfs whiteouts and opaque directories to OCI, and cleans shared areas. Collision detection is deferred. | |
| #1123 fix: Prime content from overlay when split into partitions | craft-parts | merged | Merged fix for priming overlay content when split into partitions. Replaces direct overlay reliance with stage directory and migration state. Approved by three reviewers, passed all CI checks, and resolves issue #1127. | |
| #1249 build(deps): fix overlay migration bug through craft-parts | rockcraft | merged | Resolved overlay migration bug by updating craft-parts. Merged after reviewer approval and passing CI checks. Closes #1217. Diff contains 37 additions and 6 deletions across five files. | |
| #1140 Overlay contents don't conflict with regular stage files | craft-parts | closed | Conflicts between overlay and stage files across different parts were not detected, causing undefined behavior. Fixed and merged in pull request #1190 to the canonical/craft-parts repository. | |
| #1190 fix(overlay): detect conflicts between overlay and install | craft-parts | merged | Merged fix enhancing Stage step collision detection to account for overlay contents, preventing conflicts with install directories. Includes integration tests, passed all CI checks, and received approval from three reviewers. | |
| #602 fix: enable overlays in _enable_craft_parts_features() | rockcraft | merged | Merged a fix enabling overlays in _enable_craft_parts_features(). Approved by two reviewers with passing CI checks. A minor testing note was dismissed when the reviewer used the correct environment. The change was successfully integrated. | |
| #1618 fix: handle dependencies when organizing to overlay | craft-parts | merged | Merged following approval and successful CI checks. Resolves dependency ordering during overlay organization by prioritizing BUILD steps over dependency STAGE steps, fixing issue #1611. Code was rebased on main prior to integration. | |
| #299 feat: enable override-overlay | imagecraft | merged | Merged following approval from two reviewers and passing CI checks. Updated craft-parts to ~2.30 to enable override-overlay support and added a corresponding spread test. | |
| #119 overlay: add overlay hash to build and stage states (CRAFT-489) | craft-parts | merged | Merged pull request implementing overlay verification hashes in build and stage states to ensure proper step invalidation. Approved by two reviewers, passed CI checks, and successfully integrated. |