From 589480c39684da6d37a6fc809a4fe181f0fae4f0 Mon Sep 17 00:00:00 2001
From: Damian Alvarez <swmanage@juwels03.ib.juwels.fzj.de>
Date: Mon, 23 Mar 2020 18:12:37 +0100
Subject: [PATCH] Transition to EasyBuild 4.X
---
Custom_EasyBlocks/2019a/cmakemake.py | 3 +--
Custom_EasyBlocks/2019a/elpa.py | 3 +--
Custom_MNS/2019a/custom_hierarchical_mns.py | 3 +--
Custom_MNS/2019a/flexible_custom_hierarchical_mns.py | 5 ++---
Golden_Repo/2019a/a/ARMForge/ARMForge-19.0.4.eb | 2 +-
.../a/ARMPerformanceReports/ARMPerformanceReports-19.0.4.eb | 2 +-
Golden_Repo/2019a/a/Advisor/Advisor-2019_update3.eb | 2 +-
Golden_Repo/2019a/a/Advisor/Advisor-2019_update5.eb | 2 +-
Golden_Repo/2019a/a/Autoconf/Autoconf-2.69.eb | 2 +-
Golden_Repo/2019a/a/Automake/Automake-1.16.1.eb | 2 +-
Golden_Repo/2019a/a/Autotools/Autotools-20180311.eb | 2 +-
Golden_Repo/2019a/a/ant/ant-1.10.1.eb | 2 +-
Golden_Repo/2019a/b/Bison/Bison-3.3.2.eb | 2 +-
Golden_Repo/2019a/b/binutils/binutils-2.32.eb | 2 +-
Golden_Repo/2019a/c/CUDA/CUDA-10.1.105.eb | 2 +-
Golden_Repo/2019a/c/Camino/Camino-20190201.eb | 2 +-
Golden_Repo/2019a/c/cuDNN/cuDNN-7.5.1.10-CUDA-10.1.105.eb | 2 +-
Golden_Repo/2019a/e/EasyBuild/EasyBuild-3.9.4.eb | 2 +-
Golden_Repo/2019a/f/flex/flex-2.6.4.eb | 2 +-
Golden_Repo/2019a/g/GCC/GCC-8.3.0.eb | 2 +-
Golden_Repo/2019a/g/GCCcore/GCCcore-8.3.0.eb | 2 +-
Golden_Repo/2019a/g/Go/Go-1.12.6.eb | 2 +-
.../2019a/g/gcccoremkl/gcccoremkl-8.3.0-2019.3.199.eb | 2 +-
Golden_Repo/2019a/g/gettext/gettext-0.19.8.1.eb | 2 +-
Golden_Repo/2019a/g/git-lfs/git-lfs-2.7.2.eb | 2 +-
Golden_Repo/2019a/g/gmvapich2c/gmvapich2c-2019a-GDR.eb | 2 +-
Golden_Repo/2019a/g/gmvmklc/gmvmklc-2019a-GDR.eb | 2 +-
Golden_Repo/2019a/g/gomkl/gomkl-2019a.eb | 2 +-
Golden_Repo/2019a/g/gompi/gompi-2019a.eb | 2 +-
Golden_Repo/2019a/g/gpsmkl/gpsmkl-2019a.1.eb | 2 +-
Golden_Repo/2019a/g/gpsmkl/gpsmkl-2019a.eb | 2 +-
Golden_Repo/2019a/g/gpsmpi/gpsmpi-2019a.1.eb | 2 +-
Golden_Repo/2019a/g/gpsmpi/gpsmpi-2019a.eb | 2 +-
Golden_Repo/2019a/h/HDFView/HDFView-2.14.eb | 2 +-
Golden_Repo/2019a/i/Inspector/Inspector-2019_update3.eb | 2 +-
Golden_Repo/2019a/i/Inspector/Inspector-2019_update5.eb | 2 +-
Golden_Repo/2019a/i/icc/icc-2019.3.199-GCC-8.3.0.eb | 2 +-
Golden_Repo/2019a/i/icc/icc-2019.5.281-GCC-8.3.0.eb | 2 +-
.../2019a/i/iccifort/iccifort-2019.3.199-GCC-8.3.0.eb | 2 +-
.../2019a/i/iccifort/iccifort-2019.5.281-GCC-8.3.0.eb | 2 +-
Golden_Repo/2019a/i/ifort/ifort-2019.3.199-GCC-8.3.0.eb | 2 +-
Golden_Repo/2019a/i/ifort/ifort-2019.5.281-GCC-8.3.0.eb | 2 +-
Golden_Repo/2019a/i/iimpi/iimpi-2019a.1.eb | 2 +-
Golden_Repo/2019a/i/iimpi/iimpi-2019a.eb | 2 +-
Golden_Repo/2019a/i/imkl/imkl-2019.3.199.eb | 2 +-
.../2019a/i/impi-settings/impi-settings-2019-UCX-UD.eb | 2 +-
.../2019a/i/impi-settings/impi-settings-2019-default.eb | 2 +-
.../i/impi-settings/impi-settings-2019-large-job-hybrid.eb | 2 +-
.../i/impi-settings/impi-settings-2019-large-job-mpi.eb | 2 +-
Golden_Repo/2019a/i/intel-para/intel-para-2019a-mt.eb | 2 +-
Golden_Repo/2019a/i/intel-para/intel-para-2019a.1-mt.eb | 2 +-
Golden_Repo/2019a/i/intel-para/intel-para-2019a.1.eb | 2 +-
Golden_Repo/2019a/i/intel-para/intel-para-2019a.eb | 2 +-
Golden_Repo/2019a/i/intel/intel-2019a.1.eb | 2 +-
Golden_Repo/2019a/i/intel/intel-2019a.eb | 2 +-
Golden_Repo/2019a/i/iomkl/iomkl-2019a.eb | 2 +-
Golden_Repo/2019a/i/iompi/iompi-2019a.eb | 2 +-
Golden_Repo/2019a/i/ipp/ipp-2019.3.199.eb | 2 +-
Golden_Repo/2019a/i/ipp/ipp-2019.5.281.eb | 2 +-
Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a-mt.eb | 2 +-
Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.1-mt.eb | 2 +-
Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.1.eb | 2 +-
Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.eb | 2 +-
Golden_Repo/2019a/i/ispc/ispc-1.10.0.eb | 2 +-
Golden_Repo/2019a/i/itac/itac-2019.3.032.eb | 2 +-
Golden_Repo/2019a/i/itac/itac-2019.5.041.eb | 2 +-
Golden_Repo/2019a/j/JUBE/JUBE-2.2.2.eb | 2 +-
Golden_Repo/2019a/j/JUnit/JUnit-4.12.eb | 2 +-
Golden_Repo/2019a/j/Java/Java-1.8.eb | 2 +-
Golden_Repo/2019a/jusuf_overlay/i/iimpi/iimpi-2019a.eb | 2 +-
Golden_Repo/2019a/jusuf_overlay/i/imkl/imkl-2019.5.281.eb | 2 +-
.../2019a/jusuf_overlay/i/intel-para/intel-para-2019a-mt.eb | 2 +-
.../2019a/jusuf_overlay/i/intel-para/intel-para-2019a.eb | 2 +-
Golden_Repo/2019a/jusuf_overlay/i/ipsmpi/ipsmpi-2019a-mt.eb | 2 +-
Golden_Repo/2019a/jusuf_overlay/i/ipsmpi/ipsmpi-2019a.eb | 2 +-
Golden_Repo/2019a/jusuf_overlay/j/JUBE/JUBE-2.3.0.eb | 2 +-
Golden_Repo/2019a/jusuf_overlay/n/nvidia/nvidia-driver.eb | 2 +-
.../2019a/juwels_overlay/a/ARMForge/ARMForge-19.0.4.eb | 2 +-
.../a/ARMPerformanceReports/ARMPerformanceReports-19.0.4.eb | 2 +-
.../2019a/juwels_overlay/p/pmvmklc/pmvmklc-2019a-GDR.eb | 2 +-
Golden_Repo/2019a/juwels_overlay/v/Vampir/Vampir-9.6.1.eb | 2 +-
.../i/impi-settings/impi-settings-2019-default.eb | 2 +-
Golden_Repo/2019a/knl_overlay/l/libfabric/libfabric-1.9.0.eb | 2 +-
.../p/psmpi-settings/psmpi-settings-5.2-default.eb | 2 +-
.../p/psmpi-settings/psmpi-settings-5.2-mt-default.eb | 2 +-
.../p/psmpi-settings/psmpi-settings-5.4-default.eb | 2 +-
.../p/psmpi-settings/psmpi-settings-5.4-mt-default.eb | 2 +-
Golden_Repo/2019a/l/libtool/libtool-2.4.6.eb | 2 +-
Golden_Repo/2019a/m/M4/M4-1.4.18.eb | 2 +-
.../2019a/m/MVAPICH2-settings/MVAPICH2-2.3-GDR-default.eb | 2 +-
Golden_Repo/2019a/n/ncurses/ncurses-6.1.eb | 2 +-
Golden_Repo/2019a/n/numactl/numactl-2.0.12.eb | 2 +-
Golden_Repo/2019a/n/nvidia/nvidia-418.40.04.eb | 2 +-
Golden_Repo/2019a/n/nvidia/nvidia-418.87.00.eb | 2 +-
Golden_Repo/2019a/n/nvidia/nvidia-driver.eb | 2 +-
Golden_Repo/2019a/p/PGI/PGI-19.10-GCC-8.3.0.eb | 2 +-
Golden_Repo/2019a/p/PGI/PGI-19.3-GCC-8.3.0.eb | 2 +-
Golden_Repo/2019a/p/Panoply/Panoply-4.10.5.eb | 2 +-
Golden_Repo/2019a/p/pandoc/pandoc-2.7.2.eb | 2 +-
Golden_Repo/2019a/p/pkg-config/pkg-config-0.29.2.eb | 2 +-
Golden_Repo/2019a/p/pmvapich2c/pmvapich2c-2019a-GDR.eb | 2 +-
Golden_Repo/2019a/p/pmvmklc/pmvmklc-2019a-GDR.eb | 2 +-
Golden_Repo/2019a/p/popt/popt-1.16.eb | 2 +-
Golden_Repo/2019a/p/pscom/pscom-5.2-default.eb | 2 +-
Golden_Repo/2019a/p/pscom/pscom-5.2.9-1-patched.eb | 2 +-
.../2019a/p/pscom/pscom-5.3.0-1_115_g12720ef_gateway.eb | 2 +-
Golden_Repo/2019a/p/pscom/pscom-Default.eb | 2 +-
.../2019a/p/psmpi-settings/psmpi-settings-5.2-UCX-RC.eb | 2 +-
.../2019a/p/psmpi-settings/psmpi-settings-5.2-UCX-UD.eb | 2 +-
.../2019a/p/psmpi-settings/psmpi-settings-5.2-default.eb | 2 +-
.../p/psmpi-settings/psmpi-settings-5.2-large-job-hybrid.eb | 2 +-
.../p/psmpi-settings/psmpi-settings-5.2-large-job-mpi.eb | 2 +-
.../2019a/p/psmpi-settings/psmpi-settings-5.2-mt-UCX-RC.eb | 2 +-
.../2019a/p/psmpi-settings/psmpi-settings-5.2-mt-UCX-UD.eb | 2 +-
.../2019a/p/psmpi-settings/psmpi-settings-5.2-mt-default.eb | 2 +-
.../psmpi-settings/psmpi-settings-5.2-mt-large-job-hybrid.eb | 2 +-
.../p/psmpi-settings/psmpi-settings-5.2-mt-large-job-mpi.eb | 2 +-
.../2019a/p/psmpi-settings/psmpi-settings-5.4-UCX-RC.eb | 2 +-
.../2019a/p/psmpi-settings/psmpi-settings-5.4-UCX-UD.eb | 2 +-
.../2019a/p/psmpi-settings/psmpi-settings-5.4-default.eb | 2 +-
.../p/psmpi-settings/psmpi-settings-5.4-large-job-hybrid.eb | 2 +-
.../p/psmpi-settings/psmpi-settings-5.4-large-job-mpi.eb | 2 +-
.../2019a/p/psmpi-settings/psmpi-settings-5.4-mt-UCX-RC.eb | 2 +-
.../2019a/p/psmpi-settings/psmpi-settings-5.4-mt-UCX-UD.eb | 2 +-
.../2019a/p/psmpi-settings/psmpi-settings-5.4-mt-default.eb | 2 +-
.../psmpi-settings/psmpi-settings-5.4-mt-large-job-hybrid.eb | 2 +-
.../p/psmpi-settings/psmpi-settings-5.4-mt-large-job-mpi.eb | 2 +-
Golden_Repo/2019a/r/rpmrebuild/rpmrebuild-2.14.eb | 2 +-
Golden_Repo/2019a/t/TotalView/TotalView-2019.0.4.eb | 2 +-
Golden_Repo/2019a/t/tbb/tbb-2019.4.199.eb | 2 +-
Golden_Repo/2019a/t/tbb/tbb-2019.8.281.eb | 2 +-
Golden_Repo/2019a/u/UCX/UCX-1.6.1.eb | 2 +-
Golden_Repo/2019a/u/UCX/UCX-1.7.0.eb | 2 +-
Golden_Repo/2019a/v/VTune/VTune-2019_update3.eb | 2 +-
Golden_Repo/2019a/v/VTune/VTune-2019_update6.eb | 2 +-
Golden_Repo/2019a/v/Vampir/Vampir-9.6.1.eb | 2 +-
Golden_Repo/2019a/z/zlib/zlib-1.2.11.eb | 4 ++--
137 files changed, 139 insertions(+), 143 deletions(-)
diff --git a/Custom_EasyBlocks/2019a/cmakemake.py b/Custom_EasyBlocks/2019a/cmakemake.py
index 0df8b2084..8e414feba 100644
--- a/Custom_EasyBlocks/2019a/cmakemake.py
+++ b/Custom_EasyBlocks/2019a/cmakemake.py
@@ -42,8 +42,7 @@ from easybuild.tools.filetools import change_dir, mkdir, which
from easybuild.tools.environment import setvar
from easybuild.tools.modules import get_software_root
from easybuild.tools.run import run_cmd
-#from easybuild.tools.utilities import nub
-from vsc.utils.missing import nub
+from easybuild.tools.utilities import nub
DEFAULT_CONFIGURE_CMD = 'cmake'
diff --git a/Custom_EasyBlocks/2019a/elpa.py b/Custom_EasyBlocks/2019a/elpa.py
index c78656e91..39cb61009 100644
--- a/Custom_EasyBlocks/2019a/elpa.py
+++ b/Custom_EasyBlocks/2019a/elpa.py
@@ -28,8 +28,7 @@ EasyBuild support for building and installing ELPA, implemented as an easyblock
@author: Micael Oliveira (MPSD-Hamburg)
"""
-#from easybuild.tools.utilities import nub
-from vsc.utils.missing import nub
+from easybuild.tools.utilities import nub
from easybuild.easyblocks.generic.configuremake import ConfigureMake
from easybuild.framework.easyconfig import CUSTOM
diff --git a/Custom_MNS/2019a/custom_hierarchical_mns.py b/Custom_MNS/2019a/custom_hierarchical_mns.py
index 935f72ff1..3c5ae5bd6 100755
--- a/Custom_MNS/2019a/custom_hierarchical_mns.py
+++ b/Custom_MNS/2019a/custom_hierarchical_mns.py
@@ -31,8 +31,7 @@ Implementation of an example hierarchical module naming scheme.
import os
import re
-from vsc.utils import fancylogger
-#from easybuild.base import fancylogger
+from easybuild.base import fancylogger
from easybuild.tools.build_log import EasyBuildError
from easybuild.tools.module_naming_scheme.hierarchical_mns import HierarchicalMNS
diff --git a/Custom_MNS/2019a/flexible_custom_hierarchical_mns.py b/Custom_MNS/2019a/flexible_custom_hierarchical_mns.py
index 39b86e38a..dd4c0c975 100755
--- a/Custom_MNS/2019a/flexible_custom_hierarchical_mns.py
+++ b/Custom_MNS/2019a/flexible_custom_hierarchical_mns.py
@@ -9,8 +9,7 @@ Implementation of a hierarchical module naming scheme, with added flexibility
import os
import re
-from vsc.utils import fancylogger
-#from easybuild.base import fancylogger
+from easybuild.base import fancylogger
from easybuild.tools.build_log import EasyBuildError
from easybuild.tools.module_naming_scheme.hierarchical_mns import HierarchicalMNS
@@ -39,7 +38,7 @@ comp_relevant_versions = {
'intel': 1,
'PGI': 1,
# The compilers load GCCcore/version. So GCC and GCCcore can't really be flexible, since GCCcore will always be loaded
-# as a dependency with a full version, and GCC it nothing but a bundle around GCCcore + binutils
+# as a dependency with a full version, and GCC is nothing but a bundle around GCCcore + binutils
# 'GCC': 1,
# 'GCCcore': 1,
}
diff --git a/Golden_Repo/2019a/a/ARMForge/ARMForge-19.0.4.eb b/Golden_Repo/2019a/a/ARMForge/ARMForge-19.0.4.eb
index 154f3b902..92ed9cfe3 100644
--- a/Golden_Repo/2019a/a/ARMForge/ARMForge-19.0.4.eb
+++ b/Golden_Repo/2019a/a/ARMForge/ARMForge-19.0.4.eb
@@ -17,7 +17,7 @@ For the ARM DDT and MAP User Guide, please see: "$EBROOTARMFORGE/doc/userguide.p
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': 'dummy', 'name': 'dummy'}
+toolchain = SYSTEM
sources = ['arm-forge-%(version)s-Redhat-7.0-x86_64.tar']
#http://content.allinea.com/downloads/allinea-tools-4.2-PR-39422-Redhat-6.0-x86_64.tar
diff --git a/Golden_Repo/2019a/a/ARMPerformanceReports/ARMPerformanceReports-19.0.4.eb b/Golden_Repo/2019a/a/ARMPerformanceReports/ARMPerformanceReports-19.0.4.eb
index 81b990354..c17605b07 100644
--- a/Golden_Repo/2019a/a/ARMPerformanceReports/ARMPerformanceReports-19.0.4.eb
+++ b/Golden_Repo/2019a/a/ARMPerformanceReports/ARMPerformanceReports-19.0.4.eb
@@ -20,7 +20,7 @@ will be created in the current directory on completion.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': 'dummy', 'name': 'dummy'}
+toolchain = SYSTEM
sources = ['arm-reports-%(version)s-Redhat-7.0-x86_64.tar']
source_urls = ['http://content.allinea.com/downloads/']
diff --git a/Golden_Repo/2019a/a/Advisor/Advisor-2019_update3.eb b/Golden_Repo/2019a/a/Advisor/Advisor-2019_update3.eb
index dcb70d64f..6fe90593b 100644
--- a/Golden_Repo/2019a/a/Advisor/Advisor-2019_update3.eb
+++ b/Golden_Repo/2019a/a/Advisor/Advisor-2019_update3.eb
@@ -10,7 +10,7 @@ description = """Vectorization Optimization and Thread Prototyping
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['advisor_%(version)s.tar.gz']
diff --git a/Golden_Repo/2019a/a/Advisor/Advisor-2019_update5.eb b/Golden_Repo/2019a/a/Advisor/Advisor-2019_update5.eb
index 6c5a25c93..616b4228c 100644
--- a/Golden_Repo/2019a/a/Advisor/Advisor-2019_update5.eb
+++ b/Golden_Repo/2019a/a/Advisor/Advisor-2019_update5.eb
@@ -10,7 +10,7 @@ description = """Vectorization Optimization and Thread Prototyping
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['advisor_%(version)s.tar.gz']
diff --git a/Golden_Repo/2019a/a/Autoconf/Autoconf-2.69.eb b/Golden_Repo/2019a/a/Autoconf/Autoconf-2.69.eb
index fcbca4609..e7ce4e8f2 100644
--- a/Golden_Repo/2019a/a/Autoconf/Autoconf-2.69.eb
+++ b/Golden_Repo/2019a/a/Autoconf/Autoconf-2.69.eb
@@ -13,7 +13,7 @@ description = """Autoconf is an extensible package of M4 macros that produce she
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = [GNU_SOURCE]
sources = [SOURCELOWER_TAR_GZ]
diff --git a/Golden_Repo/2019a/a/Automake/Automake-1.16.1.eb b/Golden_Repo/2019a/a/Automake/Automake-1.16.1.eb
index c5e7329e9..5642e478c 100644
--- a/Golden_Repo/2019a/a/Automake/Automake-1.16.1.eb
+++ b/Golden_Repo/2019a/a/Automake/Automake-1.16.1.eb
@@ -22,7 +22,7 @@ Automake: GNU Standards-compliant Makefile generator
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = [GNU_SOURCE]
sources = [SOURCELOWER_TAR_GZ]
diff --git a/Golden_Repo/2019a/a/Autotools/Autotools-20180311.eb b/Golden_Repo/2019a/a/Autotools/Autotools-20180311.eb
index fb45db3de..dfc52fcca 100644
--- a/Golden_Repo/2019a/a/Autotools/Autotools-20180311.eb
+++ b/Golden_Repo/2019a/a/Autotools/Autotools-20180311.eb
@@ -10,7 +10,7 @@ description = """
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('Autoconf', '2.69'), # 20120424
diff --git a/Golden_Repo/2019a/a/ant/ant-1.10.1.eb b/Golden_Repo/2019a/a/ant/ant-1.10.1.eb
index c00158cb4..3de9f7e80 100644
--- a/Golden_Repo/2019a/a/ant/ant-1.10.1.eb
+++ b/Golden_Repo/2019a/a/ant/ant-1.10.1.eb
@@ -8,7 +8,7 @@ description = """Apache Ant is a Java library and command-line tool whose missio
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = ['apache-%(name)s-%(version)s-src.tar.gz']
source_urls = ['http://archive.apache.org/dist/%(name)s/source/']
diff --git a/Golden_Repo/2019a/b/Bison/Bison-3.3.2.eb b/Golden_Repo/2019a/b/Bison/Bison-3.3.2.eb
index ed47c3e9d..2e2b0c303 100644
--- a/Golden_Repo/2019a/b/Bison/Bison-3.3.2.eb
+++ b/Golden_Repo/2019a/b/Bison/Bison-3.3.2.eb
@@ -10,7 +10,7 @@ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = [SOURCELOWER_TAR_GZ]
source_urls = [GNU_SOURCE]
diff --git a/Golden_Repo/2019a/b/binutils/binutils-2.32.eb b/Golden_Repo/2019a/b/binutils/binutils-2.32.eb
index 5291e20ad..fb031b69d 100644
--- a/Golden_Repo/2019a/b/binutils/binutils-2.32.eb
+++ b/Golden_Repo/2019a/b/binutils/binutils-2.32.eb
@@ -10,7 +10,7 @@ description = """
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
toolchainopts = {'pic': True}
sources = [SOURCE_TAR_GZ]
diff --git a/Golden_Repo/2019a/c/CUDA/CUDA-10.1.105.eb b/Golden_Repo/2019a/c/CUDA/CUDA-10.1.105.eb
index e3fdd0523..cb8a1a8e9 100644
--- a/Golden_Repo/2019a/c/CUDA/CUDA-10.1.105.eb
+++ b/Golden_Repo/2019a/c/CUDA/CUDA-10.1.105.eb
@@ -11,7 +11,7 @@ description = """CUDA (formerly Compute Unified Device Architecture) is a parall
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = [
'http://developer.download.nvidia.com/compute/cuda/%(version_major_minor)s/Prod/local_installers/',
diff --git a/Golden_Repo/2019a/c/Camino/Camino-20190201.eb b/Golden_Repo/2019a/c/Camino/Camino-20190201.eb
index c9875c255..f85073e8e 100644
--- a/Golden_Repo/2019a/c/Camino/Camino-20190201.eb
+++ b/Golden_Repo/2019a/c/Camino/Camino-20190201.eb
@@ -8,7 +8,7 @@ description = "Camino is a free, open-source software package for analysis and r
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
toolchainopts = {'pic': True}
code_hash = '1c4ef77615d103d43adcff6c79b72d0bbdac0897'
diff --git a/Golden_Repo/2019a/c/cuDNN/cuDNN-7.5.1.10-CUDA-10.1.105.eb b/Golden_Repo/2019a/c/cuDNN/cuDNN-7.5.1.10-CUDA-10.1.105.eb
index e42893c24..9cf697cff 100644
--- a/Golden_Repo/2019a/c/cuDNN/cuDNN-7.5.1.10-CUDA-10.1.105.eb
+++ b/Golden_Repo/2019a/c/cuDNN/cuDNN-7.5.1.10-CUDA-10.1.105.eb
@@ -19,7 +19,7 @@ deep neural networks."""
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
# Nvidia developer registration required.
# Download link: https://developer.nvidia.com/rdp/cudnn-download
diff --git a/Golden_Repo/2019a/e/EasyBuild/EasyBuild-3.9.4.eb b/Golden_Repo/2019a/e/EasyBuild/EasyBuild-3.9.4.eb
index a5005270c..dd3b35aa8 100644
--- a/Golden_Repo/2019a/e/EasyBuild/EasyBuild-3.9.4.eb
+++ b/Golden_Repo/2019a/e/EasyBuild/EasyBuild-3.9.4.eb
@@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = [
# vsc-install
diff --git a/Golden_Repo/2019a/f/flex/flex-2.6.4.eb b/Golden_Repo/2019a/f/flex/flex-2.6.4.eb
index cd6d58eac..9649622b5 100644
--- a/Golden_Repo/2019a/f/flex/flex-2.6.4.eb
+++ b/Golden_Repo/2019a/f/flex/flex-2.6.4.eb
@@ -7,7 +7,7 @@ description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': '', 'name': 'dummy'}
+toolchain = SYSTEM
toolchainopts = {'pic': True}
sources = [SOURCELOWER_TAR_GZ]
diff --git a/Golden_Repo/2019a/g/GCC/GCC-8.3.0.eb b/Golden_Repo/2019a/g/GCC/GCC-8.3.0.eb
index fe58612fa..1cb6f29ed 100644
--- a/Golden_Repo/2019a/g/GCC/GCC-8.3.0.eb
+++ b/Golden_Repo/2019a/g/GCC/GCC-8.3.0.eb
@@ -10,7 +10,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
dependencies = [
('GCCcore', version),
diff --git a/Golden_Repo/2019a/g/GCCcore/GCCcore-8.3.0.eb b/Golden_Repo/2019a/g/GCCcore/GCCcore-8.3.0.eb
index 31ab42526..b6733887d 100644
--- a/Golden_Repo/2019a/g/GCCcore/GCCcore-8.3.0.eb
+++ b/Golden_Repo/2019a/g/GCCcore/GCCcore-8.3.0.eb
@@ -9,7 +9,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
mpfr_version = '4.0.2'
diff --git a/Golden_Repo/2019a/g/Go/Go-1.12.6.eb b/Golden_Repo/2019a/g/Go/Go-1.12.6.eb
index 6478688e2..f07e9e9c0 100644
--- a/Golden_Repo/2019a/g/Go/Go-1.12.6.eb
+++ b/Golden_Repo/2019a/g/Go/Go-1.12.6.eb
@@ -9,7 +9,7 @@ description = """Go is an open source programming language that makes it easy to
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
source_urls = ['https://storage.googleapis.com/golang/']
sources = ['%(namelower)s%(version)s.linux-amd64.tar.gz']
diff --git a/Golden_Repo/2019a/g/gcccoremkl/gcccoremkl-8.3.0-2019.3.199.eb b/Golden_Repo/2019a/g/gcccoremkl/gcccoremkl-8.3.0-2019.3.199.eb
index 70e209033..5811b9ee2 100644
--- a/Golden_Repo/2019a/g/gcccoremkl/gcccoremkl-8.3.0-2019.3.199.eb
+++ b/Golden_Repo/2019a/g/gcccoremkl/gcccoremkl-8.3.0-2019.3.199.eb
@@ -10,7 +10,7 @@ description = """GCCcore compiler toolchain with MKL"""
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
comp_name = 'GCCcore'
comp = (comp_name, comp_version)
diff --git a/Golden_Repo/2019a/g/gettext/gettext-0.19.8.1.eb b/Golden_Repo/2019a/g/gettext/gettext-0.19.8.1.eb
index 9e0eba5ee..cc6d03264 100644
--- a/Golden_Repo/2019a/g/gettext/gettext-0.19.8.1.eb
+++ b/Golden_Repo/2019a/g/gettext/gettext-0.19.8.1.eb
@@ -16,7 +16,7 @@ site_contacts = 'sc@fz-juelich.de'
# It is the first step in the cyclic dependency chain of
# XZ -> libxml2 -> gettext -> XZ
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = [SOURCE_TAR_GZ]
source_urls = [GNU_SOURCE]
diff --git a/Golden_Repo/2019a/g/git-lfs/git-lfs-2.7.2.eb b/Golden_Repo/2019a/g/git-lfs/git-lfs-2.7.2.eb
index 652572b5b..10d357117 100644
--- a/Golden_Repo/2019a/g/git-lfs/git-lfs-2.7.2.eb
+++ b/Golden_Repo/2019a/g/git-lfs/git-lfs-2.7.2.eb
@@ -10,7 +10,7 @@ description = """Git Large File Storage (LFS) replaces large files such as audio
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
source_urls = ['https://github.com/git-lfs/git-lfs/archive/']
sources = ['v%(version)s.tar.gz']
diff --git a/Golden_Repo/2019a/g/gmvapich2c/gmvapich2c-2019a-GDR.eb b/Golden_Repo/2019a/g/gmvapich2c/gmvapich2c-2019a-GDR.eb
index 1df76aa97..b2ec93062 100644
--- a/Golden_Repo/2019a/g/gmvapich2c/gmvapich2c-2019a-GDR.eb
+++ b/Golden_Repo/2019a/g/gmvapich2c/gmvapich2c-2019a-GDR.eb
@@ -9,7 +9,7 @@ description = """GCC based compiler toolchain, including CUDA and MVAPICH2 for C
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compname = 'GCC'
compver = '8.3.0'
diff --git a/Golden_Repo/2019a/g/gmvmklc/gmvmklc-2019a-GDR.eb b/Golden_Repo/2019a/g/gmvmklc/gmvmklc-2019a-GDR.eb
index b8521df40..dc4cf3661 100644
--- a/Golden_Repo/2019a/g/gmvmklc/gmvmklc-2019a-GDR.eb
+++ b/Golden_Repo/2019a/g/gmvmklc/gmvmklc-2019a-GDR.eb
@@ -10,7 +10,7 @@ description = """ GCC based compiler toolchain,
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
comp_name = 'GCC'
comp_version = '8.3.0'
diff --git a/Golden_Repo/2019a/g/gomkl/gomkl-2019a.eb b/Golden_Repo/2019a/g/gomkl/gomkl-2019a.eb
index cb08fa4ae..a6d62a198 100644
--- a/Golden_Repo/2019a/g/gomkl/gomkl-2019a.eb
+++ b/Golden_Repo/2019a/g/gomkl/gomkl-2019a.eb
@@ -8,7 +8,7 @@ description = """GCC and GFortran based compiler toolchain, ParaStation MPICH va
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
comp_name = 'GCC'
comp_version = '8.3.0'
diff --git a/Golden_Repo/2019a/g/gompi/gompi-2019a.eb b/Golden_Repo/2019a/g/gompi/gompi-2019a.eb
index f023e502f..28b64d763 100644
--- a/Golden_Repo/2019a/g/gompi/gompi-2019a.eb
+++ b/Golden_Repo/2019a/g/gompi/gompi-2019a.eb
@@ -10,7 +10,7 @@ description = """gcc and GFortran based compiler toolchain,
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
mpilib = 'OpenMPI'
mpiver = '4.0.2'
diff --git a/Golden_Repo/2019a/g/gpsmkl/gpsmkl-2019a.1.eb b/Golden_Repo/2019a/g/gpsmkl/gpsmkl-2019a.1.eb
index 781ef34b3..54bebbd13 100644
--- a/Golden_Repo/2019a/g/gpsmkl/gpsmkl-2019a.1.eb
+++ b/Golden_Repo/2019a/g/gpsmkl/gpsmkl-2019a.1.eb
@@ -8,7 +8,7 @@ description = """GCC and GFortran based compiler toolchain, ParaStation MPICH va
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
comp_name = 'GCC'
comp_version = '8.3.0'
diff --git a/Golden_Repo/2019a/g/gpsmkl/gpsmkl-2019a.eb b/Golden_Repo/2019a/g/gpsmkl/gpsmkl-2019a.eb
index 506a191b8..3d41df060 100644
--- a/Golden_Repo/2019a/g/gpsmkl/gpsmkl-2019a.eb
+++ b/Golden_Repo/2019a/g/gpsmkl/gpsmkl-2019a.eb
@@ -8,7 +8,7 @@ description = """GCC and GFortran based compiler toolchain, ParaStation MPICH va
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
comp_name = 'GCC'
comp_version = '8.3.0'
diff --git a/Golden_Repo/2019a/g/gpsmpi/gpsmpi-2019a.1.eb b/Golden_Repo/2019a/g/gpsmpi/gpsmpi-2019a.1.eb
index 1b2f3fadf..a71edc5e5 100644
--- a/Golden_Repo/2019a/g/gpsmpi/gpsmpi-2019a.1.eb
+++ b/Golden_Repo/2019a/g/gpsmpi/gpsmpi-2019a.1.eb
@@ -10,7 +10,7 @@ description = """gcc and GFortran based compiler toolchain,
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
mpilib = 'psmpi'
mpiver = '5.4.3-1'
diff --git a/Golden_Repo/2019a/g/gpsmpi/gpsmpi-2019a.eb b/Golden_Repo/2019a/g/gpsmpi/gpsmpi-2019a.eb
index 66a9d1252..92641b4c6 100644
--- a/Golden_Repo/2019a/g/gpsmpi/gpsmpi-2019a.eb
+++ b/Golden_Repo/2019a/g/gpsmpi/gpsmpi-2019a.eb
@@ -10,7 +10,7 @@ description = """gcc and GFortran based compiler toolchain,
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
mpilib = 'psmpi'
mpiver = '5.2.2-1'
diff --git a/Golden_Repo/2019a/h/HDFView/HDFView-2.14.eb b/Golden_Repo/2019a/h/HDFView/HDFView-2.14.eb
index f6658d8c5..018f2307f 100644
--- a/Golden_Repo/2019a/h/HDFView/HDFView-2.14.eb
+++ b/Golden_Repo/2019a/h/HDFView/HDFView-2.14.eb
@@ -8,7 +8,7 @@ description = "HDFView is a visual tool for browsing and editing HDF4 and HDF5 f
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
source_urls = ['https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/bin/']
sources = ['%(name)s-%(version)s-centos7_64.tar.gz']
diff --git a/Golden_Repo/2019a/i/Inspector/Inspector-2019_update3.eb b/Golden_Repo/2019a/i/Inspector/Inspector-2019_update3.eb
index f9b2687f9..2244444bf 100644
--- a/Golden_Repo/2019a/i/Inspector/Inspector-2019_update3.eb
+++ b/Golden_Repo/2019a/i/Inspector/Inspector-2019_update3.eb
@@ -7,7 +7,7 @@ applications """
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name':'dummy','version':'dummy'}
+toolchain = SYSTEM
sources = ['inspector_%(version)s.tar.gz']
diff --git a/Golden_Repo/2019a/i/Inspector/Inspector-2019_update5.eb b/Golden_Repo/2019a/i/Inspector/Inspector-2019_update5.eb
index 7e9422296..e8e127abc 100644
--- a/Golden_Repo/2019a/i/Inspector/Inspector-2019_update5.eb
+++ b/Golden_Repo/2019a/i/Inspector/Inspector-2019_update5.eb
@@ -7,7 +7,7 @@ applications """
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name':'dummy','version':'dummy'}
+toolchain = SYSTEM
sources = ['inspector_%(version)s.tar.gz']
diff --git a/Golden_Repo/2019a/i/icc/icc-2019.3.199-GCC-8.3.0.eb b/Golden_Repo/2019a/i/icc/icc-2019.3.199-GCC-8.3.0.eb
index ff51d0dbf..7618c25cc 100644
--- a/Golden_Repo/2019a/i/icc/icc-2019.3.199-GCC-8.3.0.eb
+++ b/Golden_Repo/2019a/i/icc/icc-2019.3.199-GCC-8.3.0.eb
@@ -9,7 +9,7 @@ description = """C and C++ compiler from Intel
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['parallel_studio_xe_%(version_major)s_update%(version_minor)s_composer_edition_for_cpp.tgz']
#sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_cpp.tgz']
diff --git a/Golden_Repo/2019a/i/icc/icc-2019.5.281-GCC-8.3.0.eb b/Golden_Repo/2019a/i/icc/icc-2019.5.281-GCC-8.3.0.eb
index fe24d0867..6c4bea549 100644
--- a/Golden_Repo/2019a/i/icc/icc-2019.5.281-GCC-8.3.0.eb
+++ b/Golden_Repo/2019a/i/icc/icc-2019.5.281-GCC-8.3.0.eb
@@ -9,7 +9,7 @@ description = """C and C++ compiler from Intel
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['parallel_studio_xe_%(version_major)s_update%(version_minor)s_composer_edition_for_cpp.tgz']
#sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_cpp.tgz']
diff --git a/Golden_Repo/2019a/i/iccifort/iccifort-2019.3.199-GCC-8.3.0.eb b/Golden_Repo/2019a/i/iccifort/iccifort-2019.3.199-GCC-8.3.0.eb
index 696e5e73e..ac2f483e5 100644
--- a/Golden_Repo/2019a/i/iccifort/iccifort-2019.3.199-GCC-8.3.0.eb
+++ b/Golden_Repo/2019a/i/iccifort/iccifort-2019.3.199-GCC-8.3.0.eb
@@ -10,7 +10,7 @@ description = """Intel Cluster Toolkit Compiler Edition provides Intel C,C++ and
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('icc', version, versionsuffix),
diff --git a/Golden_Repo/2019a/i/iccifort/iccifort-2019.5.281-GCC-8.3.0.eb b/Golden_Repo/2019a/i/iccifort/iccifort-2019.5.281-GCC-8.3.0.eb
index 12f5371d6..82d52dec5 100644
--- a/Golden_Repo/2019a/i/iccifort/iccifort-2019.5.281-GCC-8.3.0.eb
+++ b/Golden_Repo/2019a/i/iccifort/iccifort-2019.5.281-GCC-8.3.0.eb
@@ -10,7 +10,7 @@ description = """Intel Cluster Toolkit Compiler Edition provides Intel C,C++ and
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('icc', version, versionsuffix),
diff --git a/Golden_Repo/2019a/i/ifort/ifort-2019.3.199-GCC-8.3.0.eb b/Golden_Repo/2019a/i/ifort/ifort-2019.3.199-GCC-8.3.0.eb
index 10932adde..39c0f1380 100644
--- a/Golden_Repo/2019a/i/ifort/ifort-2019.3.199-GCC-8.3.0.eb
+++ b/Golden_Repo/2019a/i/ifort/ifort-2019.3.199-GCC-8.3.0.eb
@@ -7,7 +7,7 @@ description = """Fortran compiler from Intel
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
#sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_fortran.tgz']
sources = ['parallel_studio_xe_%(version_major)s_update%(version_minor)s_composer_edition_for_fortran.tgz']
diff --git a/Golden_Repo/2019a/i/ifort/ifort-2019.5.281-GCC-8.3.0.eb b/Golden_Repo/2019a/i/ifort/ifort-2019.5.281-GCC-8.3.0.eb
index 943172a93..169a370f5 100644
--- a/Golden_Repo/2019a/i/ifort/ifort-2019.5.281-GCC-8.3.0.eb
+++ b/Golden_Repo/2019a/i/ifort/ifort-2019.5.281-GCC-8.3.0.eb
@@ -7,7 +7,7 @@ description = """Fortran compiler from Intel
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
#sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_fortran.tgz']
sources = ['parallel_studio_xe_%(version_major)s_update%(version_minor)s_composer_edition_for_fortran.tgz']
diff --git a/Golden_Repo/2019a/i/iimpi/iimpi-2019a.1.eb b/Golden_Repo/2019a/i/iimpi/iimpi-2019a.1.eb
index c5cfa59d5..6d7af5830 100644
--- a/Golden_Repo/2019a/i/iimpi/iimpi-2019a.1.eb
+++ b/Golden_Repo/2019a/i/iimpi/iimpi-2019a.1.eb
@@ -9,7 +9,7 @@ description = """Intel C/C++ and Fortran compilers, alongside Intel MPI.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compver = '2019.3.199'
gccsuffix = '-GCC-8.3.0'
diff --git a/Golden_Repo/2019a/i/iimpi/iimpi-2019a.eb b/Golden_Repo/2019a/i/iimpi/iimpi-2019a.eb
index 8ddf00c6a..7944204f8 100644
--- a/Golden_Repo/2019a/i/iimpi/iimpi-2019a.eb
+++ b/Golden_Repo/2019a/i/iimpi/iimpi-2019a.eb
@@ -9,7 +9,7 @@ description = """Intel C/C++ and Fortran compilers, alongside Intel MPI.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compver = '2019.3.199'
gccsuffix = '-GCC-8.3.0'
diff --git a/Golden_Repo/2019a/i/imkl/imkl-2019.3.199.eb b/Golden_Repo/2019a/i/imkl/imkl-2019.3.199.eb
index 53747b002..b94ae9694 100644
--- a/Golden_Repo/2019a/i/imkl/imkl-2019.3.199.eb
+++ b/Golden_Repo/2019a/i/imkl/imkl-2019.3.199.eb
@@ -10,7 +10,7 @@ description = """Intel Math Kernel Library is a library of highly optimized,
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': 'dummy', 'name': 'dummy'}
+toolchain = SYSTEM
sources = ['l_mkl_%(version)s.tgz']
diff --git a/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-UCX-UD.eb b/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-UCX-UD.eb
index ebdd41c02..2f352fde5 100644
--- a/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-UCX-UD.eb
+++ b/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-UCX-UD.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the IntelMPI configuration with UCX an
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-default.eb b/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-default.eb
index 62fe65bd8..aed1355c8 100644
--- a/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-default.eb
+++ b/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-default.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the default IntelMPI configuration"""
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-large-job-hybrid.eb b/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-large-job-hybrid.eb
index d1ec28953..c8565ebfd 100644
--- a/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-large-job-hybrid.eb
+++ b/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-large-job-hybrid.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the IntelMPI configuration for large s
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-large-job-mpi.eb b/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-large-job-mpi.eb
index 03fb0c375..5b8ad67bb 100644
--- a/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-large-job-mpi.eb
+++ b/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-large-job-mpi.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the IntelMPI configuration for large s
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/i/intel-para/intel-para-2019a-mt.eb b/Golden_Repo/2019a/i/intel-para/intel-para-2019a-mt.eb
index 7b8d5209d..5cd5031f3 100644
--- a/Golden_Repo/2019a/i/intel-para/intel-para-2019a-mt.eb
+++ b/Golden_Repo/2019a/i/intel-para/intel-para-2019a-mt.eb
@@ -13,7 +13,7 @@ description = """intel-para provides Intel C/C++ and Fortran compilers, ParaStat
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': '', 'name': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('iccifort', intelversion, intelsuffix),
diff --git a/Golden_Repo/2019a/i/intel-para/intel-para-2019a.1-mt.eb b/Golden_Repo/2019a/i/intel-para/intel-para-2019a.1-mt.eb
index 2fe953938..84807e8f2 100644
--- a/Golden_Repo/2019a/i/intel-para/intel-para-2019a.1-mt.eb
+++ b/Golden_Repo/2019a/i/intel-para/intel-para-2019a.1-mt.eb
@@ -13,7 +13,7 @@ description = """intel-para provides Intel C/C++ and Fortran compilers, ParaStat
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': '', 'name': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('iccifort', intelversion, intelsuffix),
diff --git a/Golden_Repo/2019a/i/intel-para/intel-para-2019a.1.eb b/Golden_Repo/2019a/i/intel-para/intel-para-2019a.1.eb
index c98b2272b..7fef0495d 100644
--- a/Golden_Repo/2019a/i/intel-para/intel-para-2019a.1.eb
+++ b/Golden_Repo/2019a/i/intel-para/intel-para-2019a.1.eb
@@ -13,7 +13,7 @@ description = """intel-para provides Intel C/C++ and Fortran compilers, ParaStat
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': '', 'name': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('iccifort', intelversion, intelsuffix),
diff --git a/Golden_Repo/2019a/i/intel-para/intel-para-2019a.eb b/Golden_Repo/2019a/i/intel-para/intel-para-2019a.eb
index f3bea54f9..9b72bb435 100644
--- a/Golden_Repo/2019a/i/intel-para/intel-para-2019a.eb
+++ b/Golden_Repo/2019a/i/intel-para/intel-para-2019a.eb
@@ -13,7 +13,7 @@ description = """intel-para provides Intel C/C++ and Fortran compilers, ParaStat
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': '', 'name': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('iccifort', intelversion, intelsuffix),
diff --git a/Golden_Repo/2019a/i/intel/intel-2019a.1.eb b/Golden_Repo/2019a/i/intel/intel-2019a.1.eb
index f918b3a7d..2ccf1f4f8 100644
--- a/Golden_Repo/2019a/i/intel/intel-2019a.1.eb
+++ b/Golden_Repo/2019a/i/intel/intel-2019a.1.eb
@@ -9,7 +9,7 @@ description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': '', 'name': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('iccifort', '2019.3.199', '-GCC-8.3.0'),
diff --git a/Golden_Repo/2019a/i/intel/intel-2019a.eb b/Golden_Repo/2019a/i/intel/intel-2019a.eb
index 91517c985..c90bd56c2 100644
--- a/Golden_Repo/2019a/i/intel/intel-2019a.eb
+++ b/Golden_Repo/2019a/i/intel/intel-2019a.eb
@@ -9,7 +9,7 @@ description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': '', 'name': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('iccifort', '2019.3.199', '-GCC-8.3.0'),
diff --git a/Golden_Repo/2019a/i/iomkl/iomkl-2019a.eb b/Golden_Repo/2019a/i/iomkl/iomkl-2019a.eb
index 92c14e758..2e1bf264d 100644
--- a/Golden_Repo/2019a/i/iomkl/iomkl-2019a.eb
+++ b/Golden_Repo/2019a/i/iomkl/iomkl-2019a.eb
@@ -14,7 +14,7 @@ description = """iomkl provides Intel C/C++ and Fortran compilers, ParaStationMP
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': '', 'name': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('iccifort', intelversion, intelsuffix),
diff --git a/Golden_Repo/2019a/i/iompi/iompi-2019a.eb b/Golden_Repo/2019a/i/iompi/iompi-2019a.eb
index 4d83f58c0..a954ddfa9 100644
--- a/Golden_Repo/2019a/i/iompi/iompi-2019a.eb
+++ b/Golden_Repo/2019a/i/iompi/iompi-2019a.eb
@@ -9,7 +9,7 @@ description = """Intel C/C++ and Fortran compilers, alongside ParaStationMPI.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compver = '2019.5.281'
gccsuffix = '-GCC-8.3.0'
diff --git a/Golden_Repo/2019a/i/ipp/ipp-2019.3.199.eb b/Golden_Repo/2019a/i/ipp/ipp-2019.3.199.eb
index 7c3ec5445..8bded803f 100644
--- a/Golden_Repo/2019a/i/ipp/ipp-2019.3.199.eb
+++ b/Golden_Repo/2019a/i/ipp/ipp-2019.3.199.eb
@@ -10,7 +10,7 @@ description = """Intel Integrated Performance Primitives (Intel IPP) is an exten
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['l_ipp_%(version)s.tgz']
diff --git a/Golden_Repo/2019a/i/ipp/ipp-2019.5.281.eb b/Golden_Repo/2019a/i/ipp/ipp-2019.5.281.eb
index 460a59b9b..8da19d354 100644
--- a/Golden_Repo/2019a/i/ipp/ipp-2019.5.281.eb
+++ b/Golden_Repo/2019a/i/ipp/ipp-2019.5.281.eb
@@ -10,7 +10,7 @@ description = """Intel Integrated Performance Primitives (Intel IPP) is an exten
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['l_ipp_%(version)s.tgz']
diff --git a/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a-mt.eb b/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a-mt.eb
index 9e5115001..4bd80ee60 100644
--- a/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a-mt.eb
+++ b/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a-mt.eb
@@ -10,7 +10,7 @@ description = """Intel C/C++ and Fortran compilers, alongside ParaStationMPI.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compver = '2019.3.199'
gccsuffix = '-GCC-8.3.0'
diff --git a/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.1-mt.eb b/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.1-mt.eb
index 8992f0b52..5965dbb87 100644
--- a/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.1-mt.eb
+++ b/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.1-mt.eb
@@ -10,7 +10,7 @@ description = """Intel C/C++ and Fortran compilers, alongside ParaStationMPI.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compver = '2019.5.281'
gccsuffix = '-GCC-8.3.0'
diff --git a/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.1.eb b/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.1.eb
index 395ef96a8..01b3eb81e 100644
--- a/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.1.eb
+++ b/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.1.eb
@@ -9,7 +9,7 @@ description = """Intel C/C++ and Fortran compilers, alongside ParaStationMPI.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compver = '2019.5.281'
gccsuffix = '-GCC-8.3.0'
diff --git a/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.eb b/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.eb
index 9f8ac0f1b..914ef929b 100644
--- a/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.eb
+++ b/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.eb
@@ -9,7 +9,7 @@ description = """Intel C/C++ and Fortran compilers, alongside ParaStationMPI.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compver = '2019.3.199'
gccsuffix = '-GCC-8.3.0'
diff --git a/Golden_Repo/2019a/i/ispc/ispc-1.10.0.eb b/Golden_Repo/2019a/i/ispc/ispc-1.10.0.eb
index 75bfb5e2e..cf78504f6 100644
--- a/Golden_Repo/2019a/i/ispc/ispc-1.10.0.eb
+++ b/Golden_Repo/2019a/i/ispc/ispc-1.10.0.eb
@@ -14,7 +14,7 @@ description = """Intel SPMD Program Compilers; An open-source compiler for high-
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['ispc-v%(version)s-linux.tar.gz']
source_urls = [('http://sourceforge.net/projects/ispcmirror/files/v%(version)s', 'download')]
diff --git a/Golden_Repo/2019a/i/itac/itac-2019.3.032.eb b/Golden_Repo/2019a/i/itac/itac-2019.3.032.eb
index 4268e40db..94747a3f1 100644
--- a/Golden_Repo/2019a/i/itac/itac-2019.3.032.eb
+++ b/Golden_Repo/2019a/i/itac/itac-2019.3.032.eb
@@ -25,7 +25,7 @@ usage = """
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['l_itac_p_%(version)s.tgz']
diff --git a/Golden_Repo/2019a/i/itac/itac-2019.5.041.eb b/Golden_Repo/2019a/i/itac/itac-2019.5.041.eb
index 4464307f3..fd1493f40 100644
--- a/Golden_Repo/2019a/i/itac/itac-2019.5.041.eb
+++ b/Golden_Repo/2019a/i/itac/itac-2019.5.041.eb
@@ -25,7 +25,7 @@ usage = """
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['l_itac_p_%(version)s.tgz']
diff --git a/Golden_Repo/2019a/j/JUBE/JUBE-2.2.2.eb b/Golden_Repo/2019a/j/JUBE/JUBE-2.2.2.eb
index 63448dfa2..207377a16 100644
--- a/Golden_Repo/2019a/j/JUBE/JUBE-2.2.2.eb
+++ b/Golden_Repo/2019a/j/JUBE/JUBE-2.2.2.eb
@@ -10,7 +10,7 @@ run those sets on different computer systems and evaluate the results.
site_contacts = 's.luehrs@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = ['http://apps.fz-juelich.de/jsc/jube/jube2/download.php?file=']
sources = [SOURCE_TAR_GZ]
diff --git a/Golden_Repo/2019a/j/JUnit/JUnit-4.12.eb b/Golden_Repo/2019a/j/JUnit/JUnit-4.12.eb
index 5840c3419..605a8e15a 100644
--- a/Golden_Repo/2019a/j/JUnit/JUnit-4.12.eb
+++ b/Golden_Repo/2019a/j/JUnit/JUnit-4.12.eb
@@ -8,7 +8,7 @@ description = """A programmer-oriented testing framework for Java."""
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = ['%(namelower)s-%(version)s.jar']
source_urls = ['http://search.maven.org/remotecontent?filepath=junit/junit/%(version)s/']
diff --git a/Golden_Repo/2019a/j/Java/Java-1.8.eb b/Golden_Repo/2019a/j/Java/Java-1.8.eb
index 59e301b06..338c5a7a2 100644
--- a/Golden_Repo/2019a/j/Java/Java-1.8.eb
+++ b/Golden_Repo/2019a/j/Java/Java-1.8.eb
@@ -8,7 +8,7 @@ description = """Java Platform, Standard Edition (Java SE) lets you develop and
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
# download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html
(vp, vs) = realversion.split('_')
diff --git a/Golden_Repo/2019a/jusuf_overlay/i/iimpi/iimpi-2019a.eb b/Golden_Repo/2019a/jusuf_overlay/i/iimpi/iimpi-2019a.eb
index 2a738cfb2..8270157de 100644
--- a/Golden_Repo/2019a/jusuf_overlay/i/iimpi/iimpi-2019a.eb
+++ b/Golden_Repo/2019a/jusuf_overlay/i/iimpi/iimpi-2019a.eb
@@ -9,7 +9,7 @@ description = """Intel C/C++ and Fortran compilers, alongside Intel MPI.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compver = '2019.5.281'
mpiver = '2019.6.154'
diff --git a/Golden_Repo/2019a/jusuf_overlay/i/imkl/imkl-2019.5.281.eb b/Golden_Repo/2019a/jusuf_overlay/i/imkl/imkl-2019.5.281.eb
index f8a9289af..97d3aa720 100644
--- a/Golden_Repo/2019a/jusuf_overlay/i/imkl/imkl-2019.5.281.eb
+++ b/Golden_Repo/2019a/jusuf_overlay/i/imkl/imkl-2019.5.281.eb
@@ -10,7 +10,7 @@ description = """Intel Math Kernel Library is a library of highly optimized,
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': 'dummy', 'name': 'dummy'}
+toolchain = SYSTEM
sources = ['l_mkl_%(version)s.tgz']
diff --git a/Golden_Repo/2019a/jusuf_overlay/i/intel-para/intel-para-2019a-mt.eb b/Golden_Repo/2019a/jusuf_overlay/i/intel-para/intel-para-2019a-mt.eb
index 932ac1ae3..7f5183790 100644
--- a/Golden_Repo/2019a/jusuf_overlay/i/intel-para/intel-para-2019a-mt.eb
+++ b/Golden_Repo/2019a/jusuf_overlay/i/intel-para/intel-para-2019a-mt.eb
@@ -13,7 +13,7 @@ description = """intel-para provides Intel C/C++ and Fortran compilers, ParaStat
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': '', 'name': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('iccifort', intelversion, intelsuffix),
diff --git a/Golden_Repo/2019a/jusuf_overlay/i/intel-para/intel-para-2019a.eb b/Golden_Repo/2019a/jusuf_overlay/i/intel-para/intel-para-2019a.eb
index e7acc57d3..e6415cbb6 100644
--- a/Golden_Repo/2019a/jusuf_overlay/i/intel-para/intel-para-2019a.eb
+++ b/Golden_Repo/2019a/jusuf_overlay/i/intel-para/intel-para-2019a.eb
@@ -13,7 +13,7 @@ description = """intel-para provides Intel C/C++ and Fortran compilers, ParaStat
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': '', 'name': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('iccifort', intelversion, intelsuffix),
diff --git a/Golden_Repo/2019a/jusuf_overlay/i/ipsmpi/ipsmpi-2019a-mt.eb b/Golden_Repo/2019a/jusuf_overlay/i/ipsmpi/ipsmpi-2019a-mt.eb
index 9ffceee5e..aa8340677 100644
--- a/Golden_Repo/2019a/jusuf_overlay/i/ipsmpi/ipsmpi-2019a-mt.eb
+++ b/Golden_Repo/2019a/jusuf_overlay/i/ipsmpi/ipsmpi-2019a-mt.eb
@@ -10,7 +10,7 @@ description = """Intel C/C++ and Fortran compilers, alongside ParaStationMPI.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compver = '2019.5.281'
gccsuffix = '-GCC-8.3.0'
diff --git a/Golden_Repo/2019a/jusuf_overlay/i/ipsmpi/ipsmpi-2019a.eb b/Golden_Repo/2019a/jusuf_overlay/i/ipsmpi/ipsmpi-2019a.eb
index 8b1007801..0af58ba15 100644
--- a/Golden_Repo/2019a/jusuf_overlay/i/ipsmpi/ipsmpi-2019a.eb
+++ b/Golden_Repo/2019a/jusuf_overlay/i/ipsmpi/ipsmpi-2019a.eb
@@ -9,7 +9,7 @@ description = """Intel C/C++ and Fortran compilers, alongside ParaStationMPI.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compver = '2019.5.281'
gccsuffix = '-GCC-8.3.0'
diff --git a/Golden_Repo/2019a/jusuf_overlay/j/JUBE/JUBE-2.3.0.eb b/Golden_Repo/2019a/jusuf_overlay/j/JUBE/JUBE-2.3.0.eb
index dc757b4d9..a06c26c80 100644
--- a/Golden_Repo/2019a/jusuf_overlay/j/JUBE/JUBE-2.3.0.eb
+++ b/Golden_Repo/2019a/jusuf_overlay/j/JUBE/JUBE-2.3.0.eb
@@ -10,7 +10,7 @@ run those sets on different computer systems and evaluate the results.
site_contacts = 's.luehrs@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = ['http://apps.fz-juelich.de/jsc/jube/jube2/download.php?file=']
sources = [SOURCE_TAR_GZ]
diff --git a/Golden_Repo/2019a/jusuf_overlay/n/nvidia/nvidia-driver.eb b/Golden_Repo/2019a/jusuf_overlay/n/nvidia/nvidia-driver.eb
index 8da09561c..6de9c8f3b 100644
--- a/Golden_Repo/2019a/jusuf_overlay/n/nvidia/nvidia-driver.eb
+++ b/Golden_Repo/2019a/jusuf_overlay/n/nvidia/nvidia-driver.eb
@@ -7,7 +7,7 @@ description = """This is a set of libraries normally installed by the NVIDIA dri
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = [
'http://us.download.nvidia.com/tesla/%s/' % realversion,
diff --git a/Golden_Repo/2019a/juwels_overlay/a/ARMForge/ARMForge-19.0.4.eb b/Golden_Repo/2019a/juwels_overlay/a/ARMForge/ARMForge-19.0.4.eb
index cf34d3d6c..d201701f8 100644
--- a/Golden_Repo/2019a/juwels_overlay/a/ARMForge/ARMForge-19.0.4.eb
+++ b/Golden_Repo/2019a/juwels_overlay/a/ARMForge/ARMForge-19.0.4.eb
@@ -17,7 +17,7 @@ For the ARM DDT and MAP User Guide, please see: "$EBROOTARMFORGE/doc/userguide.p
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': 'dummy', 'name': 'dummy'}
+toolchain = SYSTEM
sources = ['arm-forge-%(version)s-Redhat-7.0-x86_64.tar']
#http://content.allinea.com/downloads/allinea-tools-4.2-PR-39422-Redhat-6.0-x86_64.tar
diff --git a/Golden_Repo/2019a/juwels_overlay/a/ARMPerformanceReports/ARMPerformanceReports-19.0.4.eb b/Golden_Repo/2019a/juwels_overlay/a/ARMPerformanceReports/ARMPerformanceReports-19.0.4.eb
index 3e2e8e04e..d3a300404 100644
--- a/Golden_Repo/2019a/juwels_overlay/a/ARMPerformanceReports/ARMPerformanceReports-19.0.4.eb
+++ b/Golden_Repo/2019a/juwels_overlay/a/ARMPerformanceReports/ARMPerformanceReports-19.0.4.eb
@@ -20,7 +20,7 @@ will be created in the current directory on completion.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': 'dummy', 'name': 'dummy'}
+toolchain = SYSTEM
sources = ['arm-reports-%(version)s-Redhat-7.0-x86_64.tar']
source_urls = ['http://content.allinea.com/downloads/']
diff --git a/Golden_Repo/2019a/juwels_overlay/p/pmvmklc/pmvmklc-2019a-GDR.eb b/Golden_Repo/2019a/juwels_overlay/p/pmvmklc/pmvmklc-2019a-GDR.eb
index 325b80877..2cf1a3dad 100644
--- a/Golden_Repo/2019a/juwels_overlay/p/pmvmklc/pmvmklc-2019a-GDR.eb
+++ b/Golden_Repo/2019a/juwels_overlay/p/pmvmklc/pmvmklc-2019a-GDR.eb
@@ -10,7 +10,7 @@ description = """ PGI based compiler toolchain,
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
comp_name = 'PGI'
comp_version = '19.3-GCC-8.3.0'
diff --git a/Golden_Repo/2019a/juwels_overlay/v/Vampir/Vampir-9.6.1.eb b/Golden_Repo/2019a/juwels_overlay/v/Vampir/Vampir-9.6.1.eb
index 9d13fc848..e4b50646d 100644
--- a/Golden_Repo/2019a/juwels_overlay/v/Vampir/Vampir-9.6.1.eb
+++ b/Golden_Repo/2019a/juwels_overlay/v/Vampir/Vampir-9.6.1.eb
@@ -21,7 +21,7 @@ description = """The VAMPIR software tool provides an easy-to-use framework that
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['vampir-%s%s-setup.bin' % (version, archsuffix)]
diff --git a/Golden_Repo/2019a/knl_overlay/i/impi-settings/impi-settings-2019-default.eb b/Golden_Repo/2019a/knl_overlay/i/impi-settings/impi-settings-2019-default.eb
index 57c502e70..300344b46 100644
--- a/Golden_Repo/2019a/knl_overlay/i/impi-settings/impi-settings-2019-default.eb
+++ b/Golden_Repo/2019a/knl_overlay/i/impi-settings/impi-settings-2019-default.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the default IntelMPI configuration"""
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/knl_overlay/l/libfabric/libfabric-1.9.0.eb b/Golden_Repo/2019a/knl_overlay/l/libfabric/libfabric-1.9.0.eb
index f739f3c3e..b588c7cb0 100644
--- a/Golden_Repo/2019a/knl_overlay/l/libfabric/libfabric-1.9.0.eb
+++ b/Golden_Repo/2019a/knl_overlay/l/libfabric/libfabric-1.9.0.eb
@@ -8,7 +8,7 @@ description = """libfabric"""
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = ['https://github.com/ofiwg/libfabric/releases/download/v%(version)s/']
sources = [SOURCELOWER_TAR_BZ2]
diff --git a/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.2-default.eb b/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.2-default.eb
index dc2ecb9f2..86ac40e06 100644
--- a/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.2-default.eb
+++ b/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.2-default.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the default ParaStationMPI configurati
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.2-mt-default.eb b/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.2-mt-default.eb
index da0250abc..16eb0a7d0 100644
--- a/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.2-mt-default.eb
+++ b/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.2-mt-default.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the default ParaStationMPI configurati
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.4-default.eb b/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.4-default.eb
index e18f4e6f0..de8c90a4c 100644
--- a/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.4-default.eb
+++ b/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.4-default.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the default ParaStationMPI configurati
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-default.eb b/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-default.eb
index c6c09a6c8..87f4cbff4 100644
--- a/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-default.eb
+++ b/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-default.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the default ParaStationMPI configurati
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/l/libtool/libtool-2.4.6.eb b/Golden_Repo/2019a/l/libtool/libtool-2.4.6.eb
index be94f7ec3..87b5fa6d1 100644
--- a/Golden_Repo/2019a/l/libtool/libtool-2.4.6.eb
+++ b/Golden_Repo/2019a/l/libtool/libtool-2.4.6.eb
@@ -10,7 +10,7 @@ description = """GNU libtool is a generic library support script. Libtool hides
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = [SOURCELOWER_TAR_GZ]
source_urls = [GNU_SOURCE]
diff --git a/Golden_Repo/2019a/m/M4/M4-1.4.18.eb b/Golden_Repo/2019a/m/M4/M4-1.4.18.eb
index 49b942a67..d686b2eb0 100644
--- a/Golden_Repo/2019a/m/M4/M4-1.4.18.eb
+++ b/Golden_Repo/2019a/m/M4/M4-1.4.18.eb
@@ -12,7 +12,7 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = [SOURCELOWER_TAR_GZ]
source_urls = [GNU_SOURCE]
diff --git a/Golden_Repo/2019a/m/MVAPICH2-settings/MVAPICH2-2.3-GDR-default.eb b/Golden_Repo/2019a/m/MVAPICH2-settings/MVAPICH2-2.3-GDR-default.eb
index 82a0207ac..99738f023 100644
--- a/Golden_Repo/2019a/m/MVAPICH2-settings/MVAPICH2-2.3-GDR-default.eb
+++ b/Golden_Repo/2019a/m/MVAPICH2-settings/MVAPICH2-2.3-GDR-default.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the default MVAPICH2 GDR configuration
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/n/ncurses/ncurses-6.1.eb b/Golden_Repo/2019a/n/ncurses/ncurses-6.1.eb
index 4a7e3b6be..001f9ec66 100644
--- a/Golden_Repo/2019a/n/ncurses/ncurses-6.1.eb
+++ b/Golden_Repo/2019a/n/ncurses/ncurses-6.1.eb
@@ -11,7 +11,7 @@ description = """The Ncurses (new curses) library is a free software emulation o
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
toolchainopts = {'optarch': True, 'pic': True}
source_urls = [GNU_SOURCE]
diff --git a/Golden_Repo/2019a/n/numactl/numactl-2.0.12.eb b/Golden_Repo/2019a/n/numactl/numactl-2.0.12.eb
index 5e3a8bbc1..ba968214d 100644
--- a/Golden_Repo/2019a/n/numactl/numactl-2.0.12.eb
+++ b/Golden_Repo/2019a/n/numactl/numactl-2.0.12.eb
@@ -11,7 +11,7 @@ description = """The numactl program allows you to run your application program
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
source_urls = ['https://github.com/numactl/numactl/archive/']
sources = ['v%(version)s.tar.gz']
diff --git a/Golden_Repo/2019a/n/nvidia/nvidia-418.40.04.eb b/Golden_Repo/2019a/n/nvidia/nvidia-418.40.04.eb
index 0ff26a19d..5c70c75ac 100644
--- a/Golden_Repo/2019a/n/nvidia/nvidia-418.40.04.eb
+++ b/Golden_Repo/2019a/n/nvidia/nvidia-418.40.04.eb
@@ -6,7 +6,7 @@ description = """This is a set of libraries normally installed by the NVIDIA dri
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = [
'http://us.download.nvidia.com/tesla/%(version)s/',
diff --git a/Golden_Repo/2019a/n/nvidia/nvidia-418.87.00.eb b/Golden_Repo/2019a/n/nvidia/nvidia-418.87.00.eb
index cea2ddb57..e65755758 100644
--- a/Golden_Repo/2019a/n/nvidia/nvidia-418.87.00.eb
+++ b/Golden_Repo/2019a/n/nvidia/nvidia-418.87.00.eb
@@ -6,7 +6,7 @@ description = """This is a set of libraries normally installed by the NVIDIA dri
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = [
'http://us.download.nvidia.com/tesla/%(version)s/',
diff --git a/Golden_Repo/2019a/n/nvidia/nvidia-driver.eb b/Golden_Repo/2019a/n/nvidia/nvidia-driver.eb
index 113c5fda8..a864b2004 100644
--- a/Golden_Repo/2019a/n/nvidia/nvidia-driver.eb
+++ b/Golden_Repo/2019a/n/nvidia/nvidia-driver.eb
@@ -7,7 +7,7 @@ description = """This is a set of libraries normally installed by the NVIDIA dri
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = [
'http://us.download.nvidia.com/tesla/%s/' % realversion,
diff --git a/Golden_Repo/2019a/p/PGI/PGI-19.10-GCC-8.3.0.eb b/Golden_Repo/2019a/p/PGI/PGI-19.10-GCC-8.3.0.eb
index dbda3e86d..23ac1fd2f 100644
--- a/Golden_Repo/2019a/p/PGI/PGI-19.10-GCC-8.3.0.eb
+++ b/Golden_Repo/2019a/p/PGI/PGI-19.10-GCC-8.3.0.eb
@@ -9,7 +9,7 @@ description = """C, C++ and Fortran compilers from The Portland Group - PGI"""
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = ['pgilinux-20%(version_major)s-%(version_major)s%(version_minor)s-x86-64.tar.gz']
diff --git a/Golden_Repo/2019a/p/PGI/PGI-19.3-GCC-8.3.0.eb b/Golden_Repo/2019a/p/PGI/PGI-19.3-GCC-8.3.0.eb
index 35c30c895..ff09299ae 100644
--- a/Golden_Repo/2019a/p/PGI/PGI-19.3-GCC-8.3.0.eb
+++ b/Golden_Repo/2019a/p/PGI/PGI-19.3-GCC-8.3.0.eb
@@ -9,7 +9,7 @@ description = """C, C++ and Fortran compilers from The Portland Group - PGI"""
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = ['pgilinux-20%(version_major)s-%(version_major)s%(version_minor)s-x86-64.tar.gz']
diff --git a/Golden_Repo/2019a/p/Panoply/Panoply-4.10.5.eb b/Golden_Repo/2019a/p/Panoply/Panoply-4.10.5.eb
index b926102b2..df3831c92 100644
--- a/Golden_Repo/2019a/p/Panoply/Panoply-4.10.5.eb
+++ b/Golden_Repo/2019a/p/Panoply/Panoply-4.10.5.eb
@@ -8,7 +8,7 @@ description = "Panoply plots geo-referenced and other arrays from netCDF, HDF, G
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = ['%(name)sJ-%(version)s.tgz']
source_urls = ['https://www.giss.nasa.gov/tools/panoply/download/']
diff --git a/Golden_Repo/2019a/p/pandoc/pandoc-2.7.2.eb b/Golden_Repo/2019a/p/pandoc/pandoc-2.7.2.eb
index 23110295b..465675d0a 100644
--- a/Golden_Repo/2019a/p/pandoc/pandoc-2.7.2.eb
+++ b/Golden_Repo/2019a/p/pandoc/pandoc-2.7.2.eb
@@ -13,7 +13,7 @@ description = "If you need to convert files from one markup format into another,
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
source_urls = ['https://github.com/jgm/pandoc/releases/download/%(version)s/']
sources = ['%(name)s-%(version)s-linux.tar.gz']
diff --git a/Golden_Repo/2019a/p/pkg-config/pkg-config-0.29.2.eb b/Golden_Repo/2019a/p/pkg-config/pkg-config-0.29.2.eb
index 05a3fed51..3594e4a89 100644
--- a/Golden_Repo/2019a/p/pkg-config/pkg-config-0.29.2.eb
+++ b/Golden_Repo/2019a/p/pkg-config/pkg-config-0.29.2.eb
@@ -12,7 +12,7 @@ description = """pkg-config is a helper tool used when compiling applications an
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = [SOURCELOWER_TAR_GZ]
source_urls = ['http://pkgconfig.freedesktop.org/releases/']
diff --git a/Golden_Repo/2019a/p/pmvapich2c/pmvapich2c-2019a-GDR.eb b/Golden_Repo/2019a/p/pmvapich2c/pmvapich2c-2019a-GDR.eb
index 15e781385..3745cbf47 100644
--- a/Golden_Repo/2019a/p/pmvapich2c/pmvapich2c-2019a-GDR.eb
+++ b/Golden_Repo/2019a/p/pmvapich2c/pmvapich2c-2019a-GDR.eb
@@ -9,7 +9,7 @@ description = """PGI based compiler toolchain, including CUDA and MVAPICH2 for C
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compname = 'PGI'
compver = '19.3'
diff --git a/Golden_Repo/2019a/p/pmvmklc/pmvmklc-2019a-GDR.eb b/Golden_Repo/2019a/p/pmvmklc/pmvmklc-2019a-GDR.eb
index 6e20fe4ee..5aa78f784 100644
--- a/Golden_Repo/2019a/p/pmvmklc/pmvmklc-2019a-GDR.eb
+++ b/Golden_Repo/2019a/p/pmvmklc/pmvmklc-2019a-GDR.eb
@@ -10,7 +10,7 @@ description = """ PGI based compiler toolchain,
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
comp_name = 'PGI'
comp_version = '19.3-GCC-8.3.0'
diff --git a/Golden_Repo/2019a/p/popt/popt-1.16.eb b/Golden_Repo/2019a/p/popt/popt-1.16.eb
index 764e66448..26a3e9f43 100644
--- a/Golden_Repo/2019a/p/popt/popt-1.16.eb
+++ b/Golden_Repo/2019a/p/popt/popt-1.16.eb
@@ -9,7 +9,7 @@ description = """Popt is a C library for parsing command line parameters.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': '', 'name': 'dummy'}
+toolchain = SYSTEM
sources = [SOURCE_TAR_GZ]
source_urls = ['http://rpm5.org/files/%(name)s/']
diff --git a/Golden_Repo/2019a/p/pscom/pscom-5.2-default.eb b/Golden_Repo/2019a/p/pscom/pscom-5.2-default.eb
index fa0628d3d..a47f79844 100644
--- a/Golden_Repo/2019a/p/pscom/pscom-5.2-default.eb
+++ b/Golden_Repo/2019a/p/pscom/pscom-5.2-default.eb
@@ -11,7 +11,7 @@ communication layer (MPI) and a sophisticated management layer.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = ['%%(name)s-%s.tar.gz' % realversion]
diff --git a/Golden_Repo/2019a/p/pscom/pscom-5.2.9-1-patched.eb b/Golden_Repo/2019a/p/pscom/pscom-5.2.9-1-patched.eb
index 91f2956ef..8d3dabf90 100644
--- a/Golden_Repo/2019a/p/pscom/pscom-5.2.9-1-patched.eb
+++ b/Golden_Repo/2019a/p/pscom/pscom-5.2.9-1-patched.eb
@@ -11,7 +11,7 @@ communication layer (MPI) and a sophisticated management layer.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = ['%s.zip' % version]
source_urls = ['https://github.com/ParaStation/%(name)s/archive/']
diff --git a/Golden_Repo/2019a/p/pscom/pscom-5.3.0-1_115_g12720ef_gateway.eb b/Golden_Repo/2019a/p/pscom/pscom-5.3.0-1_115_g12720ef_gateway.eb
index 5bfe8409b..d5485f3d4 100644
--- a/Golden_Repo/2019a/p/pscom/pscom-5.3.0-1_115_g12720ef_gateway.eb
+++ b/Golden_Repo/2019a/p/pscom/pscom-5.3.0-1_115_g12720ef_gateway.eb
@@ -12,7 +12,7 @@ communication layer (MPI) and a sophisticated management layer.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = ['%%(name)s-%s.tar.gz' % realversion]
diff --git a/Golden_Repo/2019a/p/pscom/pscom-Default.eb b/Golden_Repo/2019a/p/pscom/pscom-Default.eb
index 2c6aed577..ecbb9d0f6 100644
--- a/Golden_Repo/2019a/p/pscom/pscom-Default.eb
+++ b/Golden_Repo/2019a/p/pscom/pscom-Default.eb
@@ -11,7 +11,7 @@ communication layer (MPI) and a sophisticated management layer.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = ['%%(name)s-%s.tar.gz' % realversion]
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-UCX-RC.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-UCX-RC.eb
index 8eff75b00..eaee7633e 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-UCX-RC.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-UCX-RC.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-UCX-UD.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-UCX-UD.eb
index 2681244b0..02c7f8839 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-UCX-UD.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-UCX-UD.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-default.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-default.eb
index 34e850105..8edf2fa2b 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-default.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-default.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the default ParaStationMPI configurati
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-large-job-hybrid.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-large-job-hybrid.eb
index b8470f8f1..6f5cac9b5 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-large-job-hybrid.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-large-job-hybrid.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-large-job-mpi.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-large-job-mpi.eb
index a9a03ace9..e38a63fd0 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-large-job-mpi.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-large-job-mpi.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-UCX-RC.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-UCX-RC.eb
index a5ef4cee9..caa43e6f6 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-UCX-RC.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-UCX-RC.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-UCX-UD.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-UCX-UD.eb
index 6831ae9ba..417764505 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-UCX-UD.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-UCX-UD.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-default.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-default.eb
index 252f93b24..69ef05e21 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-default.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-default.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the default ParaStationMPI configurati
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-large-job-hybrid.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-large-job-hybrid.eb
index 4679b0af1..005d1bf8f 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-large-job-hybrid.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-large-job-hybrid.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-large-job-mpi.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-large-job-mpi.eb
index 0be2e5422..1ca83efd5 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-large-job-mpi.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-large-job-mpi.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-UCX-RC.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-UCX-RC.eb
index ffef7a2dd..7b3ebd0a9 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-UCX-RC.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-UCX-RC.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-UCX-UD.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-UCX-UD.eb
index 960d1f272..cabeaa0e7 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-UCX-UD.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-UCX-UD.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-default.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-default.eb
index e18f4e6f0..de8c90a4c 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-default.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-default.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the default ParaStationMPI configurati
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-large-job-hybrid.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-large-job-hybrid.eb
index 03e059f6b..8e281e39b 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-large-job-hybrid.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-large-job-hybrid.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-large-job-mpi.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-large-job-mpi.eb
index 6964ab35b..dd35bcacd 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-large-job-mpi.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-large-job-mpi.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-UCX-RC.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-UCX-RC.eb
index 6c4cf7d55..936c58df3 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-UCX-RC.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-UCX-RC.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-UCX-UD.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-UCX-UD.eb
index fa2a4c368..2a51d538a 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-UCX-UD.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-UCX-UD.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-default.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-default.eb
index c6c09a6c8..87f4cbff4 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-default.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-default.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the default ParaStationMPI configurati
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-large-job-hybrid.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-large-job-hybrid.eb
index 019906632..768dbf340 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-large-job-hybrid.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-large-job-hybrid.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-large-job-mpi.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-large-job-mpi.eb
index e7f46f3fe..190091249 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-large-job-mpi.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-large-job-mpi.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/r/rpmrebuild/rpmrebuild-2.14.eb b/Golden_Repo/2019a/r/rpmrebuild/rpmrebuild-2.14.eb
index 4ac5adf86..f2c01e98f 100644
--- a/Golden_Repo/2019a/r/rpmrebuild/rpmrebuild-2.14.eb
+++ b/Golden_Repo/2019a/r/rpmrebuild/rpmrebuild-2.14.eb
@@ -17,7 +17,7 @@ description = """rpmrebuild is a tool to build an RPM file from a package that h
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': 'dummy', 'name': 'dummy'}
+toolchain = SYSTEM
source_urls = [SOURCEFORGE_SOURCE]
sources = [SOURCELOWER_TAR_GZ]
diff --git a/Golden_Repo/2019a/t/TotalView/TotalView-2019.0.4.eb b/Golden_Repo/2019a/t/TotalView/TotalView-2019.0.4.eb
index e24e9f892..5f32536e4 100644
--- a/Golden_Repo/2019a/t/TotalView/TotalView-2019.0.4.eb
+++ b/Golden_Repo/2019a/t/TotalView/TotalView-2019.0.4.eb
@@ -37,7 +37,7 @@ description = """TotalView breaks down barriers to understanding what's going on
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = [
'%(namelower)s_%(version)s_linux_x86-64.tar',
diff --git a/Golden_Repo/2019a/t/tbb/tbb-2019.4.199.eb b/Golden_Repo/2019a/t/tbb/tbb-2019.4.199.eb
index 3e101f1d6..0125e0514 100644
--- a/Golden_Repo/2019a/t/tbb/tbb-2019.4.199.eb
+++ b/Golden_Repo/2019a/t/tbb/tbb-2019.4.199.eb
@@ -11,7 +11,7 @@ applications that tap into the power and performance of multicore and manycore h
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
year = version.split('.')[0]
update = version.split('.')[1]
diff --git a/Golden_Repo/2019a/t/tbb/tbb-2019.8.281.eb b/Golden_Repo/2019a/t/tbb/tbb-2019.8.281.eb
index 7f6c0b8fa..555ee8238 100644
--- a/Golden_Repo/2019a/t/tbb/tbb-2019.8.281.eb
+++ b/Golden_Repo/2019a/t/tbb/tbb-2019.8.281.eb
@@ -11,7 +11,7 @@ applications that tap into the power and performance of multicore and manycore h
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
year = version.split('.')[0]
update = version.split('.')[1]
diff --git a/Golden_Repo/2019a/u/UCX/UCX-1.6.1.eb b/Golden_Repo/2019a/u/UCX/UCX-1.6.1.eb
index 122be892f..e4cad76b0 100644
--- a/Golden_Repo/2019a/u/UCX/UCX-1.6.1.eb
+++ b/Golden_Repo/2019a/u/UCX/UCX-1.6.1.eb
@@ -13,7 +13,7 @@ and high-performance applications
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
toolchainopts = {'pic': True}
source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s%(versionsuffix)s']
diff --git a/Golden_Repo/2019a/u/UCX/UCX-1.7.0.eb b/Golden_Repo/2019a/u/UCX/UCX-1.7.0.eb
index 2a7f38b05..0d573ab28 100644
--- a/Golden_Repo/2019a/u/UCX/UCX-1.7.0.eb
+++ b/Golden_Repo/2019a/u/UCX/UCX-1.7.0.eb
@@ -13,7 +13,7 @@ and high-performance applications
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
toolchainopts = {'pic': True}
source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s%(versionsuffix)s']
diff --git a/Golden_Repo/2019a/v/VTune/VTune-2019_update3.eb b/Golden_Repo/2019a/v/VTune/VTune-2019_update3.eb
index da4f2ca7c..d1faf126f 100644
--- a/Golden_Repo/2019a/v/VTune/VTune-2019_update3.eb
+++ b/Golden_Repo/2019a/v/VTune/VTune-2019_update3.eb
@@ -6,7 +6,7 @@ description = 'Intel VTune Amplifier is the premier performance profiler for C,
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['vtune_amplifier_%(version)s.tar.gz']
diff --git a/Golden_Repo/2019a/v/VTune/VTune-2019_update6.eb b/Golden_Repo/2019a/v/VTune/VTune-2019_update6.eb
index 38851311e..b1bfbd66a 100644
--- a/Golden_Repo/2019a/v/VTune/VTune-2019_update6.eb
+++ b/Golden_Repo/2019a/v/VTune/VTune-2019_update6.eb
@@ -6,7 +6,7 @@ description = 'Intel VTune Amplifier is the premier performance profiler for C,
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['vtune_amplifier_%(version)s.tar.gz']
diff --git a/Golden_Repo/2019a/v/Vampir/Vampir-9.6.1.eb b/Golden_Repo/2019a/v/Vampir/Vampir-9.6.1.eb
index 4198e6205..ff39cc978 100644
--- a/Golden_Repo/2019a/v/Vampir/Vampir-9.6.1.eb
+++ b/Golden_Repo/2019a/v/Vampir/Vampir-9.6.1.eb
@@ -21,7 +21,7 @@ description = """The VAMPIR software tool provides an easy-to-use framework that
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['vampir-%s%s-setup.bin' % (version, archsuffix)]
diff --git a/Golden_Repo/2019a/z/zlib/zlib-1.2.11.eb b/Golden_Repo/2019a/z/zlib/zlib-1.2.11.eb
index 4258d4c24..ae1f3363a 100644
--- a/Golden_Repo/2019a/z/zlib/zlib-1.2.11.eb
+++ b/Golden_Repo/2019a/z/zlib/zlib-1.2.11.eb
@@ -11,12 +11,12 @@ description = """zlib is designed to be a free, general-purpose, legally unencum
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = [SOURCELOWER_TAR_GZ]
source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s', 'download')]
-# need to take care of $CFLAGS ourselves with dummy toolchain
+# need to take care of $CFLAGS ourselves with system toolchain
# we need to add -fPIC, but should also include -O* option to avoid compiling with -O0 (default for GCC)
buildopts = 'CFLAGS="-O2 -fPIC"'
--
GitLab