From 454848a55fffd44a242a28247f1491a7cfdacec4 Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Tue, 14 Mar 2017 15:00:00 +0100 Subject: [PATCH 1/9] initial version Signed-off-by: Tomas Tomecek --- toolchain.yaml | 122 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 toolchain.yaml diff --git a/toolchain.yaml b/toolchain.yaml new file mode 100644 index 0000000..b69e148 --- /dev/null +++ b/toolchain.yaml @@ -0,0 +1,122 @@ +# Document type identifier +document: modulemd +# Module metadata format version +version: 1 +data: + # Module name, optional + # Typically filled in by the buildsystem, using the VCS repository + # name as the name of the module. + name: toolchain + # Module update stream, optional + # Typically filled in by the buildsystem, using the VCS branch name + # as the name of the stream. + stream: 1 + # Module version, integer, optional, cannot be negative + # Typically filled in by the buildsystem, using the VCS commit + # timestamp. Module version defines upgrade path for the particular + # update stream. + version: 1 + # A short summary describing the module, required + summary: Platform for building C and C++ applications + # A verbose description of the module, required + description: > + Fedora variant of Developer Toolset's C/C++ Toolchain from Software Collections + # Module and content licenses in the Fedora license identifier + # format, required + license: + # Module license, required + # This list covers licenses used for the module metadata, SPEC + # files or extra patches + module: + - MIT + # Content license, optional + # A list of licenses used by the packages in the module. + # This should be populated by build tools. + content: [] + # Extensible metadata block + # A dictionary of user-defined keys and values. + # Optional. Defaults to an empty dictionary. + xmd: {} + # Module dependencies, if any. Optional. + # TODO: Provides, conflicts, obsoletes, recommends, etc. + # TODO: Stream name globbing or regular expression support + dependencies: + # Build dependencies of this module, optional + # Keys are module names, values are the stream names + # These modules define the buildroot for this module + buildrequires: + bootstrap: master + # Run-time dependencies of this module, optional + # Keys are module names, values are their stream names + requires: [] + # References to external resources, typically upstream, optional + references: + # Upstream community website, if it exists, optional + community: http://www.example.com/ + # Upstream documentation, if it exists, optional + documentation: http://www.example.com/ + # Upstream bug tracker, if it exists, optional + tracker: http://www.example.com/ + # Profiles define the end user's use cases for the module and consist + # of package lists of components to be installed by default if this + # module is enabled. The keys here are the profile names and contain + # package lists by component type. See the example. + # Optional, defaults to no profile definitions. + # TODO: Profiles deserve detailed documentation. + profiles: + # The default profile, used unless any other profile was selected. + # Optional, defaults to empty lists. + default: + rpms: + - gcc + - gcc-c++ + - gcc-gfortran + - gdb + - make + # Module API + # TODO: Define more API types + api: + # The module's public RPM-level API. + # A list of binary RPM names that are considered to be the + # main and stable feature of the module; binary RPMs not listed + # here are considered "unsupported" or "implementation details". + # In the example here we don't list the xyz package as it's only + # included as a dependency of xxx. However, we list a subpackage + # of bar, bar-extras. + # Optional, defaults to an empty list. + rpms: + - gcc + - gcc-c++ + - gcc-gfortran + - gdb + - make + # Module component filters + filter: + # RPM names not to be included in the module. + # By default, all built binary RPMs are included. In the example + # we exclude a subpackage of bar, bar-nonfoo from our module. + # Optional, defaults to an empty list. + rpms: [] + # Functional components of the module, optional + components: + # RPM content of the module, optional + # Keys are the VCS/SRPM names, values dictionaries holding + # additional information. + # TODO: Define architectures to build for + rpms: + gcc: + ref: f26 + gdb: + ref: f26 + make: + ref: f26 + gcc-gfortran: + ref: f26 + gcc-c++: + ref: f26 + # Module content of this module + # Included modules are built in the shared buildroot, together with + # other included content. Keys are module names, values additional + # component information. + # Optional + modules: {} From affd7c3a503a3b3577d888422030d251cda25544 Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Tue, 14 Mar 2017 16:02:27 +0100 Subject: [PATCH 2/9] add rationale Signed-off-by: Tomas Tomecek --- toolchain.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/toolchain.yaml b/toolchain.yaml index b69e148..5fe2e41 100644 --- a/toolchain.yaml +++ b/toolchain.yaml @@ -106,14 +106,19 @@ data: rpms: gcc: ref: f26 + retionale: API gdb: ref: f26 + retionale: API make: ref: f26 + retionale: API gcc-gfortran: ref: f26 + retionale: API gcc-c++: ref: f26 + retionale: API # Module content of this module # Included modules are built in the shared buildroot, together with # other included content. Keys are module names, values additional From ab317b21c8cf1202a997236731b4ecc0ddca637f Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Tue, 14 Mar 2017 16:05:16 +0100 Subject: [PATCH 3/9] typos, linter fixes Signed-off-by: Tomas Tomecek --- toolchain.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/toolchain.yaml b/toolchain.yaml index 5fe2e41..07172b7 100644 --- a/toolchain.yaml +++ b/toolchain.yaml @@ -20,7 +20,7 @@ data: summary: Platform for building C and C++ applications # A verbose description of the module, required description: > - Fedora variant of Developer Toolset's C/C++ Toolchain from Software Collections + Fedora variant of Developer Toolset's C/C++ Toolchain from Software Collections. # Module and content licenses in the Fedora license identifier # format, required license: @@ -106,19 +106,19 @@ data: rpms: gcc: ref: f26 - retionale: API + rationale: API. gdb: ref: f26 - retionale: API + rationale: API. make: ref: f26 - retionale: API + rationale: API. gcc-gfortran: ref: f26 - retionale: API + rationale: API. gcc-c++: ref: f26 - retionale: API + rationale: API. # Module content of this module # Included modules are built in the shared buildroot, together with # other included content. Keys are module names, values additional From 7d0f5143aea718dc7f7a6bc3eb9aac7adadc7275 Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Tue, 14 Mar 2017 16:07:18 +0100 Subject: [PATCH 4/9] correct stream Signed-off-by: Tomas Tomecek --- toolchain.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain.yaml b/toolchain.yaml index 07172b7..cfb26a9 100644 --- a/toolchain.yaml +++ b/toolchain.yaml @@ -10,7 +10,7 @@ data: # Module update stream, optional # Typically filled in by the buildsystem, using the VCS branch name # as the name of the stream. - stream: 1 + stream: master # Module version, integer, optional, cannot be negative # Typically filled in by the buildsystem, using the VCS commit # timestamp. Module version defines upgrade path for the particular From 3f2a647d3160d775306b5e3673a7c38b494d7cd5 Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Tue, 14 Mar 2017 16:42:21 +0100 Subject: [PATCH 5/9] bump version Signed-off-by: Tomas Tomecek --- toolchain.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain.yaml b/toolchain.yaml index cfb26a9..2471279 100644 --- a/toolchain.yaml +++ b/toolchain.yaml @@ -15,7 +15,7 @@ data: # Typically filled in by the buildsystem, using the VCS commit # timestamp. Module version defines upgrade path for the particular # update stream. - version: 1 + version: 2 # A short summary describing the module, required summary: Platform for building C and C++ applications # A verbose description of the module, required From 6e802bcdc5a2196218dd4e7a9a2a4898f275d8f3 Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Tue, 14 Mar 2017 16:47:22 +0100 Subject: [PATCH 6/9] trying to remove version Signed-off-by: Tomas Tomecek --- toolchain.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain.yaml b/toolchain.yaml index 2471279..fdc695a 100644 --- a/toolchain.yaml +++ b/toolchain.yaml @@ -15,7 +15,7 @@ data: # Typically filled in by the buildsystem, using the VCS commit # timestamp. Module version defines upgrade path for the particular # update stream. - version: 2 + # version: 2 # A short summary describing the module, required summary: Platform for building C and C++ applications # A verbose description of the module, required From 890eb531aa9f3e3937028ff29aac63551bdfc635 Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Tue, 14 Mar 2017 16:52:04 +0100 Subject: [PATCH 7/9] correct components list Signed-off-by: Tomas Tomecek --- toolchain.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/toolchain.yaml b/toolchain.yaml index fdc695a..16f604d 100644 --- a/toolchain.yaml +++ b/toolchain.yaml @@ -113,12 +113,6 @@ data: make: ref: f26 rationale: API. - gcc-gfortran: - ref: f26 - rationale: API. - gcc-c++: - ref: f26 - rationale: API. # Module content of this module # Included modules are built in the shared buildroot, together with # other included content. Keys are module names, values additional From 4082226afae8542b7fbafeeef21b4a4767af267f Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Tue, 14 Mar 2017 17:21:04 +0100 Subject: [PATCH 8/9] don't set name, stream is filled in by MBS Signed-off-by: Tomas Tomecek --- toolchain.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain.yaml b/toolchain.yaml index 16f604d..fb64bf7 100644 --- a/toolchain.yaml +++ b/toolchain.yaml @@ -6,11 +6,11 @@ data: # Module name, optional # Typically filled in by the buildsystem, using the VCS repository # name as the name of the module. - name: toolchain + # name: toolchain # Module update stream, optional # Typically filled in by the buildsystem, using the VCS branch name # as the name of the stream. - stream: master + # stream: master # Module version, integer, optional, cannot be negative # Typically filled in by the buildsystem, using the VCS commit # timestamp. Module version defines upgrade path for the particular From 3fc1cb057237da6f84ddc7aa6613143967a497e2 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Mon, 23 Sep 2019 17:01:24 -0500 Subject: [PATCH 9/9] Obsolete --- .gitignore | 0 dead.module | 1 + sources | 0 toolchain.yaml | 121 ------------------------------------------------- 4 files changed, 1 insertion(+), 121 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.module delete mode 100644 sources delete mode 100644 toolchain.yaml diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/dead.module b/dead.module new file mode 100644 index 0000000..0212d76 --- /dev/null +++ b/dead.module @@ -0,0 +1 @@ +Obsolete diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000 diff --git a/toolchain.yaml b/toolchain.yaml deleted file mode 100644 index fb64bf7..0000000 --- a/toolchain.yaml +++ /dev/null @@ -1,121 +0,0 @@ -# Document type identifier -document: modulemd -# Module metadata format version -version: 1 -data: - # Module name, optional - # Typically filled in by the buildsystem, using the VCS repository - # name as the name of the module. - # name: toolchain - # Module update stream, optional - # Typically filled in by the buildsystem, using the VCS branch name - # as the name of the stream. - # stream: master - # Module version, integer, optional, cannot be negative - # Typically filled in by the buildsystem, using the VCS commit - # timestamp. Module version defines upgrade path for the particular - # update stream. - # version: 2 - # A short summary describing the module, required - summary: Platform for building C and C++ applications - # A verbose description of the module, required - description: > - Fedora variant of Developer Toolset's C/C++ Toolchain from Software Collections. - # Module and content licenses in the Fedora license identifier - # format, required - license: - # Module license, required - # This list covers licenses used for the module metadata, SPEC - # files or extra patches - module: - - MIT - # Content license, optional - # A list of licenses used by the packages in the module. - # This should be populated by build tools. - content: [] - # Extensible metadata block - # A dictionary of user-defined keys and values. - # Optional. Defaults to an empty dictionary. - xmd: {} - # Module dependencies, if any. Optional. - # TODO: Provides, conflicts, obsoletes, recommends, etc. - # TODO: Stream name globbing or regular expression support - dependencies: - # Build dependencies of this module, optional - # Keys are module names, values are the stream names - # These modules define the buildroot for this module - buildrequires: - bootstrap: master - # Run-time dependencies of this module, optional - # Keys are module names, values are their stream names - requires: [] - # References to external resources, typically upstream, optional - references: - # Upstream community website, if it exists, optional - community: http://www.example.com/ - # Upstream documentation, if it exists, optional - documentation: http://www.example.com/ - # Upstream bug tracker, if it exists, optional - tracker: http://www.example.com/ - # Profiles define the end user's use cases for the module and consist - # of package lists of components to be installed by default if this - # module is enabled. The keys here are the profile names and contain - # package lists by component type. See the example. - # Optional, defaults to no profile definitions. - # TODO: Profiles deserve detailed documentation. - profiles: - # The default profile, used unless any other profile was selected. - # Optional, defaults to empty lists. - default: - rpms: - - gcc - - gcc-c++ - - gcc-gfortran - - gdb - - make - # Module API - # TODO: Define more API types - api: - # The module's public RPM-level API. - # A list of binary RPM names that are considered to be the - # main and stable feature of the module; binary RPMs not listed - # here are considered "unsupported" or "implementation details". - # In the example here we don't list the xyz package as it's only - # included as a dependency of xxx. However, we list a subpackage - # of bar, bar-extras. - # Optional, defaults to an empty list. - rpms: - - gcc - - gcc-c++ - - gcc-gfortran - - gdb - - make - # Module component filters - filter: - # RPM names not to be included in the module. - # By default, all built binary RPMs are included. In the example - # we exclude a subpackage of bar, bar-nonfoo from our module. - # Optional, defaults to an empty list. - rpms: [] - # Functional components of the module, optional - components: - # RPM content of the module, optional - # Keys are the VCS/SRPM names, values dictionaries holding - # additional information. - # TODO: Define architectures to build for - rpms: - gcc: - ref: f26 - rationale: API. - gdb: - ref: f26 - rationale: API. - make: - ref: f26 - rationale: API. - # Module content of this module - # Included modules are built in the shared buildroot, together with - # other included content. Keys are module names, values additional - # component information. - # Optional - modules: {}