Skip to content

Commit 1edb5c3

Browse files
committed
build.sh: drop osbuild patches
All of these patches should be in the latest OSBuild RPMs in Fedora 40 so we should be good to drop these.
1 parent dd6edc8 commit 1edb5c3

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

build.sh

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -162,28 +162,28 @@ write_archive_info() {
162162
}
163163

164164
patch_osbuild() {
165-
# Add a few patches that either haven't made it into a release or
166-
# that will be obsoleted with other work that will be done soon.
167-
168-
# To make it easier to apply patches we'll move around the osbuild
169-
# code on the system first:
170-
rmdir /usr/lib/osbuild/osbuild
171-
mv /usr/lib/python3.12/site-packages/osbuild /usr/lib/osbuild/
172-
mkdir /usr/lib/osbuild/tools
173-
mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
174-
175-
# Now all the software is under the /usr/lib/osbuild dir and we can patch
176-
cat /usr/lib/coreos-assembler/0001-parsing-add-parse_location_into_parts.patch \
177-
/usr/lib/coreos-assembler/0002-parsing-treat-locations-without-scheme-as-belonging-.patch \
178-
/usr/lib/coreos-assembler/0003-org.osbuild.selinux-support-operating-on-mounts.patch \
179-
/usr/lib/coreos-assembler/0004-org.osbuild.selinux-support-for-specifying-where-fil.patch \
180-
| patch -d /usr/lib/osbuild -p1
181-
182-
# And then move the files back; supermin appliance creation will need it back
183-
# in the places delivered by the RPM.
184-
mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp
185-
mv /usr/lib/osbuild/osbuild /usr/lib/python3.12/site-packages/osbuild
186-
mkdir /usr/lib/osbuild/osbuild
165+
return # we have no patches right now
166+
167+
## Add a few patches that either haven't made it into a release or
168+
## that will be obsoleted with other work that will be done soon.
169+
170+
## To make it easier to apply patches we'll move around the osbuild
171+
## code on the system first:
172+
#rmdir /usr/lib/osbuild/osbuild
173+
#mv /usr/lib/python3.12/site-packages/osbuild /usr/lib/osbuild/
174+
#mkdir /usr/lib/osbuild/tools
175+
#mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
176+
177+
## Now all the software is under the /usr/lib/osbuild dir and we can patch
178+
#cat patch1.patch \
179+
# patch2.patch \
180+
# | patch -d /usr/lib/osbuild -p1
181+
182+
## And then move the files back; supermin appliance creation will need it back
183+
## in the places delivered by the RPM.
184+
#mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp
185+
#mv /usr/lib/osbuild/osbuild /usr/lib/python3.12/site-packages/osbuild
186+
#mkdir /usr/lib/osbuild/osbuild
187187
}
188188

189189
if [ $# -ne 0 ]; then

0 commit comments

Comments
 (0)