diff --git a/CI/al9_64.yml b/CI/al9_64.yml
index b1748e370777ed56e1c9b2181161cf5d9e50c048..127404ad1f505fdb9f91939419a5675332bc7df8 100644
--- a/CI/al9_64.yml
+++ b/CI/al9_64.yml
@@ -48,7 +48,7 @@ dstana_al9_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- . /etc/kinit.sh ; klist
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make dstana
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make dstana
artifacts:
paths:
- d
@@ -67,7 +67,7 @@ ddb_al9_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- . /etc/kinit.sh ; klist
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make ddb
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make ddb
artifacts:
paths:
- d
@@ -90,7 +90,7 @@ lep1simana_al9_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- . /etc/kinit.sh ; klist
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make v95d v94c v93d v92e v91f v90e
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make v95d v94c v93d v92e v91f v90e
artifacts:
paths:
- d
@@ -113,7 +113,7 @@ lep2simana_al9_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- . /etc/kinit.sh ; klist
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make va0u va0e v99e v98e v97g v96g
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make va0u va0e v99e v98e v97g v96g
artifacts:
paths:
- d
@@ -135,7 +135,7 @@ delgra_al9_64:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- . /etc/kinit.sh ; klist
- dnf -y install libGLEW glew-devel
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make openphigs delgra
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make openphigs delgra
artifacts:
paths:
- d
@@ -160,7 +160,7 @@ des_al9_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- . /etc/kinit.sh ; klist
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make des
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make des
artifacts:
paths:
- d
@@ -182,7 +182,7 @@ idea_al9_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make idea
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make idea
allow_failure: true
artifacts:
paths:
@@ -219,7 +219,7 @@ tests_al9_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_DATA_DIR=${path}/test-samples; export DELPHI_INSTALL_DIR=${path}/d; make test
+ - path=`pwd`; export DELPHI_DATA_DIR=${path}/test-samples; export DELPHI_INSTALL_DIR=${path}/d; export CERNLIB_XROOTD=ON; make test
# only needed for image creation !
artifacts:
name: delphi
@@ -277,10 +277,12 @@ container_al9_64:
- 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 $IMAGEAL9" > Dockerfile; echo "RUN mkdir /delphi" >> 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 http://linuxsoft.cern.ch/internal/repos/eos9-stable/x86_64/os; 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 -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
+ - 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
- echo "RUN cd /home/delphi; git clone https://gitlab.cern.ch/delphi/examples.git; mkdir graexe graexe/data graexe/run graexe/hcopy; chown -R delphi.delphi examples graexe; " >> Dockerfile
+ - echo "RUN chmod 400 /etc/shadow" >> Dockerfile
- echo "RUN echo export PS1=\'[\\\u \\\W]\$ \' >> /home/delphi/.bashrc" >> Dockerfile
- /kaniko/executor
--context "${CI_PROJECT_DIR}"
diff --git a/CI/al9_aarch64.yml b/CI/al9_aarch64.yml
index 8338419cf2d82417be1588b1eadf46264687c1f3..606fe63b98bc0c9ffd670e33ae3662be430a9572 100644
--- a/CI/al9_aarch64.yml
+++ b/CI/al9_aarch64.yml
@@ -11,7 +11,7 @@ cernlib_al9_aarch64:
when: manual
before_script:
- umask 022
- - dnf -y install openssl-devel cmake xrootd-client-libs xrootd-client-devel
+ - dnf -y install file openssl-devel cmake xrootd-client-libs xrootd-client-devel
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- . /etc/kinit.sh ; klist
@@ -31,11 +31,11 @@ dstana_al9_aarch64:
- cernlib_al9_aarch64
before_script:
- umask 022
- - dnf -y install xrootd-client-libs xrootd-client-devel
+ - dnf -y install file xrootd-client-libs xrootd-client-devel
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- . /etc/kinit.sh ; klist
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make dstana
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make dstana
artifacts:
paths:
- d
@@ -52,11 +52,11 @@ ddb_al9_aarch64:
- cernlib_al9_aarch64
before_script:
- umask 022
- - dnf -y install xrootd-client-libs xrootd-client-devel
+ - dnf -y install file xrootd-client-libs xrootd-client-devel
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- . /etc/kinit.sh ; klist
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make ddb
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make ddb
artifacts:
paths:
- d
@@ -77,11 +77,11 @@ lep1simana_al9_aarch64:
- ddb_al9_aarch64
before_script:
- umask 022
- - dnf -y install xrootd-client-libs xrootd-client-devel
+ - dnf -y install file xrootd-client-libs xrootd-client-devel
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- . /etc/kinit.sh ; klist
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make v95d v94c v93d v92e v91f v90e
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make v95d v94c v93d v92e v91f v90e
artifacts:
paths:
- d
@@ -102,11 +102,11 @@ lep2simana_al9_aarch64:
- ddb_al9_aarch64
before_script:
- umask 022
- - dnf -y install xrootd-client-libs xrootd-client-devel
+ - dnf -y install file xrootd-client-libs xrootd-client-devel
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- . /etc/kinit.sh ; klist
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make va0u va0e v99e v98e v97g v96g
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make va0u va0e v99e v98e v97g v96g
artifacts:
paths:
- d
@@ -125,12 +125,12 @@ delgra_al9_aarch64:
- dstana_al9_aarch64
before_script:
- umask 022
- - dnf -y install xrootd-client-libs xrootd-client-devel
+ - dnf -y install file xrootd-client-libs xrootd-client-devel
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- . /etc/kinit.sh ; klist
- dnf -y install libGLEW glew-devel
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make openphigs delgra
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make openphigs delgra
artifacts:
paths:
- d
@@ -153,11 +153,11 @@ des_al9_aarch64:
- lep2simana_al9_aarch64
before_script:
- umask 022
- - dnf -y install xrootd-client-libs xrootd-client-devel
+ - dnf -y install file xrootd-client-libs xrootd-client-devel
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- . /etc/kinit.sh ; klist
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make des
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make des
artifacts:
paths:
- d
@@ -171,7 +171,7 @@ idea_al9_aarch64:
before_script:
- umask 022
- dnf -y install gcc-c++
- - dnf -y install xrootd-client-libs xrootd-client-devel
+ - dnf -y install file xrootd-client-libs xrootd-client-devel
needs:
- cernlib_al9_aarch64
- dstana_al9_aarch64
@@ -181,7 +181,7 @@ idea_al9_aarch64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make idea
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make idea
allow_failure: true
artifacts:
paths:
@@ -196,7 +196,7 @@ tests_al9_aarch64:
before_script:
- umask 022
- dnf -y install gcc-c++ file libGLEW glew-devel gfortran tcsh
- - dnf -y install xrootd-client-libs xrootd-client-devel
+ - dnf -y install file xrootd-client-libs xrootd-client-devel
needs:
- cernlib_al9_aarch64
- dstana_al9_aarch64
@@ -218,7 +218,7 @@ tests_al9_aarch64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_DATA_DIR=${path}/test-samples; export DELPHI_INSTALL_DIR=${path}/d; make test
+ - path=`pwd`; export DELPHI_DATA_DIR=${path}/test-samples; export DELPHI_INSTALL_DIR=${path}/d; export CERNLIB_XROOTD=ON; make test
# only needed for image creation !
artifacts:
name: delphi
@@ -279,9 +279,11 @@ container_al9_aarch64:
- 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 $IMAGEAL9ARM" > Dockerfile; echo "RUN mkdir /delphi" >> 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/aarch64/os; dnf -y update; dnf -y install eos-fusex" >> Dockerfile
+ - echo "RUN yum-config-manager -y --set-disabled http://linuxsoft.cern.ch/internal/repos/eos9-stable/aarch64/os; 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 -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
+ - 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
+ - echo "RUN chmod 400 /etc/shadow" >> Dockerfile
- echo "RUN cd /home/delphi; git clone https://gitlab.cern.ch/delphi/examples.git; mkdir graexe graexe/data graexe/run graexe/hcopy; chown -R delphi.delphi examples graexe; " >> Dockerfile
- echo "RUN echo export PS1=\'[\\\u \\\W]\$ \' >> /home/delphi/.bashrc" >> Dockerfile
- /kaniko/executor
diff --git a/CI/debian12_64.yml b/CI/debian12_64.yml
index a584ae944ef63715a1449c57dae400c7f7b1b629..6aff8f36be5f660948f14449d7ac7741180e89d3 100644
--- a/CI/debian12_64.yml
+++ b/CI/debian12_64.yml
@@ -12,6 +12,7 @@ cernlib_debian12_64:
- export DEBIAN_FRONTEND=noninteractive
- export TZ=Etc/UTC
- apt-get update > /dev/null
+ - apt-get -y upgrade
- DEBIAN_FRONTEND=noninteractive apt-get install -y -qq krb5-user
- apt-get install -y -qq cmake g++ apt-utils > /dev/null
- apt-get install -y -qq gfortran doxygen wget graphviz libz-dev >/dev/null
@@ -35,7 +36,10 @@ dstana_debian12_64:
- cernlib_debian12_64
before_script:
- umask 022
- - apt-get update > /dev/null
+ - export DEBIAN_FRONTEND=noninteractive
+ - export TZ=Etc/UTC
+ - apt-get update
+ - apt-get -y upgrade
- DEBIAN_FRONTEND=noninteractive apt-get install -y -qq krb5-user
- apt-get install -y -qq gfortran >/dev/null
- apt-get install -y -qq libxbae-dev liblapack-dev
@@ -47,7 +51,7 @@ dstana_debian12_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make dstana
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make dstana
artifacts:
paths:
- d
@@ -60,6 +64,10 @@ ddb_debian12_64:
- cernlib_debian12_64
before_script:
- umask 022
+ - export DEBIAN_FRONTEND=noninteractive
+ - export TZ=Etc/UTC
+ - apt-get update
+ - apt-get -y upgrade
- apt-get update > /dev/null
- DEBIAN_FRONTEND=noninteractive apt-get install -y -qq krb5-user
- apt-get install -y -qq gfortran >/dev/null
@@ -72,7 +80,7 @@ ddb_debian12_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make ddb
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make ddb
artifacts:
paths:
- d
@@ -87,7 +95,10 @@ lep1simana_debian12_64:
- ddb_debian12_64
before_script:
- umask 022
- - apt-get update > /dev/null
+ - export DEBIAN_FRONTEND=noninteractive
+ - export TZ=Etc/UTC
+ - apt-get update
+ - apt-get -y upgrade
- DEBIAN_FRONTEND=noninteractive apt-get install -y -qq krb5-user
- apt-get install -y -qq gfortran >/dev/null
- apt-get install -y -qq libxbae-dev liblapack-dev
@@ -101,7 +112,7 @@ lep1simana_debian12_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make v95d v94c v93d v92e v91f v90e
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make v95d v94c v93d v92e v91f v90e
artifacts:
paths:
- d
@@ -116,7 +127,10 @@ lep2simana_debian12_64:
- ddb_debian12_64
before_script:
- umask 022
- - apt-get update > /dev/null
+ - export DEBIAN_FRONTEND=noninteractive
+ - export TZ=Etc/UTC
+ - apt-get update
+ - apt-get -y upgrade
- DEBIAN_FRONTEND=noninteractive apt-get install -y -qq krb5-user
- apt-get install -y -qq gfortran >/dev/null
- apt-get install -y -qq libxbae-dev liblapack-dev
@@ -130,7 +144,7 @@ lep2simana_debian12_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make va0u va0e v99e v98e v97g v96g
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make va0u va0e v99e v98e v97g v96g
artifacts:
paths:
- d
@@ -144,7 +158,10 @@ delgra_debian12_64:
- dstana_debian12_64
before_script:
- umask 022
- - apt-get update > /dev/null
+ - export DEBIAN_FRONTEND=noninteractive
+ - export TZ=Etc/UTC
+ - apt-get update
+ - apt-get -y upgrade
- DEBIAN_FRONTEND=noninteractive apt-get install -y -qq krb5-user
- apt-get install -y -qq cmake g++ apt-utils > /dev/null
- apt-get install -y -qq gfortran >/dev/null
@@ -158,7 +175,7 @@ delgra_debian12_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make openphigs delgra
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make openphigs delgra
artifacts:
paths:
- d
@@ -174,7 +191,10 @@ des_debian12_64:
- lep2simana_debian12_64
before_script:
- umask 022
- - apt-get update > /dev/null
+ - export DEBIAN_FRONTEND=noninteractive
+ - export TZ=Etc/UTC
+ - apt-get update
+ - apt-get -y upgrade
- DEBIAN_FRONTEND=noninteractive apt-get install -y -qq krb5-user
- apt-get install -y -qq gfortran >/dev/null
- apt-get install -y -qq libxbae-dev liblapack-dev
@@ -189,7 +209,7 @@ des_debian12_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make des
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make des
artifacts:
paths:
- d
@@ -203,7 +223,10 @@ idea_debian12_64:
- dstana_debian12_64
before_script:
- umask 022
- - apt-get update > /dev/null
+ - export DEBIAN_FRONTEND=noninteractive
+ - export TZ=Etc/UTC
+ - apt-get update
+ - apt-get -y upgrade
- DEBIAN_FRONTEND=noninteractive apt-get install -y -qq krb5-user
- apt-get install -y -qq gfortran g++ >/dev/null
- apt-get install -y -qq libxbae-dev liblapack-dev
@@ -216,7 +239,7 @@ idea_debian12_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make idea
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make idea
allow_failure: true
artifacts:
paths:
@@ -228,7 +251,10 @@ tests_debian12_64:
stage: tests
before_script:
- umask 022
- - apt-get update > /dev/null
+ - export DEBIAN_FRONTEND=noninteractive
+ - export TZ=Etc/UTC
+ - apt-get update
+ - apt-get -y upgrade
- DEBIAN_FRONTEND=noninteractive apt-get install -y -qq krb5-user
- apt-get install -y -qq cmake g++ apt-utils > /dev/null
- apt-get install -y -qq gfortran >/dev/null
@@ -257,7 +283,7 @@ tests_debian12_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_DATA_DIR=${path}/test-samples; export DELPHI_INSTALL_DIR=${path}/d; make test
+ - path=`pwd`; export DELPHI_DATA_DIR=${path}/test-samples; export DELPHI_INSTALL_DIR=${path}/d; export CERNLIB_XROOTD=ON; make test
# only needed for image creation !
artifacts:
name: delphi
@@ -305,7 +331,7 @@ container_debian12_64:
stage: container
when: manual
needs:
- - tests_debian12_64
+ - tests_debian12_64
dependencies:
- tests_debian12_64
before_script:
@@ -313,10 +339,11 @@ container_debian12_64:
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 $IMAGEDEBIAN12" > Dockerfile; echo "RUN mkdir /delphi" >> Dockerfile
- - echo "RUN apt -y install libmotif-common r-base-dev tcsh xfonts-100dpi xfonts-75dpi libxfont2 cmake g++ apt-utils gfortran libglu1-mesa libmotif-common xutils-dev libxbae-dev libxaw7-dev libglew-dev libdlm-dev tigervnc-standalone-server xauth sudo xrootd-client" >> Dockerfile
+ - echo "RUN apt clean all; apt -y install libmotif-common r-base-dev tcsh xfonts-100dpi xfonts-75dpi libxfont2 cmake g++ apt-utils gfortran libglu1-mesa libmotif-common xutils-dev libxbae-dev libxaw7-dev libglew-dev libdlm-dev tigervnc-standalone-server xauth sudo xrootd-client" >> 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 "RUN echo '%delphi ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers" >> Dockerfile
+ - echo "RUN chmod 400 /etc/shadow" >> Dockerfile
- /kaniko/executor
--context "${CI_PROJECT_DIR}"
--dockerfile "${CI_PROJECT_DIR}/Dockerfile"
diff --git a/CI/ubuntu22_64.yml b/CI/ubuntu22_64.yml
index bb8b7805e5b20377c979dc367ed19ecdb49a7172..513c59605a2fc5930a4fd4ff5ab872c2f36c14da 100644
--- a/CI/ubuntu22_64.yml
+++ b/CI/ubuntu22_64.yml
@@ -47,7 +47,7 @@ dstana_ubuntu22_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make dstana
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make dstana
artifacts:
paths:
- d
@@ -72,7 +72,7 @@ ddb_ubuntu22_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make ddb
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make ddb
artifacts:
paths:
- d
@@ -101,7 +101,7 @@ lep1simana_ubuntu22_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make v95d v94c v93d v92e v91f v90e
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make v95d v94c v93d v92e v91f v90e
artifacts:
paths:
- d
@@ -130,7 +130,7 @@ lep2simana_ubuntu22_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make va0u va0e v99e v98e v97g v96g
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make va0u va0e v99e v98e v97g v96g
artifacts:
paths:
- d
@@ -158,7 +158,7 @@ delgra_ubuntu22_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make openphigs delgra
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make openphigs delgra
artifacts:
paths:
- d
@@ -189,7 +189,7 @@ des_ubuntu22_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make des
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make des
artifacts:
paths:
- d
@@ -216,7 +216,7 @@ idea_ubuntu22_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make idea
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make idea
allow_failure: true
artifacts:
paths:
@@ -250,7 +250,7 @@ tests_ubuntu22_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_DATA_DIR=${path}/test-samples; export DELPHI_INSTALL_DIR=${path}/d; make test
+ - path=`pwd`; export DELPHI_DATA_DIR=${path}/test-samples; export CERNLIB_XROOTD=ON; export DELPHI_INSTALL_DIR=${path}/d; make test
binaries_ubuntu22_64:
image: $IMAGEUBUNTU22
diff --git a/CI/ubuntu24_64.yml b/CI/ubuntu24_64.yml
index c5fb9dd30e51d572d13a3feda8dca00b1ee9bceb..1dc2961f08bbb2d1e2e4f7baf548dfc90e5625c8 100644
--- a/CI/ubuntu24_64.yml
+++ b/CI/ubuntu24_64.yml
@@ -11,7 +11,8 @@ cernlib_ubuntu24_64:
- umask 022
- export DEBIAN_FRONTEND=noninteractive
- export TZ=Etc/UTC
- - apt-get update > /dev/null
+ - apt-get update
+ - apt-get -y upgrade
- DEBIAN_FRONTEND=noninteractive apt-get install -y -qq krb5-user
- apt-get install -y -qq cmake g++ apt-utils > /dev/null
- apt-get install -y -qq gfortran doxygen wget graphviz libz-dev >/dev/null
@@ -35,7 +36,10 @@ dstana_ubuntu24_64:
- cernlib_ubuntu24_64
before_script:
- umask 022
- - apt-get update > /dev/null
+ - export DEBIAN_FRONTEND=noninteractive
+ - export TZ=Etc/UTC
+ - apt-get update
+ - apt-get -y upgrade
- DEBIAN_FRONTEND=noninteractive apt-get install -y -qq krb5-user
- apt-get install -y -qq gfortran >/dev/null
- apt-get install -y -qq libxbae-dev liblapack-dev
@@ -47,7 +51,7 @@ dstana_ubuntu24_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make dstana
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make dstana
artifacts:
paths:
- d
@@ -60,7 +64,10 @@ ddb_ubuntu24_64:
- cernlib_ubuntu24_64
before_script:
- umask 022
- - apt-get update > /dev/null
+ - export DEBIAN_FRONTEND=noninteractive
+ - export TZ=Etc/UTC
+ - apt-get update
+ - apt-get -y upgrade
- DEBIAN_FRONTEND=noninteractive apt-get install -y -qq krb5-user
- apt-get install -y -qq gfortran >/dev/null
- apt-get install -y -qq libxbae-dev liblapack-dev
@@ -72,7 +79,7 @@ ddb_ubuntu24_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make ddb
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make ddb
artifacts:
paths:
- d
@@ -87,7 +94,10 @@ lep1simana_ubuntu24_64:
- ddb_ubuntu24_64
before_script:
- umask 022
- - apt-get update > /dev/null
+ - export DEBIAN_FRONTEND=noninteractive
+ - export TZ=Etc/UTC
+ - apt-get update
+ - apt-get -y upgrade
- DEBIAN_FRONTEND=noninteractive apt-get install -y -qq krb5-user
- apt-get install -y -qq gfortran >/dev/null
- apt-get install -y -qq libxbae-dev liblapack-dev
@@ -101,7 +111,7 @@ lep1simana_ubuntu24_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make v95d v94c v93d v92e v91f v90e
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make v95d v94c v93d v92e v91f v90e
artifacts:
paths:
- d
@@ -116,7 +126,10 @@ lep2simana_ubuntu24_64:
- ddb_ubuntu24_64
before_script:
- umask 022
- - apt-get update > /dev/null
+ - export DEBIAN_FRONTEND=noninteractive
+ - export TZ=Etc/UTC
+ - apt-get update
+ - apt-get -y upgrade
- DEBIAN_FRONTEND=noninteractive apt-get install -y -qq krb5-user
- apt-get install -y -qq gfortran >/dev/null
- apt-get install -y -qq libxbae-dev liblapack-dev
@@ -130,7 +143,7 @@ lep2simana_ubuntu24_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make va0u va0e v99e v98e v97g v96g
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make va0u va0e v99e v98e v97g v96g
artifacts:
paths:
- d
@@ -144,7 +157,10 @@ delgra_ubuntu24_64:
- dstana_ubuntu24_64
before_script:
- umask 022
- - apt-get update > /dev/null
+ - export DEBIAN_FRONTEND=noninteractive
+ - export TZ=Etc/UTC
+ - apt-get update
+ - apt-get -y upgrade
- DEBIAN_FRONTEND=noninteractive apt-get install -y -qq krb5-user
- apt-get install -y -qq cmake g++ apt-utils > /dev/null
- apt-get install -y -qq gfortran >/dev/null
@@ -158,7 +174,7 @@ delgra_ubuntu24_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make openphigs delgra
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make openphigs delgra
artifacts:
paths:
- d
@@ -174,7 +190,10 @@ des_ubuntu24_64:
- lep2simana_ubuntu24_64
before_script:
- umask 022
- - apt-get update > /dev/null
+ - export DEBIAN_FRONTEND=noninteractive
+ - export TZ=Etc/UTC
+ - apt-get update
+ - apt-get -y upgrade
- DEBIAN_FRONTEND=noninteractive apt-get install -y -qq krb5-user
- apt-get install -y -qq gfortran >/dev/null
- apt-get install -y -qq libxbae-dev liblapack-dev
@@ -189,7 +208,7 @@ des_ubuntu24_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make des
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make des
artifacts:
paths:
- d
@@ -203,7 +222,10 @@ idea_ubuntu24_64:
- dstana_ubuntu24_64
before_script:
- umask 022
- - apt-get update > /dev/null
+ - export DEBIAN_FRONTEND=noninteractive
+ - export TZ=Etc/UTC
+ - apt-get update
+ - apt-get -y upgrade
- DEBIAN_FRONTEND=noninteractive apt-get install -y -qq krb5-user
- apt-get install -y -qq gfortran g++ >/dev/null
- apt-get install -y -qq libxbae-dev liblapack-dev
@@ -216,7 +238,7 @@ idea_ubuntu24_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; make idea
+ - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make idea
allow_failure: true
artifacts:
paths:
@@ -250,7 +272,7 @@ tests_ubuntu24_64:
script:
- echo "[http]" > ~/.gitconfig; echo " emptyAuth = true" >> ~/.gitconfig; echo >> ~/.gitconfig
- echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
- - path=`pwd`; export DELPHI_DATA_DIR=${path}/test-samples; export DELPHI_INSTALL_DIR=${path}/d; make test
+ - path=`pwd`; export DELPHI_DATA_DIR=${path}/test-samples; export DELPHI_INSTALL_DIR=${path}/d; export CERNLIB_XROOTD=ON; make test
# only needed for image creation !
artifacts:
name: delphi
@@ -306,10 +328,11 @@ container_ubuntu24_64:
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 $IMAGEUBUNTU24" > Dockerfile; echo "RUN mkdir /delphi" >> Dockerfile
- - echo "RUN apt -y install libmotif-common r-base-dev tcsh xfonts-100dpi xfonts-75dpi libxfont2 cmake g++ apt-utils gfortran libglu1-mesa libmotif-common xutils-dev libxbae-dev libxaw7-dev libglew-dev libdlm-dev tigervnc-standalone-server xauth sudo xrootd-client" >> Dockerfile
+ - echo "RUN apt clean all; apt -y install libmotif-common r-base-dev tcsh xfonts-100dpi xfonts-75dpi libxfont2 cmake g++ apt-utils gfortran libglu1-mesa libmotif-common xutils-dev libxbae-dev libxaw7-dev libglew-dev libdlm-dev tigervnc-standalone-server xauth sudo xrootd-client" >> 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 "RUN echo '%delphi ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers" >> Dockerfile
+ - echo "RUN chmod 400 /etc/shadow" >> Dockerfile
- /kaniko/executor
--context "${CI_PROJECT_DIR}"
--dockerfile "${CI_PROJECT_DIR}/Dockerfile"
diff --git a/Makefile b/Makefile
index 1139ebe0224f32e8923c1d8222b7e980963886d9..9656e499eba32d0f641d2dee01dff0b1b3f69ba8 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ SHELL=/bin/bash
#
# for 32bit set the environment variable LEGACY to "-m32"
#
-CERNVER = 2025.02.14.0-free
+CERNVER = 2025.02.25.0-free
PRO = 161018
OLD = 100710
NEW = 'prerelease'
@@ -15,7 +15,7 @@ FFLAGS = "-g $(LEGACY)"
CFLAGS = "-g $(LEGACY)"
LDFLAGS = "-g $(LEGACY)"
ADDCOMP = "-g $(LEGACY)"
-XROOTD = "$(CERNLIB_XROOTD)"
+XROOTD := $(shell [[ -n "$(CERNLIB_XROOTD)" ]] && echo "$(CERNLIB_XROOTD)" || echo "OFF")
PLINAM = `uname -s`
DATETAG = `date +%Y%m%d`
DELPHI_SWCD = /tmp/swcd
@@ -53,7 +53,7 @@ logs:
cernlib_im: profiles setup logs
echo "starting cernlib with imake"
- . delphi.sh; ./make_cernlib $(CERNVER) 0 $(XROOTD) $(LEGACY) > logs/make_cernlib-imake.log 2>&1 || ( cat logs/make_cernlib-cmake.log; ${FALSE} )
+ . delphi.sh; ./make_cernlib $(CERNVER) 0 $(XROOTD) $(LEGACY) > logs/make_cernlib-imake.log 2>&1 || ( cat logs/make_cernlib-imake.log; ${FALSE} )
cernlib_cm: profiles setup logs
echo "starting cernlib with cmake"
diff --git a/make_cernlib b/make_cernlib
index b1e38b44a2836a780c1752f543d51c5b481e6627..2a7e57802e811a3224bcb97f0f7d4210371919ed 100755
--- a/make_cernlib
+++ b/make_cernlib
@@ -13,7 +13,7 @@ unset LDFLAGS
# if $CERN is set we use that one, else we build from here
export version=$1
export use_cmake=$2
-export CERNLIB_XROOT=$3
+export CERNLIB_XROOTD=$3
export LEGACY=$4
echo "Building CERNLIB with:
@@ -50,9 +50,11 @@ mkdir build
cd build
pwd
ls -l
-git clone https://:@gitlab.cern.ch:8443/dphep/cernlib/cernlib.git
+#git clone https://:@gitlab.cern.ch:8443/dphep/cernlib/cernlib.git
+git clone https://:@gitlab.cern.ch:8443/schwicke/cernlib.git
cd cernlib
-git checkout tags/cernlib-$version
+# git checkout tags/cernlib-$version
+git checkout cernlibscripts
# select 2022 extensions
echo '#define CERNLIB_2022 yes' >> config/host.def
@@ -86,10 +88,10 @@ else
# we always use buildin xbae for backward compatibility
echo '#define CERNLIB_NOLIBXBAE YES' >> config/host.def
if [ -z $LEGACY ]; then
- ./make_cernlib 64bit GNU new $CERNLIB_XROOT
+ ./make_cernlib 64bit GNU new $CERNLIB_XROOTD
rc=$?
else
- ./make_cernlib 32bit GNU new $CERNLIB_ROOT
+ ./make_cernlib 32bit GNU new $CERNLIB_XROOTD
rc=$?
fi
if [ -e $CERN/pro ]; then
diff --git a/make_delgra b/make_delgra
index 5c6db557c8d69e9719eebd62b232375412de24b8..730c77672e2eb15ac63cd3db7eb4ae02533a0099 100755
--- a/make_delgra
+++ b/make_delgra
@@ -12,6 +12,7 @@ if [ ! -e $GRA_PLACE/gra_instal.sh ] ; then
cd $GRA_PLACE
git clone https://:@gitlab.cern.ch:8443/delphi/delgra.git
cd delgra
+ git checkout xrootd
rm -rf CI .gitlab-ci .git
cd ..
mv delgra/* .
@@ -22,14 +23,15 @@ echo "compiling delgra"
cd $GRA_PLACE
yes|./gra_instal.sh
env| grep DELPHI
+env| grep CERN
# now compile delgra
rc=$?
if [ ! -e ../delgra/gra/delgra/delgra ]; then
rc=1
cd ../delgra/gra/tmp
- for i in *.log ; do
- echo "Log file of $log :"
- cat $log
+ for logfile in *.log ; do
+ echo "Log file of $logfile :"
+ cat $logfile
done
fi
echo "compilation done."
diff --git a/make_globalsetup b/make_globalsetup
index ea25f673325982be732226d1391cba1f9637dd16..d6fef60cf755eac03d3d2828c99288a242881516 100755
--- a/make_globalsetup
+++ b/make_globalsetup
@@ -21,10 +21,13 @@ if [ -e ${DELPHI_INSTALL_DIR}/env ]; then
fi
# global stuff
+umask 022
cp -rp env ${DELPHI_INSTALL_DIR}
cp -rp runtime/pdl ${DELPHI_INSTALL_DIR}
cp -rp runtime/RunInfo ${DELPHI_INSTALL_DIR}
-chmod -R u+rw ${DELPHI_INSTALL_DIR}/pdl
+chmod 0755 ${DELPHI_INSTALL_DIR}/pdl
+chmod 0755 ${DELPHI_INSTALL_DIR}/RunInfo
+chmod 0755 ${DELPHI_INSTALL_DIR}/env
# install common scripts
mkdir -p ${DELPHI_INSTALL_DIR}/scripts