Commit d740871b authored by Chris Burr's avatar Chris Burr
Browse files

Update spec file to use host_os_conda for unstable

parent e5f8d340
Pipeline #1641693 passed with stages
in 1 minute and 33 seconds
......@@ -41,6 +41,13 @@ for flavour in stable testing unstable ; do
tgt=${RPM_BUILD_ROOT}/%{prefix}/LbEnv-${flavour}${suff}
install -m 0644 "data/LbEnv-flavour${suff}" "${tgt}"
sed -i "s/%flavour%/${flavour}/g" "${tgt}"
# TODO: These should all be moved over to host_os_conda eventually
if [ "${flavour}" = "unstable" ]; then
host_os_script_fn=host_os_conda
else
host_os_script_fn=host_os
fi
sed -i "s/%host_os_script_fn%/${host_os_script_fn}/g" "${tgt}"
done
done
for suff in '' .sh .csh ; do
......@@ -73,6 +80,7 @@ done
%{prefix}/etc/cern_profile.d/lbenv_aliases.sh
%{prefix}/etc/cern_profile.d/lbenv_aliases.csh
%{prefix}/bin/host_os
%{prefix}/bin/host_os_conda
%{prefix}/bin/LbLogin.sh
%{prefix}/LbEnv
%{prefix}/LbEnv.sh
......@@ -89,5 +97,7 @@ done
%changelog
* Mon May 18 2020 Chris Burr <christopher.burr@cern.ch>
- Use conda based environment for unstable flavour
* Mon Feb 25 2015 Marco Clemencic <marco.clemencic@cern.ch>
- first version
......@@ -12,7 +12,7 @@
if ( ! $?LBENV_SOURCED ) then
setenv LBENV_ENTRYPOINT %target_dir%/LbEnv-%flavour%.csh
setenv LBENV_FLAVOUR %flavour%
set _host_os=`%target_dir%/bin/host_os`
set _host_os=`%target_dir%/bin/%host_os_script_fn%`
if ( -e %lbenv_root%/$_host_os/bin/activate.csh ) then
if ( $?PYTHONPATH ) then
......
......@@ -12,7 +12,7 @@
if [ -z "$LBENV_SOURCED" ] ; then
export LBENV_ENTRYPOINT=%target_dir%/LbEnv-%flavour%.sh
export LBENV_FLAVOUR=%flavour%
_host_os=$(%target_dir%/bin/host_os)
_host_os=$(%target_dir%/bin/%host_os_script_fn%)
if [ -e ${OVERRIDE_LBENVROOT:-%lbenv_root%/$_host_os}/bin/activate ] ; then
if [ -n "$PYTHONPATH" ] ; then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment