xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-11-12 11:06:22 +00:00
Code Issues Releases Wiki Activity

fix(netboot): keep profile helpers with shared image utilities

Browse Source 
Shared image utilities must not require the Debian source directory.

Keep the profile helper beside imgutils and materialize the Debian copy
when building RPM and DEB packages. Source-only Debian copies must follow
symlinks; installed Debian directories stay self-contained.
This commit is contained in:
Vinícius Ferrão
2026-10-26 18:05:40 -03:00
parent 4d5fc2b1b6
commit 447db00a81
5 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xCAT-server/debian/rules
+3
View File
@@ -44,6 +44,9 @@ binary-arch:
dh_installdocs
# dh_installexamples
dh_install -X".svn"
# Debian scripts must remain self-contained when copied from an installed package.
rm -f $(rootdir)/share/xcat/netboot/debian/xCAT/ProfileUtils.pm
install -m 0644 share/xcat/netboot/imgutils/xCAT/ProfileUtils.pm $(rootdir)/share/xcat/netboot/debian/xCAT/ProfileUtils.pm
chmod 755 $(rootdir)/bin/*
chmod 755 $(rootdir)/sbin/*
chmod 644 $(rootdir)/share/xcat/ca/*
xCAT-server/share/xcat/netboot/debian/xCAT/ProfileUtils.pm
-17
View File
@@ -1,17 +0,0 @@
package xCAT::ProfileUtils;
use strict;
use warnings;
sub find_profile_asset {
my ($base, $profile, $arch, $ext, @versions) = @_;
my @suffixes = ((map { "$_.$arch" } @versions), $arch, @versions, '');
foreach my $suffix (@suffixes) {
my $file = "$base/$profile" . (length($suffix) ? ".$suffix" : '') . ".$ext";
return $file if -r $file;
}
return '';
}
1;
xCAT-server/share/xcat/netboot/debian/xCAT/ProfileUtils.pm
Symlink
+1
View File
@@ -0,0 +1 @@
../../imgutils/xCAT/ProfileUtils.pm
xCAT-server/share/xcat/netboot/imgutils/imgutils.pm
+1 -2
View File
@@ -11,8 +11,7 @@ use File::Copy qw(move);
use File::Find;
use File::Path;
use Cwd qw(realpath);
# Debian's standalone builder carries this helper with its copied scripts.
use lib dirname(__FILE__) . '/../debian';
use lib dirname(__FILE__);
use xCAT::ProfileUtils;
use xCAT::SvrUtils;
xCAT-server/share/xcat/netboot/imgutils/xCAT/ProfileUtils.pm
+17
View File
@@ -0,0 +1,17 @@
package xCAT::ProfileUtils;
use strict;
use warnings;
sub find_profile_asset {
my ($base, $profile, $arch, $ext, @versions) = @_;
my @suffixes = ((map { "$_.$arch" } @versions), $arch, @versions, '');
foreach my $suffix (@suffixes) {
my $file = "$base/$profile" . (length($suffix) ? ".$suffix" : '') . ".$ext";
return $file if -r $file;
}
return '';
}
1;
xCAT-server/xCAT-server.spec
+5
View File
@@ -179,6 +179,11 @@ cp -hpR share/xcat/install/* $RPM_BUILD_ROOT/%{prefix}/share/xcat/install/
cp -hpR share/xcat/netboot/* $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/
%endif
# Debian scripts must remain self-contained when copied from an installed package.
rm -f $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/debian/xCAT/ProfileUtils.pm
cp share/xcat/netboot/imgutils/xCAT/ProfileUtils.pm $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/debian/xCAT/ProfileUtils.pm
chmod 644 $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/debian/xCAT/ProfileUtils.pm $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/imgutils/xCAT/ProfileUtils.pm
%ifos linux
# pwd
cp -d sbin/* $RPM_BUILD_ROOT/%{prefix}/sbin