[TOOLFILES] Check mergebility after merging with latest cmsdist #7110
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| ### RPM cms scram-tools 1.0 | ||
|
|
||
mrodozov marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| %define branch main | ||
| %define tag 33e20671985a2b7774681adcdfce655c0186b650 | ||
| %define github_user cms-sw | ||
| %define github_repo %{n} | ||
|
|
||
| Source: git+https://github.com/%{github_user}/%{github_repo}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz | ||
|
|
||
| %prep | ||
| %setup -n %{n}-%{realversion} | ||
|
|
||
| %build | ||
|
|
||
| %install | ||
| cp -r %{_builddir}/%{n}-%{realversion} %{i}/%{n} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,18 +8,22 @@ Source: none | |
| %define CheckScramTools \ | ||
| uctool=`echo $tool | tr '[a-z-]' '[A-Z_]'` \ | ||
| toolbase=`eval echo \\\\$${uctool}_ROOT` \ | ||
| [ -d ${SCRAM_TOOLS_ROOT}/scram-tools/$tool ] || continue | ||
|
|
||
| %define CopyScramTools \ | ||
| echo ">> Copying tool files from: $tool" \ | ||
| for xml in $(find ${SCRAM_TOOLS_ROOT}/scram-tools/$tool -type f -name "*.xml") ; do \ | ||
| bxml=$(basename $xml | tr '[A-Z]' '[a-z]') \ | ||
| [ -f %i/tools/selected/$bxml ] && continue \ | ||
| [ -f %i/tools/available/$bxml ] && continue \ | ||
| cp $xml %i/tools/selected/${bxml} \ | ||
| T_VERSION=`eval echo \\\\$${uctool}_VERSION` \ | ||
| sed -i -e 's|@TOOL_ROOT@|'"$toolbase"'|g' %i/tools/selected/${bxml} \ | ||
| sed -i -e 's|@TOOL_VERSION@|'"$T_VERSION"'|g' %i/tools/selected/${bxml} \ | ||
| echo " Copied $bxml" \ | ||
| done \ | ||
| tool_script=${SCRAM_TOOLS_ROOT}/scram-tools/$tool/$(echo $tool | tr '[A-Z]' '[a-z]').sh \ | ||
| if [ -f $tool_script ]; then ($tool_script %i/tools/selected); fi | ||
|
||
| %prep | ||
| %build | ||
|
|
||
|
|
@@ -42,6 +46,23 @@ mkdir -p %i/tools/selected %i/tools/available | |
| %define skipreqtools %{nil} | ||
| %endif | ||
|
|
||
| %if "%{?package_vectorization}" != "" | ||
| PKG_VECTORIZATION=`echo %package_vectorization` | ||
| export PKG_VECTORIZATION | ||
| %endif | ||
|
|
||
| COMP_ARCH_SPECIFIC_FLAGS="" | ||
| %ifarch x86_64 | ||
| COMP_ARCH_SPECIFIC_FLAGS=$(for v in %package_vectorization ; do %{cmsdist_directory}/vectorization/cmsdist_packages.py ${v} ; done) | ||
| %endif | ||
| %ifarch aarch64 | ||
| COMP_ARCH_SPECIFIC_FLAGS="-fsigned-char -fsigned-bitfields" | ||
| %endif | ||
| %ifarch ppc64le | ||
| COMP_ARCH_SPECIFIC_FLAGS="-fsigned-char -fsigned-bitfields %ppc64le_build_flags" | ||
| %endif | ||
| export COMP_ARCH_SPECIFIC_FLAGS | ||
|
|
||
| DoneTools=" " | ||
| SkipTools= | ||
| for tool in %requiredtools; do | ||
|
|
@@ -69,23 +90,11 @@ for tool in $SkipTools ; do | |
| %{CopyScramTools} | ||
| done | ||
|
|
||
| for stool in $(echo %skipreqtools | tr '[A-Z]' '[a-z]') ; do | ||
| [ -f %i/tools/selected/${stool}.xml ] || continue | ||
| mv %i/tools/selected/${stool}.xml %i/tools/available | ||
| done | ||
| if [ -e $SCRAMV1_ROOT/bin/chktool ] ; then | ||
| find %i/tools -name '*.xml' -type f | (xargs $SCRAMV1_ROOT/bin/chktool > %i/errors.log 2>&1 || true) | ||
| ToolErrors=`cat %i/errors.log | wc -l | awk '{print $1}'` | ||
|
|
@@ -141,6 +150,10 @@ for pkg in $(echo %{allpkgreqs} | tr ' ' '\n' | grep -v '\-toolfile/' | grep '/ | |
| echo "</tool>" >> %{i}/tools/selected/${pk_name}.xml | ||
| done | ||
| DUP_BIN=$(echo "${ALL_PY_BIN}" | tr ' ' '\n' | sort | uniq -c | sed 's|^\s*||' | grep -v '^1 ' | sed 's|^.* ||') | ||
|
|
||
| echo "echoing the install path" | ||
| echo %i | ||
|
|
||
| set +x | ||
| if [ "${DUP_BIN}" != "" ] ; then | ||
| for p in ${DUP_BIN} ; do | ||
|
|
@@ -150,7 +163,26 @@ if [ "${DUP_BIN}" != "" ] ; then | |
| exit 1 | ||
| fi | ||
| set -x | ||
|
|
||
| #vectorized packages | ||
| %if "%{?vectorized_packages}" != "" | ||
| for vect_package in %vectorized_packages; do | ||
| echo $vect_package | ||
| package_uc=$(echo $vect_package | tr '[a-z-]' '[A-Z_]') | ||
| r="" | ||
| #echo $package_uc | ||
| for v in $(echo %{package_vectorization} | tr '[a-z-]' '[A-Z_]'); do | ||
| r=$r" <environment name=\"${v}_LIBDIR\" default=\"" | ||
| r=$r'\$' | ||
| r=$r${package_uc}_${v}_ROOT/lib"\" type=\"path\"/>\n" | ||
| #echo $v | ||
| done | ||
| r=$r'</client>' | ||
| perl -p -i -e "s|</client>|${r}|g" %i/tools/selected/$(echo $vect_package | tr '[A-Z]' '[a-z]').xml | ||
| done | ||
| %endif | ||
|
|
||
| %post | ||
|
|
||
| %{relocateCmsFiles} $(find $RPM_INSTALL_PREFIX/%{pkgrel}/tools -type f) | ||
| %{relocateCmsFiles} $(find $RPM_INSTALL_PREFIX/%{pkgrel}/lib -type f) | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mrodozov , we need to keep the dependencies but should replace
<tool>-toolfilewith<tool>only.This should also be done for coral and fwlite tool-conf.spec
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this file is containing a short list because so I first finish pkgs with any script logic, the short list if for not deploying all xmls every time (not to build the whole cmssw-tool-conf)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this type of changes are better to test locally as this will help with debugging.