mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-11-15 21:38:10 +00:00
236aafcc87
Two conflicts, both from xcat-core/#7978 landing on master. build-utils/lib/XCAT/BuildUtils.pm: both branches added a package_skip_reason, #7978 with a general @PACKAGE_SKIPS table and this branch with its own %EL_ONLY_PACKAGES and a second sub. git merges them as separate hunks because they sit apart in the file, and Perl takes the LAST definition, so keeping both silently deletes whichever rule came first. There is now one table and one sub. A rule names either the target prefixes that do NOT build the package, or, with `only`, the pattern of the targets that DO. The second form is what an EL-only package needs: naming the families that are not EL means a family added later tries to build it, which is how openSUSE reached xCAT-selinux and failed xcat-core-build-opensuse #42 on a missing selinux-policy-devel. buildrpms.pl: an empty build plan takes upstream's answer, a clean return rather than this branch's die. That is the decision #7978 exists for -- the dep pipeline asks for xCAT-genesis-base alone and no openSUSE target builds it -- so reinstating the die would fail a build that has nothing to do. selinux_el_only_scope.t is 37 of 37 and opensuse_no_legacy_genesis.t 22 of 22 on the merged tree, and the whole unit suite passes: 301 files, 9801 tests. Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>
Shared FIPS shell policy
Edit fips-policy.sh, then run:
perl build-utils/sync-fips-policy --write
perl build-utils/sync-fips-policy --check
Commit the source and both updated runtime libraries together. The generated
blocks in Genesis usr/lib/xcat/fips.sh and postscripts xcatlib.sh stay tracked
so source-checkout callers and standalone packages need no generation step.
The RPM and Debian builders reject stale blocks before building either package.
Keep caller-specific helpers outside the generated block. The policy source must remain POSIX shell. It must not depend on the other package at runtime.