modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-13 21:39:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Port to libmodulemd and support v2 modulemd without module stream expansion

Browse Source
This commit is contained in:
mprahl
2018-02-27 13:29:00 -05:00
parent 329a7acd76
commit f0852d9009
26 changed files with 591 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module_build_service/builder/KojiModuleBuilder.py
View File

@@ -238,7 +238,7 @@ class KojiModuleBuilder(GenericBuilder):
# module-build-macros to conflict with these filtered RPMs to ensure
# they won't be installed to buildroot.
filter_conflicts = ""
for req_name, req_data in mmd.xmd["mbs"]["buildrequires"].items():
for req_name, req_data in mmd.get_xmd()["mbs"]["buildrequires"].items():
if req_data["filtered_rpms"]:
filter_conflicts += "# Filtered rpms from %s module:\n" % (
req_name)
@@ -300,8 +300,9 @@ chmod 644 %buildroot/%_sysconfdir/rpm/macros.zz-modules
filter_conflicts=filter_conflicts)
modulemd_macros = ""
if mmd.buildopts and mmd.buildopts.rpms:
modulemd_macros = mmd.buildopts.rpms.macros
rpm_buildopts = mmd.get_rpm_buildopts()
if rpm_buildopts:
modulemd_macros = rpm_buildopts.get('macros')
macros_content = """