Skip to content

Commit

Permalink
osbuild: drop pathset 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 bb086e7
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 1,107 deletions.
8 changes: 3 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +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 \
| patch -d /usr/lib/osbuild -p1
cat patch.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.
Expand All @@ -199,5 +197,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 bb086e7

Please sign in to comment.