Skip to content

Commit 4f64339

Browse files
dustymabejlebon
authored andcommitted
osbuild: drop patchset given OSBuild v137 release
All patches are upstream and released so we can drop these now. Notably this includes initial full upstream support for building live artifacts using OSBuild [1]. [1] osbuild/osbuild#1947
1 parent 242a88e commit 4f64339

4 files changed

+22
-1123
lines changed

build.sh

+22-21
Original file line numberDiff line numberDiff line change
@@ -162,27 +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.13/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-osbuild-remoteloop-add-more-loop-device-options.patch \
177-
/usr/lib/coreos-assembler/0001-util-osrelease.py-Replaced-string-stripping-with-shl.patch \
178-
/usr/lib/coreos-assembler/0005-stages-add-coreos.live-artifacts.mono-stage.patch \
179-
| patch -d /usr/lib/osbuild -p1
180-
181-
# And then move the files back; supermin appliance creation will need it back
182-
# in the places delivered by the RPM.
183-
mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp
184-
mv /usr/lib/osbuild/osbuild /usr/lib/python3.13/site-packages/osbuild
185-
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.13/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.13/site-packages/osbuild
186+
#mkdir /usr/lib/osbuild/osbuild
186187
}
187188

188189
if [ $# -ne 0 ]; then

src/0001-osbuild-remoteloop-add-more-loop-device-options.patch

-92
This file was deleted.

src/0001-util-osrelease.py-Replaced-string-stripping-with-shl.patch

-44
This file was deleted.

0 commit comments

Comments
 (0)