fix: handle dependencies when organizing to overlay
Metadata
Current evaluation
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.
Suggested action: —
No scores available.
Issue body
Per ST-158, "the OVERLAY and BUILD steps of parts organizing to the
overlay are executed before these steps of other parts." This has
precedence over regular dependencies, meaning that the BUILD step
(and therefore organize) of a part depending on another part should
execute before the STAGE step of the dependency.
Fixes #1611
- [ ] Have you followed the guidelines for contributing?
- [ ] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)?
- [ ] Have you successfully run `make lint && make test`?
- [ ] Have you added an entry to the changelog (`docs/reference/changelog.rst`)?
---
CRAFT-5215
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| qwen/qwen3.6-35b-a3b | — | — | 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. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged a fix for overlay dependency handling, resolving issue #1611. The change enforces ST-158 precedence, ensuring OVERLAY and BUILD steps execute before dependency STAGE steps. Rebased on main prior to merge. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #1261 feat: reorder steps if organizing to overlay | craft-parts | merged | Merged after approval and passing CI checks. The update reorders build steps for overlay-organizing parts, ensuring content organization runs immediately after the overlay step to satisfy ST-158 requirements. | |
| #1225 Reorder lifecycle steps if organizing to overlay | craft-parts | closed | Fixed via merged pull request #1261. Lifecycle step ordering was corrected to ensure the build step executes immediately after the overlay step when organizing to overlay, resolving the package sequencing issue. | |
| #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. | |
| #1541 fix(organize): make organizing to the overlay idempotent | craft-parts | merged | Merged to fix overlay organization idempotency and resolve #1488. Copilot automatically resolved merge conflicts in commit 4282caa6, reverting BUILD_PARTITION while preserving OVERLAY_PARTITION logic. All tests pass. | |
| #1619 fix: migrate overlay files before running stage or prime (#1617) | craft-parts | merged | 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. | |
| #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. | |
| #406 steps: handle overlay feature in step lists | craft-parts | merged | Merged after reviewer approval and passing CI. The change updates step list logic to exclude the overlay step when the feature is disabled, modifying 10 files with 184 additions and 13 deletions. | |
| #1586 fix(organize): allow merging directories in overlay with metadata differences | craft-parts | merged | Merged. Resolves #1487 by permitting overlay directories with differing permissions or ownership to merge without raising FileOrganizeError. Review feedback was incorporated via automated commits, CI passed, and the change was successfully merged. |