From b4b561139435064ba0b97a581a9861304b4d7d21 Mon Sep 17 00:00:00 2001 From: TopRichard Date: Thu, 6 Jul 2023 07:13:50 +0000 Subject: [PATCH 1/3] {2023.06}[foss/2021a] RStudio-Server V1.4.1717-Java-11-R V4.1.0 --- eessi-2023.06-eb-4.7.2-2021a.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eessi-2023.06-eb-4.7.2-2021a.yml b/eessi-2023.06-eb-4.7.2-2021a.yml index c0fa353475..906d69bd28 100644 --- a/eessi-2023.06-eb-4.7.2-2021a.yml +++ b/eessi-2023.06-eb-4.7.2-2021a.yml @@ -13,3 +13,4 @@ easyconfigs: # see https://github.com/easybuilders/easybuild-easyconfigs/pull/18087 options: from-pr: 18087 + - RStudio-Server-1.4.1717-foss-2021a-Java-11-R-4.1.0.eb From 374e772cc964dc95cb900ee79649768292687940 Mon Sep 17 00:00:00 2001 From: TopRichard Date: Thu, 6 Jul 2023 08:01:14 +0000 Subject: [PATCH 2/3] added reference to java easyblock 2557 --- eessi-2023.06-eb-4.7.2-2021a.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eessi-2023.06-eb-4.7.2-2021a.yml b/eessi-2023.06-eb-4.7.2-2021a.yml index 906d69bd28..9d893d7a81 100644 --- a/eessi-2023.06-eb-4.7.2-2021a.yml +++ b/eessi-2023.06-eb-4.7.2-2021a.yml @@ -13,4 +13,6 @@ easyconfigs: # see https://github.com/easybuilders/easybuild-easyconfigs/pull/18087 options: from-pr: 18087 - - RStudio-Server-1.4.1717-foss-2021a-Java-11-R-4.1.0.eb + - RStudio-Server-1.4.1717-foss-2021a-Java-11-R-4.1.0.eb: + options: + include-easyblocks-from-pr: 2557 From 56d95b9643d4e139957886c77140847fffedcaeb Mon Sep 17 00:00:00 2001 From: TopRichard Date: Wed, 12 Jul 2023 05:30:34 +0000 Subject: [PATCH 3/3] added the Xvfb parse_hook --- eb_hooks.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/eb_hooks.py b/eb_hooks.py index 191e24678b..59fc7f935b 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -199,6 +199,15 @@ def parse_hook_ucx_eprefix(ec, eprefix): raise EasyBuildError("UCX-specific hook triggered for non-UCX easyconfig?!") +def parse_hook_xvfb_cp_permissions(ec, eprefix): + """Add user write permission to xvfb-run before copying it in the postinstallcmds.""" + if ec.name == 'Xvfb': + ec['postinstallcmds'] = ["chmod u+wx xvfb-run && cp -a xvfb-run %(installdir)s/bin/"] + print_msg("Using custom postinstallcmds for %s: %s", ec.name, ec['postinstallcmds']) + else: + raise EasyBuildError("Xvfb-specific hook triggered for non-Xvfb easyconfig?!") + + def pre_configure_hook(self, *args, **kwargs): """Main pre-configure hook: trigger custom functions based on software name.""" if self.name in PRE_CONFIGURE_HOOKS: @@ -265,6 +274,7 @@ def pre_configure_hook_wrf_aarch64(self, *args, **kwargs): 'OpenBLAS': parse_hook_openblas_relax_lapack_tests_num_errors, 'Qt5': parse_hook_qt5_check_qtwebengine_disable, 'UCX': parse_hook_ucx_eprefix, + 'Xvfb': parse_hook_xvfb_cp_permissions, } POST_PREPARE_HOOKS = {