Merge branch 'DELPHI-544' into 'master'

config-manager works differently on fedora now

See merge request !40

CI/fed41_64_xrd.yml

@@ -265,9 +265,8 @@ container_fed41_64_xrd:
   script:
     - echo "export DELPHI_INSTALL_DIR=/delphi; . /delphi/setup.sh" > delphi.sh; echo "setenv DELPHI_INSTALL_DIR /delphi; source /delphi/setup.csh" > delphi.csh;
     - echo "creating container ..."; echo "FROM $IMAGEFED41" > Dockerfile; echo "RUN mkdir /delphi" >> Dockerfile
-    - echo "RUN dnf config-manager --set-enabled crb" >> Dockerfile
     - echo "RUN rpm --import http://linuxsoft.cern.ch/internal/repos/RPM-GPG-KEY-kojiv2 http://linuxsoft.cern.ch/internal/repos/RPM-GPG-KEY-kojiv2/RPM-GPG-KEY-cern;yum-config-manager -y --add-repo http://linuxsoft.cern.ch/internal/repos/eos9-stable/x86_64/os; dnf -y update; dnf -y install eos-fusex" >> Dockerfile
-    - echo "RUN yum-config-manager -y --set-disabled linuxsoft.cern.ch_internal_repos_eos9-stable_x86_64_os; dnf -y update" >> Dockerfile
+    - echo "RUN yum-config-manager -y setopt linuxsoft.cern.ch_internal_repos_eos9-stable_x86_64_os.enabled=0; dnf -y update" >> Dockerfile
     - echo "ADD d/ /delphi" >> Dockerfile; echo "COPY delphi.sh /etc/profile.d/delphi.sh" >> Dockerfile; echo "COPY delphi.csh /etc/profile.d/delphi.csh" >> Dockerfile
     - echo "RUN groupadd delphi" >> Dockerfile; echo 'RUN useradd -m -g delphi delphi' >> Dockerfile; echo "WORKDIR /home/delphi" >> Dockerfile
     - echo "RUN dnf clean all; dnf -y install sudo libGLEW glew-devel procps-ng mesa-dri-drivers tigervnc tigervnc-server xrootd-client" >> Dockerfile; echo "RUN echo '%delphi ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers" >> Dockerfile

Makefile

@@ -7,7 +7,7 @@ SHELL=/bin/bash
 #
 # for 32bit set the environment variable LEGACY to "-m32"
 #
-CERNVER = 2025.03.07.0-free
+CERNVER = 2025.04.04.0-free
 PRO     = 161018
 OLD     = 100710
 NEW     = 'prerelease'

make_cernlib

@@ -48,12 +48,27 @@ if [ -d build ]; then
 fi
 mkdir build
 cd build
-pwd
-ls -l
-git clone https://:@gitlab.cern.ch:8443/dphep/cernlib/cernlib.git
-cd cernlib
-git checkout tags/cernlib-$version
 
+# try to get it from
+# version is in format 2025.03.07.0-free
+# https://cernlib.web.cern.ch/download/2025_source/tar/cernlib-cernlib-2025.02.25.0-free.tar.gz
+
+# get the year
+year=`echo $version | cut -d\. -f1`
+fname="cernlib-cernlib-${version}"
+url="https://cernlib.web.cern.ch/download/${year}_source/tar/${fname}.zip"
+wget $url >/dev/null 2>&1
+res=$?
+if [ $res -eq 0 ]; then
+    unzip $fname.zip
+    mv $fname cernlib
+    cd cernlib
+else
+    echo "Could not download the sources, so trying to get them from gitlab.cern.ch"
+    git clone https://:@gitlab.cern.ch:8443/dphep/cernlib/cernlib.git
+    cd cernlib
+    git checkout tags/cernlib-$version
+fi
 # select 2022 extensions
 echo '#define CERNLIB_2022 yes' >> config/host.def
 rc=0