Patch osbuild to generate osname from os-release file

Treefile.json from rpm-ostree doesn't contain `name` in
the `metadata` field from images built using podman build.

Author: PeaceRebel

build.sh

@@ -177,25 +177,25 @@ write_archive_info() {
 }
 
 patch_osbuild() {
-   return # we have no patches right now
    ## Add a few patches that either haven't made it into a release or
    ## that will be obsoleted with other work that will be done soon.
 
    ## To make it easier to apply patches we'll move around the osbuild
    ## code on the system first:
-   #rmdir /usr/lib/osbuild/osbuild
-   #mv /usr/lib/python3.13/site-packages/osbuild /usr/lib/osbuild/
-   #mkdir /usr/lib/osbuild/tools
-   #mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
+   rmdir /usr/lib/osbuild/osbuild
+   mv /usr/lib/python3.13/site-packages/osbuild /usr/lib/osbuild/
+   mkdir /usr/lib/osbuild/tools
+   mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
 
    ## Now all the software is under the /usr/lib/osbuild dir and we can patch
    #cat foo.patch | patch -d /usr/lib/osbuild -p1
-   #
+   patch -d /usr/lib/osbuild -p1 < /usr/lib/coreos-assembler/0001-live-artifacts-read-os-name-from-usr-lib-os-release.patch
+
    ## And then move the files back; supermin appliance creation will need it back
    ## in the places delivered by the RPM.
-   #mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp
-   #mv /usr/lib/osbuild/osbuild /usr/lib/python3.13/site-packages/osbuild
-   #mkdir /usr/lib/osbuild/osbuild
+   mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp
+   mv /usr/lib/osbuild/osbuild /usr/lib/python3.13/site-packages/osbuild
+   mkdir /usr/lib/osbuild/osbuild
 }
 
 if [ $# -ne 0 ]; then

src/0001-live-artifacts-read-os-name-from-usr-lib-os-release.patch

@@ -0,0 +1,30 @@
+From 7593b65dc77bf5dbb26fe9c54386759ab7f740a7 Mon Sep 17 00:00:00 2001
+From: Bipin B Narayan <[email protected]>
+Date: Mon, 14 Jul 2025 19:43:12 +0530
+Subject: [PATCH] live-artifacts: read os name from /usr/lib/os-release
+
+With importing ociarchive, the treefile.json doesn't contain osname.
+---
+ stages/org.osbuild.coreos.live-artifacts.mono | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/stages/org.osbuild.coreos.live-artifacts.mono b/stages/org.osbuild.coreos.live-artifacts.mono
+index 1384a343..4a95b607 100755
+--- a/stages/org.osbuild.coreos.live-artifacts.mono
++++ b/stages/org.osbuild.coreos.live-artifacts.mono
+@@ -131,10 +131,8 @@ def make_stream_hash(src, dest):
+ 
+ 
+ def get_os_name(tree):
+-    file = os.path.join(tree, 'usr/share/rpm-ostree/treefile.json')
+-    with open(file, encoding='utf8') as f:
+-        treefile = json.load(f)
+-    return treefile['metadata']['name']
++    os_release = osrelease.parse_files(os.path.join(tree, 'usr', 'lib', 'os-release'))
++    return f"{os_release['ID']}-{os_release['VARIANT_ID']}"
+ 
+ 
+ def ensure_glob(pathname, n="", **kwargs):
+-- 
+2.50.1
+