modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-11-04 22:36:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Define %{_module_context} and %{disttag}

Browse Source 
No reason to hide module context from the consumers, plus it's useful to
keep it in the DISTTAG tag (not to be confused with the %{dist} tag) for
tracking.

The %{disttag} feature will do nothing until RPM supports it.  This is
planned in 4.14.2.

See https://bugzilla.redhat.com/show_bug.cgi?id=1596192.

Signed-off-by: Petr Šabata <contyk@redhat.com>
This commit is contained in:
Petr Šabata
2018-06-28 20:42:44 +02:00
parent 36a9026ca8
commit 323880999b
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module_build_service/builder/KojiModuleBuilder.py
View File

@@ -251,9 +251,11 @@ class KojiModuleBuilder(GenericBuilder):
spec_content = """
%global dist {disttag}
%global disttag module({module_name}:{module_stream}:{module_version}:{module_context})
%global _module_name {module_name}
%global _module_stream {module_stream}
%global _module_version {module_version}
%global _module_context {module_context}
Name: {name}
Version: {version}
@@ -298,6 +300,7 @@ chmod 644 %buildroot/etc/rpm/macros.zz-modules
module_name=module_build.name,
module_stream=module_build.stream,
module_version=module_build.version,
module_context=module_build.context,
filter_conflicts=filter_conflicts)
modulemd_macros = ""
@@ -310,10 +313,12 @@ chmod 644 %buildroot/etc/rpm/macros.zz-modules
# General macros set by MBS
%dist {disttag}
%disttag module({module_name}:{module_stream}:{module_version}:{module_context})
%_module_build 1
%_module_name {module_name}
%_module_stream {module_stream}
%_module_version {module_version}
%_module_context {module_context}
# Macros set by module author:
@@ -321,6 +326,7 @@ chmod 644 %buildroot/etc/rpm/macros.zz-modules
""".format(disttag=disttag, module_name=module_build.name,
module_stream=module_build.stream,
module_version=module_build.version,
module_context=module_build.context,
modulemd_macros=modulemd_macros)
td = tempfile.mkdtemp(prefix="module_build_service-build-macros")