Skip to content

Commit 626c2a5

Browse files
committed
osbuild: drop merged/released osbuild patches
These have been merged upstream and are now in latest osbuild RPMs in Fedora. Let's drop the patches here.
1 parent 589c836 commit 626c2a5

5 files changed

+1
-336
lines changed

build.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,7 @@ 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-parsing-add-parse_location_into_parts.patch \
177-
/usr/lib/coreos-assembler/0002-parsing-treat-locations-without-scheme-as-belonging-.patch \
178-
/usr/lib/coreos-assembler/0003-org.osbuild.selinux-support-operating-on-mounts.patch \
179-
/usr/lib/coreos-assembler/0004-org.osbuild.selinux-support-for-specifying-where-fil.patch \
180-
/usr/lib/coreos-assembler/0001-osbuild-remoteloop-add-more-loop-device-options.patch \
176+
cat /usr/lib/coreos-assembler/0001-osbuild-remoteloop-add-more-loop-device-options.patch \
181177
/usr/lib/coreos-assembler/0002-osbuild-loop-make-the-loop-device-if-missing.patch \
182178
/usr/lib/coreos-assembler/0003-util-osrelease.py-improve-whitespace-and-quote-strip.patch \
183179
/usr/lib/coreos-assembler/0004-util-chroot-Add-support-for-custom-directory-bind-mo.patch \

src/0001-parsing-add-parse_location_into_parts.patch

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

src/0002-parsing-treat-locations-without-scheme-as-belonging-.patch

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

src/0003-org.osbuild.selinux-support-operating-on-mounts.patch

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

src/0004-org.osbuild.selinux-support-for-specifying-where-fil.patch

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

0 commit comments

Comments
 (0)