mirror of
https://github.com/xcat2/xcat-dep.git
synced 2026-09-12 12:36:23 +00:00
Daniel Hilst
d0875ee1ff
The previous commit added the arch:all boot tools (syslinux-xcat/grub2-xcat/ elilo-xcat/xnba-undi) to the ppc64el manifest and taught build_one_codename to skip BUILDING them on non-amd64 -- but validate_manifest, which runs per-arch on every non-dry-run invocation and is NOT gated by --skip-createrepo, still demanded them. On the ppc64el build stage (--arch ppc64el, no --skip-build) the builder skipped the four (correct -- their source is x86-only) so they were never staged, then validate_manifest reported them MISSING and aborted the whole ppc build before assembly: every BUILD_PPC=true run would have failed. Fix the drift structurally: extract the skip rule into one pure, tested decider BuildUtils::skip_arch_all_on() behind a shared sbuild-all.pl helper pkg_skip_on_arch(), consulted by BOTH build_one_codename and validate_manifest, so a package the build skips is never demanded by the per-arch validation. The arch:all debs' presence on ppc is still verified later against the published index by verify_assembled_repo. Also make control_binary_arch return the full Architecture value (not just the first token of a multi-arch list) and add a regression test for the shared skip rule. Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>