cmd-import: write commitmeta.json to the builds dir

This includes the details of packages that are included in the commit.

Author: PeaceRebel

src/cmd-import

@@ -56,8 +56,11 @@ def main():
         # create meta.json
         build_meta = generate_build_meta(tmp_oci_archive, tmp_oci_manifest, metadata, ostree_commit)
 
+        # create commitmeta.json
+        tmp_commitmeta = generate_commitmeta(tmpd, ostree_commit)
+
         # move into official location
-        finalize_build(builds, build_meta, tmp_oci_archive, tmp_oci_manifest, tmp_lockfile)
+        finalize_build(builds, build_meta, tmp_oci_archive, tmp_oci_manifest, tmp_lockfile, tmp_commitmeta)
 
     if not args.skip_prune:
         subprocess.check_call(['/usr/lib/coreos-assembler/cmd-prune'])
@@ -113,6 +116,26 @@ def generate_lockfile(tmpd, ostree_commit):
 
     return tmpf
 
+def generate_commitmeta(tmpd, ostree_commit):
+    tmpf = os.path.join(tmpd, 'commitmeta.json')
+    out = subprocess.check_output(['rpm-ostree', 'db', 'list', '--repo', 'tmp/repo', ostree_commit], encoding='utf-8')
+    rpmdb = []
+    for line in out.splitlines():
+        if not line.startswith(' '):
+            continue
+
+        # Do we have epoch in package names?
+        n, v, ra = line.strip().rsplit('-', 2)
+        r, a = ra.rsplit('.', 1)
+        rpmdb.append([n, "0", v, r, a])
+
+    with open(tmpf, 'w') as f:
+        json.dump({
+            'rpmostree.rpmdb.pkglist': rpmdb
+            }, f, indent=2)
+
+    return tmpf
+
 
 def generate_build_meta(tmp_oci_archive, tmp_oci_manifest, metadata, ostree_commit):
     name = metadata['Labels']['com.coreos.osname']
@@ -170,7 +193,7 @@ def generate_build_meta(tmp_oci_archive, tmp_oci_manifest, metadata, ostree_comm
     return meta
 
 
-def finalize_build(builds, build_meta, tmp_oci_archive, tmp_oci_manifest, tmp_lockfile):
+def finalize_build(builds, build_meta, tmp_oci_archive, tmp_oci_manifest, tmp_lockfile, tmp_commitmeta):
     buildid = build_meta['buildid']
     arch = build_meta['coreos-assembler.basearch']
 
@@ -180,6 +203,7 @@ def finalize_build(builds, build_meta, tmp_oci_archive, tmp_oci_manifest, tmp_lo
     shutil.move(tmp_oci_archive, f'{destdir}/{build_meta['images']['ostree']['path']}')
     shutil.move(tmp_oci_manifest, f'{destdir}/{build_meta['images']['oci-manifest']['path']}')
     shutil.move(tmp_lockfile, f'{destdir}/manifest-lock.generated.{arch}.json')
+    shutil.move(tmp_commitmeta, f'{destdir}/commitmeta.json')
 
     with open(f'{destdir}/meta.json', 'w') as f:
         json.dump(build_meta, f, indent=4)