mirror of
https://github.com/xcat2/xcat-dep.git
synced 2026-09-12 12:36:23 +00:00
Daniel Hilst
6a50444d96
PR #65 moved the OpenEmbedded Genesis release out of the per-EL cells: it is now published once into <repo-dep>/common, under its own repository lock, and each per-EL deploy only drops stale OpenEmbedded packages. That rewrites the same deploy path this branch rewrites, so the merge had to reconcile the two. Resolution: - deploy_target keeps this branch's staged, verified, atomically swapped cell, and adopts master's model inside it: the release is no longer installed here, so the stage only calls remove_genesis_packages before it is signed. master's sign/index/write-metadata already run on the stage, and assert_required_deps stays gone -- verify_target_repo, which also asserts pinned versions and every rpm signature, replaced it. - master's lock and publication state (@HELD_LOCKS, the common stage/backup globals, the INT/TERM/HUP handlers) replaces this branch's single $HELD_LOCK, which the merged lock helpers no longer use. - rpmsign takes master's explicit --define %__gpg, and the redundant bare `use FindBin` is dropped: this branch already imports $RealBin from it. - BUILD.md keeps master's note that per-target tarballs exclude xcat-dep/common; the --skip-xcat section stays out, that flag being gone from this branch. master's new consumer tests needed the same two adaptations as the ones merged last time, for the same reasons: test_signed_common_rpm_repository and test_rpm_repository_lock point --repo-root at a scratch tree, which on this branch must carry a packages-manifest.conf section for the synthetic target, and every run's --skip-xcat became --skip-genesis -- this branch removed --skip-xcat (Getopt::Long silently prefix-matched it to --skip-xcat-dep) and --skip-genesis is what makes xcat-core's buildrpms.pl unnecessary. Green as root: 325 tests on xcat-master (rome01, EL10) and 327 on xcat-master-ub, which also runs the APT cases. perlcritic is clean over the gated file list, and build-apt-repo.sh still passes bash -n. Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>