Skip to content

Commit 8820b10

Browse files
committed
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 8820b10

4 files changed

+3
-1107
lines changed

build.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,8 @@ patch_osbuild() {
173173
mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
174174

175175
# 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
176+
cat patch.patch \
177+
| patch -d /usr/lib/osbuild -p1
180178

181179
# And then move the files back; supermin appliance creation will need it back
182180
# in the places delivered by the RPM.
@@ -199,5 +197,5 @@ else
199197
install_ocp_tools
200198
trust_redhat_gpg_keys
201199
configure_user
202-
patch_osbuild
200+
#patch_osbuild
203201
fi

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

Lines changed: 0 additions & 92 deletions
This file was deleted.

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

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)