From b18ada9559af257ebd93fc55525c59be136e0555 Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Tue, 21 May 2024 23:04:45 +0200 Subject: [PATCH 1/3] rebuild NESSI-extend (3rd attempt) --- EESSI-extend-2023.06-easybuild.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EESSI-extend-2023.06-easybuild.eb b/EESSI-extend-2023.06-easybuild.eb index d514293706..3735b3d31f 100644 --- a/EESSI-extend-2023.06-easybuild.eb +++ b/EESSI-extend-2023.06-easybuild.eb @@ -42,7 +42,7 @@ description = """ toolchain = SYSTEM # All the dependencies we filter in NESSI -local_deps_to_filter = "Autoconf,Automake,Autotools,binutils,bzip2,DBus,flex,gettext,gperf,help2man,intltool,libreadline,libtool,M4,makeinfo,ncurses,util-linux,XZ,zlib" +local_deps_to_filter = "Autoconf,Automake,Autotools,binutils,bzip2,DBus,flex,gettext,gperf,help2man,intltool,libreadline,libtool,M4,makeinfo,ncurses,util-linux,XZ,zlib,PSM2" local_arch_specific_deps_to_filter = {'aarch64': ',yasm', 'x86_64': ''} local_deps_to_filter += local_arch_specific_deps_to_filter[ARCH] From bdcb22ec27ab506c76799a4f06f74fecaf2077d5 Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Tue, 21 May 2024 23:18:17 +0200 Subject: [PATCH 2/3] need addition to get it into diff file --- .../pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-001-system.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-001-system.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-001-system.yml index 46ac979719..63f8804820 100644 --- a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-001-system.yml +++ b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-001-system.yml @@ -3,3 +3,4 @@ easyconfigs: options: from-pr: 20299 - EESSI-extend-2023.06-easybuild.eb +# comment to trigger rebuild From 63c15c5cd11be4540e4e70f41d03f7ea772355ed Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Tue, 21 May 2024 23:25:56 +0200 Subject: [PATCH 3/3] fix ec file for NESSI-extend module --- EESSI-extend-2023.06-easybuild.eb | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/EESSI-extend-2023.06-easybuild.eb b/EESSI-extend-2023.06-easybuild.eb index 3735b3d31f..cdea2e58e4 100644 --- a/EESSI-extend-2023.06-easybuild.eb +++ b/EESSI-extend-2023.06-easybuild.eb @@ -95,19 +95,7 @@ elseif (os.getenv("NESSI_SITE_INSTALL") ~= nil) then if ((os.getenv("NESSI_PROJECT_INSTALL") ~= nil) or (os.getenv("NESSI_USER_INSTALL") ~= nil)) then LmodError("You cannot use NESSI_SITE_INSTALL in combination with any other NESSI_*_INSTALL environment variables") end - site_install = os.getenv("NESSI_SITE_INSTALL") - site_modulepath = nil - if (site_install ~= nil) then - -- Check the folder exists - if not isDir(site_install) then - LmodError("The location of NESSI_SITE_INSTALL (" .. site_install .. ") does not exist or is not a folder") - end - if (mode() == "load") then - LmodMessage("Configuring for use of NESSI_SITE_INSTALL under " .. site_install) - end - easybuild_installpath = string.gsub(os.getenv("EESSI_SOFTWARE_PATH"), os.getenv("EESSI_CVMFS_REPO"), site_install) - site_modulepath = pathJoin(easybuild_installpath, 'modules', 'all') - end + easybuild_installpath = string.gsub(os.getenv("EESSI_SOFTWARE_PATH"), 'versions', 'host_injections') else -- Deal with user and project installs project_install = os.getenv("NESSI_PROJECT_INSTALL")