Vendor stratisd in COPR#562
Conversation
WalkthroughRemoved conditional prep logic and cargo-generated buildrequires from the spec and simplified the Changes
Sequence Diagram(s)sequenceDiagram
autonumber
participant Maintainer
participant Spec
rect #f8f9fa
Note over Maintainer,Spec: Update removes conditional prep and always applies autosetup -a1
end
Maintainer->>Spec: invoke %autosetup -n stratisd-stratisd-v%{version} -a1
Spec->>Maintainer: apply patches/unpack with -a1
Note right of Spec: previous conditional vendor-prep and buildrequires generation removed
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Poem
Pre-merge checks and finishing touches✅ Passed checks (3 passed)
✨ Finishing touches🧪 Generate unit tests (beta)
📜 Recent review detailsConfiguration used: CodeRabbit UI Review profile: CHILL Plan: Pro 📒 Files selected for processing (1)
🔇 Additional comments (1)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
WalkthroughThe RPM spec adjusts a conditional to treat COPR builds like RHEL for vendorized cargo prep and moves build-requirements generation to only the non-RHEL, non-COPR path. No exported/public APIs are affected. Changes
Sequence Diagram(s)sequenceDiagram
autonumber
participant B as Builder
participant RPM as RPM Macros
participant Cargo as Cargo Prep
B->>RPM: Evaluate build conditional
alt RHEL or COPR
RPM->>Cargo: %cargo_prep -v vendor
note right of Cargo: Vendorized dependencies
else Other distros
RPM->>RPM: %generate_buildrequires
RPM->>RPM: %cargo_generate_buildrequires ...
note right of RPM: Build reqs generated at build-time
end
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Possibly related PRs
Poem
Pre-merge checks and finishing touches✅ Passed checks (3 passed)
✨ Finishing touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
There was a problem hiding this comment.
Actionable comments posted: 1
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (1)
mockbuild_test/stratisd.spec(1 hunks)
🔇 Additional comments (1)
mockbuild_test/stratisd.spec (1)
94-95: LGTM! Feature flags align with build commands.The feature flags specified in
%cargo_generate_buildrequiresmatch the superset of features used throughout the%buildsection (line 99), ensuring all necessary build dependencies are generated for non-vendor builds.
There was a problem hiding this comment.
Actionable comments posted: 1
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (1)
mockbuild_test/stratisd.spec(1 hunks)
🔇 Additional comments (1)
mockbuild_test/stratisd.spec (1)
90-96: LGTM: Conditional expansion is syntactically correct.The expansion of the conditional to include COPR builds aligns with the PR objective to vendor dependencies in COPR. The logic correctly separates the vendored build path (RHEL and COPR) from the dynamic build-requirements generation path (Fedora).
However, please ensure that COPR builds have access to Source1 (the vendor tarball) and that the extraction issue flagged in line 88 is addressed.
397a74d to
04257dd
Compare
This makes it possible to build with Fedora-unavailable packages. We can't test in Packit w/out this change. Signed-off-by: mulhern <amulhern@redhat.com>
No description provided.