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 authored and jlebon committed Dec 19, 2024
1 parent 242a88e commit 624c6c4
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 1,107 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ COPY ./ /root/containerbuild/
RUN ./build.sh write_archive_info
RUN ./build.sh make_and_makeinstall
RUN ./build.sh configure_user
RUN ./build.sh patch_osbuild
# RUN ./build.sh patch_osbuild

# clean up scripts (it will get cached in layers, but oh well)
WORKDIR /srv/
Expand Down
7 changes: 3 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,8 @@ patch_osbuild() {
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 \
cat patch1.patch \
patch2.patch \
| patch -d /usr/lib/osbuild -p1

# And then move the files back; supermin appliance creation will need it back
Expand All @@ -199,5 +198,5 @@ else
install_ocp_tools
trust_redhat_gpg_keys
configure_user
patch_osbuild
#patch_osbuild
fi
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 624c6c4

Please sign in to comment.