2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-10-05 07:49:59 +00:00

fix(xcat-core): xCATsn installs its templates under share/xcat/xCAT

The xCATsn templates archive held xCAT/templates/..., so xCATsn installed the
templates under /opt/xcat/share/xcat/xCAT/templates. The xCAT build wrote the
same archive rooted at templates/ into the shared SOURCES directory, and the
existence check let xCATsn reuse it when xCAT wrote first.

stage_xcatsn_templates now runs tar from xCAT/, so the members start with
templates/, and it always writes the archive. The archive matches the one
the xCAT build writes.

Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>
This commit is contained in:
Daniel Hilst
2026-10-02 14:02:42 -03:00
parent 827cde7a6f
commit 1583473e3d
+3 -4
View File
@@ -481,7 +481,7 @@ sub stage_xcat_probe_sources {
=head3 stage_xcatsn_templates
Descriptions: Write the templates archive that xCATsn.spec extracts into
%{prefix}/share/xcat.
%{prefix}/share/xcat, with members rooted at templates/.
Arguments:
$checkout - the xcat-core source tree
@@ -500,9 +500,8 @@ sub stage_xcatsn_templates {
my $tarball = "$sources_dir/templates.tar.gz";
sh_or_die(qq(tar --sort=name --owner=0 --group=0 --mtime="\@$epoch" )
. qq(-czf "$tarball" -C "$checkout" xCAT/templates),
"Error creating $tarball")
unless -f $tarball;
. qq(-czf "$tarball" -C "$checkout/xCAT" templates),
"Error creating $tarball");
return $tarball;
}