Skip to content

Commit 7816488

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 7816488

4 files changed

+4
-1105
lines changed

build.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ write_archive_info() {
162162
}
163163

164164
patch_osbuild() {
165+
return # we have no patches right now
166+
165167
# Add a few patches that either haven't made it into a release or
166168
# that will be obsoleted with other work that will be done soon.
167169

@@ -173,9 +175,8 @@ patch_osbuild() {
173175
mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
174176

175177
# 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 \
178+
cat patch1.patch \
179+
patch2.patch \
179180
| patch -d /usr/lib/osbuild -p1
180181

181182
# And then move the files back; supermin appliance creation will need it back

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)