From 323880999b71bc57b78a657de40d70b5080494f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Thu, 28 Jun 2018 20:42:44 +0200 Subject: [PATCH] Define %{_module_context} and %{disttag} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- module_build_service/builder/KojiModuleBuilder.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/module_build_service/builder/KojiModuleBuilder.py b/module_build_service/builder/KojiModuleBuilder.py index bf673301..27c7332e 100644 --- a/module_build_service/builder/KojiModuleBuilder.py +++ b/module_build_service/builder/KojiModuleBuilder.py @@ -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")