Issue 6151 - Use %bcond macro for conditional builds in the spec file
#6152
Conversation
|
There are some additional cleanups for the build system to make srpm generation easier, they are in separate commits to make the review easier. |
|
Build failed in CI with:
|
vashirov
changed the title
%bcond macro for conditional builds in the spec file
There was a problem hiding this comment.
Besides that, all looks good!
But there was a bit of something strange. I saw an issue with cargo-license error:
https://github.com/389ds/389-ds-base/actions/runs/8799564272/job/24148859806
python3 rpm/bundle-rust-npm.py src/ src/cockpit/389-console/ /__w/389-ds-base/389-ds-base/rpmbuild/SPECS/389-ds-base.spec -f
ERROR:bundle-rust-npm:cargo-license is not installed. Please install it with 'cargo install cargo-license' and try again.
But when I did a rerun, it disappeared (and the run after that). Can it be some weird race condition with containers?
rpm/bundle-rust-npm.py
Outdated
| print(f"Spec file {args.spec_file} is successfully modified! Please:") | ||
| print("1. Open the spec file with your editor of choice") | ||
| print("2. Make sure that 'Provides:' with bundled crates are correct") | ||
| print("3. Follow the instructions for 'License:' field and remove the helper comments") |
There was a problem hiding this comment.
Minor nitpick - we probably don't need this last line when we do a fix-it run.
There was a problem hiding this comment.
Yes, I agree. I have another series of changes coming up, one of them implements this :)
There was a problem hiding this comment.
@droideck, sorry for the delay, I pushed another series of commits, please take a look.
The container image didn't have |
`rpmbuild` supports conditional package builds with the command line switches `--with` and `--without`: https://rpm-software-management.github.io/rpm/manual/conditionalbuilds.html This is useful to rebuild an existing src.rpm file without editing the spec file first. Or build in COPR with macros overrides for some options. For example, automatic rebuilds from dist-git in COPR to produced sanitized builds. We use our custom global variables for different options such as `use_cockpit` or `use_asan`. Instead we should switch to `%bcond` macro. Additional changes: * `rpm/bundle-rust-npm.py`: add `-f` option to automatically do the changes to the `License:` field. * Remove unneeded `389-ds-base-git.sh` * Update `389-ds-base-devel.README` * `rpm.mk`: ** exclude `vendor.tar.gz` from the resulting tarball ** add aliases for rpms and srpms targets ** use bundle-rust-npm.py with -f option for development releases ** add rpmspec target to generate a spec file under `rpm/` directory. * `389-ds-base.spec.in`: ** remove unused/obsoleted lines ** remove `Provides:` for Rust crates, it will be populated by `bundle-rust-npm.py` ** add .asan to the NVR automatically ** use macro for nss Requires: ** move libdb globals behind if/endif Fixes: 389ds#6151 Reviewed by: @droideck (Thanks!)
rpmbuildsupports conditional package builds with the command lineswitches
--withand--without:https://rpm-software-management.github.io/rpm/manual/conditionalbuilds.html
This is useful to rebuild an existing src.rpm file without editing the
spec file first. Or build in COPR with macros overrides for some
options. For example, automatic rebuilds from dist-git in COPR to
produced sanitized builds.
We use our custom global variables for different options such as
use_cockpitoruse_asan. Instead we should switch to%bcondmacro.Fixes: #6151