Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes needed for ubi8 #7566

Merged
merged 5 commits into from
Jan 22, 2022
Merged

Fixes needed for ubi8 #7566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2d4955b
fixed bootstrap driver for non slc archs
smuzaffar Jan 21, 2022
0dfb2fc
updated scram with ifos support
smuzaffar Jan 21, 2022
30c45a5
use new ifos filter
smuzaffar Jan 21, 2022
7848168
Update SCRAMV1.spec
smuzaffar Jan 21, 2022
bbf4c9c
Update pydata.xml
smuzaffar Jan 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions SCRAMV1.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
### RPM lcg SCRAMV1 V3_00_33
### RPM lcg SCRAMV1 V3_00_34
## NOCOMPILER
## NO_VERSION_SUFFIX

%define tag 4ae4e4cde2026f0b88189e8f748a5fd47f0f44fb
%define tag e6fdaba33b1ee6c9a74fc368921a3d7ce8ddda1f
%define branch SCRAMV3
%define github_user cms-sw
Source: git+https://github.com/%{github_user}/SCRAM.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
Expand Down
6 changes: 3 additions & 3 deletions bootstrap-driver.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ platformSeeds+=" libaio"
%endif

case %cmsplatf in
cc*|cs* )
platformSeeds+=" libxcrypt perl-libs perl-IO"
;;
slc*)
platformBuildSeeds+=" perl-Switch"
;;
*)
platformSeeds+=" libxcrypt perl-libs perl-IO"
;;
esac

defaultPkgs="cms+cms-common+1.0 cms+fakesystem+1.0"
Expand Down
4 changes: 2 additions & 2 deletions scram-tools.file/tools/pythia6/pydata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<client>
<environment name="PYDATA_BASE" default="@TOOL_ROOT@"/>
</client>
<architecture name="slc.*|fc.*|cc*|cs*">
<ifos value="linux">
<flags LDFLAGS="$(PYDATA_BASE)/lib/pydata.o"/>
</architecture>
</ifos>
<flags NO_RECURSIVE_EXPORT="1"/>
</tool>