Skip to content

Commit 641b3e8

Browse files
jbtrystramtravier
authored andcommitted
osbuild: drop patches
Osbuild 159 was release so we can drop patches.
1 parent 0605133 commit 641b3e8

File tree

2 files changed

+17
-130
lines changed

2 files changed

+17
-130
lines changed

build.sh

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -195,22 +195,23 @@ write_archive_info() {
195195
patch_osbuild() {
196196
# Add a few patches that either haven't made it into a release or
197197
# that will be obsoleted with other work that will be done soon.
198-
199-
# To make it easier to apply patches we'll move around the osbuild
200-
# code on the system first:
201-
rmdir /usr/lib/osbuild/osbuild
202-
mv /usr/lib/python3.13/site-packages/osbuild /usr/lib/osbuild/
203-
mkdir /usr/lib/osbuild/tools
204-
mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
205-
206-
# Now all the software is under the /usr/lib/osbuild dir and we can patch
207-
patch -d /usr/lib/osbuild -p1 < /usr/lib/coreos-assembler/0001-stages-coreos.live-artifacts-rework-volume-ID-handli.patch
208-
209-
# And then move the files back; supermin appliance creation will need it back
210-
# in the places delivered by the RPM.
211-
mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp
212-
mv /usr/lib/osbuild/osbuild /usr/lib/python3.13/site-packages/osbuild
213-
mkdir -p /usr/lib/osbuild/osbuild
198+
return 0
199+
200+
# # To make it easier to apply patches we'll move around the osbuild
201+
# # code on the system first:
202+
# rmdir /usr/lib/osbuild/osbuild
203+
# mv /usr/lib/python3.13/site-packages/osbuild /usr/lib/osbuild/
204+
# mkdir /usr/lib/osbuild/tools
205+
# mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
206+
207+
# # Now all the software is under the /usr/lib/osbuild dir and we can patch
208+
# patch -d /usr/lib/osbuild -p1 < /usr/lib/coreos-assembler/src/my-git-commit.patch
209+
210+
# # And then move the files back; supermin appliance creation will need it back
211+
# # in the places delivered by the RPM.
212+
# mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp
213+
# mv /usr/lib/osbuild/osbuild /usr/lib/python3.13/site-packages/osbuild
214+
# mkdir -p /usr/lib/osbuild/osbuild
214215
}
215216

216217
if [ $# -ne 0 ]; then

src/0001-stages-coreos.live-artifacts-rework-volume-ID-handli.patch

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

0 commit comments

Comments
 (0)