Skip to content

Commit e7b71cf

Browse files
dustymabejlebon
authored andcommitted
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 d31cd4c.
1 parent 6ec2120 commit e7b71cf

File tree

2 files changed

+9
-51
lines changed

2 files changed

+9
-51
lines changed

build.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -170,25 +170,25 @@ write_archive_info() {
170170
}
171171

172172
patch_osbuild() {
173-
# return # we have no patches right now
173+
return # we have no patches right now
174174
## Add a few patches that either haven't made it into a release or
175175
## that will be obsoleted with other work that will be done soon.
176176

177177
## To make it easier to apply patches we'll move around the osbuild
178178
## code on the system first:
179-
rmdir /usr/lib/osbuild/osbuild
180-
mv /usr/lib/python3.13/site-packages/osbuild /usr/lib/osbuild/
181-
mkdir /usr/lib/osbuild/tools
182-
mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
179+
#rmdir /usr/lib/osbuild/osbuild
180+
#mv /usr/lib/python3.13/site-packages/osbuild /usr/lib/osbuild/
181+
#mkdir /usr/lib/osbuild/tools
182+
#mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
183183

184184
## Now all the software is under the /usr/lib/osbuild dir and we can patch
185-
patch -d /usr/lib/osbuild -p1 < src/0001-stages-coreos.live-artifacts-fix-kernel-and-initrd-p.patch
185+
#cat foo.patch | patch -d /usr/lib/osbuild -p1
186186
#
187187
## And then move the files back; supermin appliance creation will need it back
188188
## in the places delivered by the RPM.
189-
mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp
190-
mv /usr/lib/osbuild/osbuild /usr/lib/python3.13/site-packages/osbuild
191-
mkdir /usr/lib/osbuild/osbuild
189+
#mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp
190+
#mv /usr/lib/osbuild/osbuild /usr/lib/python3.13/site-packages/osbuild
191+
#mkdir /usr/lib/osbuild/osbuild
192192
}
193193

194194
if [ $# -ne 0 ]; then

src/0001-stages-coreos.live-artifacts-fix-kernel-and-initrd-p.patch

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)