Support yum for hermetic build

Author: tkopecek

mock/py/mock-hermetic-repo.py

@@ -191,7 +191,7 @@ def _main():
         log.error("RPM deps downloading failed")
         sys.exit(1)
 
-    subprocess.check_call(["createrepo_c", options.output_repo])
+    subprocess.check_call(["createrepo_c", "--compatibility", options.output_repo])
 
     prepare_image(data["config"]["bootstrap_image"], data["bootstrap"],
                   options.output_repo)

mock/py/mockbuild/installed_packages.py

@@ -113,13 +113,21 @@ def query_packages_location(packages, chrootpath=None,
     }]
     """
 
-    # Note: we do not support YUM in 2024+
-    query_locations_cmd = [dnf_cmd]
-    if chrootpath:
-        query_locations_cmd += [f"--installroot={chrootpath}"]
+    if 'yum' in dnf_cmd:
+        # yum (yum-utils must be installed)
+        repoquery_cmd = '/usr/bin/repoquery'
+        if not os.path.exists(repoquery_cmd):
+            raise mockbuild.exception.Error(f"Missing {repoquery_cmd}")
+        query_locations_cmd = [repoquery_cmd]
+    else:
+        # dnf
+        query_locations_cmd = [dnf_cmd]
+        if chrootpath:
+            query_locations_cmd += [f"--installroot={chrootpath}"]
+        query_locations_cmd += ["repoquery"]
     # The -q is necessary because of and similar:
     # https://github.com/rpm-software-management/dnf5/issues/1361
-    query_locations_cmd += ["repoquery", "-q", "--location"]
+    query_locations_cmd += ["-q", "--location"]
     query_locations_cmd += [
         f"{p['name']}-{p['version']}-{p['release']}.{p['arch']}"
         for p in packages

releng/release-notes-next/hermetic-build-yum-support.feature.md

@@ -0,0 +1,5 @@
+The ``--calculate-dependencies`` command now also supports the ``yum`` package
+manager for building older distributions. Using the correct bootstrap image
+with yum now works without problems. Also, ``mock-hermetic-repo`` was altered
+to create repositories compatible with both ``dnf`` and ``yum`` package
+managers (added ``--compatibility`` flag).