From 09ec3e926891d0216d308bae047680aef677204f Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 5 Nov 2020 08:44:00 -0600 Subject: [PATCH] Update packages.yaml format references in packages (#19741) --- .../builtin/packages/apple-libunwind/package.py | 6 +++--- var/spack/repos/builtin/packages/fca/package.py | 11 ++++++----- var/spack/repos/builtin/packages/hcoll/package.py | 11 ++++++----- var/spack/repos/builtin/packages/jdk/package.py | 12 +++++++----- var/spack/repos/builtin/packages/lsf/package.py | 8 +++++--- var/spack/repos/builtin/packages/lustre/package.py | 8 +++++--- var/spack/repos/builtin/packages/mpt/package.py | 6 +++--- var/spack/repos/builtin/packages/mxm/package.py | 8 +++++--- var/spack/repos/builtin/packages/opengl/package.py | 10 ++++++---- var/spack/repos/builtin/packages/openglu/package.py | 10 ++++++---- 10 files changed, 52 insertions(+), 38 deletions(-) diff --git a/var/spack/repos/builtin/packages/apple-libunwind/package.py b/var/spack/repos/builtin/packages/apple-libunwind/package.py index 680560a99d..c966ee6c82 100644 --- a/var/spack/repos/builtin/packages/apple-libunwind/package.py +++ b/var/spack/repos/builtin/packages/apple-libunwind/package.py @@ -34,10 +34,10 @@ def fetcher(self): packages: apple-libunwind: - paths: - apple-libunwind@35.3: /usr buildable: False - + externals: + - spec: apple-libunwind@35.3 + prefix: /usr """ raise InstallError(msg) diff --git a/var/spack/repos/builtin/packages/fca/package.py b/var/spack/repos/builtin/packages/fca/package.py index ca91a43b4e..226ae4315b 100644 --- a/var/spack/repos/builtin/packages/fca/package.py +++ b/var/spack/repos/builtin/packages/fca/package.py @@ -19,11 +19,12 @@ class Fca(Package): # FCA needs to be added as an external package to SPACK. For this, the # config file packages.yaml needs to be adjusted: # - # fca: - # version: [2.5.2431] - # paths: - # fca@2.5.2431: /opt/mellanox/fca (path to your FCA installation) - # buildable: False + # packages: + # fca: + # buildable: False + # externals: + # - spec: fca@2.5.2431 + # prefix: /opt/mellanox/fca (path to your FCA installation) def install(self, spec, prefix): raise InstallError( diff --git a/var/spack/repos/builtin/packages/hcoll/package.py b/var/spack/repos/builtin/packages/hcoll/package.py index f39e2e7596..cdcfd4be16 100644 --- a/var/spack/repos/builtin/packages/hcoll/package.py +++ b/var/spack/repos/builtin/packages/hcoll/package.py @@ -19,11 +19,12 @@ class Hcoll(Package): # HCOLL needs to be added as an external package to SPACK. For this, the # config file packages.yaml needs to be adjusted: # - # hcoll: - # version: [3.9.1927] - # paths: - # hcoll@3.9.1927: /opt/mellanox/hcoll (path to your HCOLL installation) - # buildable: False + # packages: + # hcoll: + # buildable: False + # externals: + # - spec: hcoll@3.9.1927 + # prefix: /opt/mellanox/hcoll (path to your HCOLL installation) def install(self, spec, prefix): raise InstallError( diff --git a/var/spack/repos/builtin/packages/jdk/package.py b/var/spack/repos/builtin/packages/jdk/package.py index 31510d739e..9e05754416 100644 --- a/var/spack/repos/builtin/packages/jdk/package.py +++ b/var/spack/repos/builtin/packages/jdk/package.py @@ -155,11 +155,13 @@ def macos_check(self): and adding entries for each installation: packages: - jdk: - paths: - jdk@10.0.1_10: /path/to/jdk/Home - jdk@1.7.0_45-b18: /path/to/jdk/Home - buildable: False""".format(self.homepage) + jdk: + buildable: False + externals: + - spec: jdk@10.0.1_10 + prefix: /path/to/jdk/Home + - spec: jdk@1.7.0_45-b18 + prefix: /path/to/jdk/Home""".format(self.homepage) tty.die(msg) diff --git a/var/spack/repos/builtin/packages/lsf/package.py b/var/spack/repos/builtin/packages/lsf/package.py index 5c92693c4d..9f007fa237 100644 --- a/var/spack/repos/builtin/packages/lsf/package.py +++ b/var/spack/repos/builtin/packages/lsf/package.py @@ -17,11 +17,13 @@ class Lsf(Package): # LSF needs to be added as an external package to SPACK. For this, the # config file packages.yaml needs to be adjusted: + # + # packages: # lsf: - # version: [10.1] - # paths: - # lsf@10.1: /usr/local/lsf/10.1 (path to your LSF installation) # buildable: False + # externals: + # - spec: lsf@10.1 + # prefix: /usr/local/lsf/10.1 (path to your LSF installation) def install(self, spec, prefix): raise InstallError( diff --git a/var/spack/repos/builtin/packages/lustre/package.py b/var/spack/repos/builtin/packages/lustre/package.py index b3d4a6a7b7..fa7cb18704 100644 --- a/var/spack/repos/builtin/packages/lustre/package.py +++ b/var/spack/repos/builtin/packages/lustre/package.py @@ -27,11 +27,13 @@ def determine_version(cls, exe): # Lustre is filesystem and needs to be installed on system. # To have it as external package in SPACK, follow below: # config file packages.yaml needs to be adjusted: + # + # packages: # lustre: - # version: [2.12] - # paths: - # lustre@2.12: /usr (Usual Lustre library path) # buildable: False + # externals: + # - spec: lustre@2.12 + # prefix: /usr (Usual Lustre library path) def install(self, spec, prefix): raise InstallError( diff --git a/var/spack/repos/builtin/packages/mpt/package.py b/var/spack/repos/builtin/packages/mpt/package.py index 45dfce6ba5..b9634248c6 100644 --- a/var/spack/repos/builtin/packages/mpt/package.py +++ b/var/spack/repos/builtin/packages/mpt/package.py @@ -76,9 +76,9 @@ def fetcher(self): packages: mpt: - paths: - mpt@2.20: /opt/ buildable: False - + externals: + - spec: mpt@2.20 + prefix: /opt """ raise InstallError(msg) diff --git a/var/spack/repos/builtin/packages/mxm/package.py b/var/spack/repos/builtin/packages/mxm/package.py index 897f1c24b3..ba8c0dfa1c 100644 --- a/var/spack/repos/builtin/packages/mxm/package.py +++ b/var/spack/repos/builtin/packages/mxm/package.py @@ -18,11 +18,13 @@ class Mxm(Package): # MXM needs to be added as an external package to SPACK. For this, the # config file packages.yaml needs to be adjusted: + # + # packages: # mxm: - # version: [3.6.3104] - # paths: - # mxm@3.6.3104: /opt/mellanox/mxm (path to your MXM installation) # buildable: False + # externals: + # - spec: mxm@3.6.3104 + # prefix: /opt/mellanox/mxm (path to your MXM installation) def install(self, spec, prefix): raise InstallError( diff --git a/var/spack/repos/builtin/packages/opengl/package.py b/var/spack/repos/builtin/packages/opengl/package.py index c42939c928..8be03f2577 100644 --- a/var/spack/repos/builtin/packages/opengl/package.py +++ b/var/spack/repos/builtin/packages/opengl/package.py @@ -57,9 +57,10 @@ def fetcher(self): packages: opengl: - paths: - opengl@4.5.0: /opt/opengl buildable: False + externals: + - spec: opengl@4.5.0 + prefix: /opt/opengl In that case, /opt/opengl/ should contain these two folders: @@ -72,9 +73,10 @@ def fetcher(self): packages: opengl: - paths: - opengl@4.1: /usr/X11R6 buildable: False + externals: + - spec: opengl@4.1 + prefix: /usr/X11R6 In that case, /usr/X11R6 should contain diff --git a/var/spack/repos/builtin/packages/openglu/package.py b/var/spack/repos/builtin/packages/openglu/package.py index f4e5504a8e..77ddbce2b9 100644 --- a/var/spack/repos/builtin/packages/openglu/package.py +++ b/var/spack/repos/builtin/packages/openglu/package.py @@ -31,9 +31,10 @@ def fetcher(self): packages: openglu: - paths: - openglu@1.3: /opt/opengl buildable: False + externals: + - spec: openglu@1.3 + prefix: /opt/opengl In that case, /opt/opengl/ should contain these two folders: @@ -46,9 +47,10 @@ def fetcher(self): packages: openglu: - paths: - openglu@1.3: /usr/X11R6 buildable: False + externals: + - spec: openglu@1.3 + prefix: /usr/X11R6 In that case, /usr/X11R6 should contain