Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

osbuild: drop patchset given OSBuild v137 release #3997

Merged
merged 1 commit into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading