Skip to content

Commit

Permalink
osbuild: drop patchset given OSBuild v137 release
Browse files Browse the repository at this point in the history
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
  • Loading branch information
dustymabe committed Dec 19, 2024
1 parent 242a88e commit 20639e5
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 1,123 deletions.
43 changes: 22 additions & 21 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -162,27 +162,28 @@ write_archive_info() {
}

patch_osbuild() {
# 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/

# Now all the software is under the /usr/lib/osbuild dir and we can patch
cat /usr/lib/coreos-assembler/0001-osbuild-remoteloop-add-more-loop-device-options.patch \
/usr/lib/coreos-assembler/0001-util-osrelease.py-Replaced-string-stripping-with-shl.patch \
/usr/lib/coreos-assembler/0005-stages-add-coreos.live-artifacts.mono-stage.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
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/

## Now all the software is under the /usr/lib/osbuild dir and we can patch
#cat patch1.patch \
# patch2.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
}

if [ $# -ne 0 ]; then
Expand Down
92 changes: 0 additions & 92 deletions src/0001-osbuild-remoteloop-add-more-loop-device-options.patch

This file was deleted.

This file was deleted.

Loading

0 comments on commit 20639e5

Please sign in to comment.