osbuild: drop patch fixing s390x ISO paths

The upstream fix has landed in a release so we no longer need this
patch. This reverts commit d31cd4cb3e.

build.sh

@@ -170,25 +170,25 @@ write_archive_info() {
 }
 
 patch_osbuild() {
-   # return # we have no patches right now
+   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
-   patch -d /usr/lib/osbuild -p1 < src/0001-stages-coreos.live-artifacts-fix-kernel-and-initrd-p.patch
+   #cat foo.patch | patch -d /usr/lib/osbuild -p1
    #
    ## 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-stages-coreos.live-artifacts-fix-kernel-and-initrd-p.patch

@@ -1,42 +0,0 @@
-From 41f6d206cc58f3af01c7630effab4acd2cc1b31a Mon Sep 17 00:00:00 2001
-From: Nikita Dubrovskii <nikita@linux.ibm.com>
-Date: Thu, 17 Apr 2025 14:25:09 +0200
-Subject: [PATCH] stages/coreos.live-artifacts: fix kernel and initrd paths in
- s390x ISO
-
-The `generic.ins` template uses:
-  images/kernel.img
-  images/initrd.img
-
-However, kernel and initrd are currently stored as:
-  images/pxeboot/vmlinuz
-  images/pxeboot/initrd.img
-
-This change ensures correct paths are used.
----
- stages/org.osbuild.coreos.live-artifacts.mono | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/stages/org.osbuild.coreos.live-artifacts.mono b/stages/org.osbuild.coreos.live-artifacts.mono
-index 5cad484a..1384a343 100755
---- a/stages/org.osbuild.coreos.live-artifacts.mono
-+++ b/stages/org.osbuild.coreos.live-artifacts.mono
-@@ -247,7 +247,14 @@ def genisoargs_s390x(paths, test_fixture, volid, name_version):
-     with open(os.path.join(lorax_templates, 'generic.ins'), 'r', encoding='utf8') as fp1:
-         with open(os.path.join(paths["iso"], 'generic.ins'), 'w', encoding='utf8') as fp2:
-             for line in fp1:
--                fp2.write(line.replace('@INITRD_LOAD_ADDRESS@', INITRD_ADDRESS))
-+                # The paths to the kernel and initrd on our ISO differ slightly from those in generic.ins.
-+                # https://github.com/coreos/coreos-assembler/commit/6f533ef55ee5cf2b10ad97df51eb2d190b6b2c2b
-+                # Let's update the paths in the template to the correct locations.
-+                line = line.replace('images/kernel.img', "images/pxeboot/vmlinuz")
-+                line = line.replace('images/initrd.img', "images/pxeboot/initrd.img")
-+                # Also replace the initrd address in the template with actual value.
-+                line = line.replace('@INITRD_LOAD_ADDRESS@', INITRD_ADDRESS)
-+                fp2.write(line)
-     for prmfile in [paths["iso/images/cdboot.prm"],
-                     paths["iso/images/generic.prm"],
-                     paths["iso/images/genericdvd.prm"]]:
--- 
-2.49.0
-