Drop osbuild patches for platform and selinux stages

- 'stages/coreos.platform: use shutil.copy' - 'stages/selinux: don't require file_contexts if labels passed' Both are merged and come with osbuild-130.rpm
coreos · Oct 7, 2024 · 7f06c1d · 7f06c1d
1 parent b76e1f9
commit 7f06c1d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 100 deletions.
diff --git a/build.sh b/build.sh
@@ -173,10 +173,7 @@ 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-stages-coreos.platform-use-shutil.copy.patch               \
-        /usr/lib/coreos-assembler/0001-stages-selinux-don-t-require-file_contexts-if-labels.patch \
-        /usr/lib/coreos-assembler/0001-hacks-for-coreos-selinux-issues.patch                      \
-            | patch -d /usr/lib/osbuild -p1
+    patch -d /usr/lib/osbuild -p1 < /usr/lib/coreos-assembler/0001-hacks-for-coreos-selinux-issues.patch
 
     # And then move the files back; supermin appliance creation will need it back
     # in the places delivered by the RPM.

diff --git a/src/0001-stages-coreos.platform-use-shutil.copy.patch b/src/0001-stages-coreos.platform-use-shutil.copy.patch
diff --git a/src/0001-stages-selinux-don-t-require-file_contexts-if-labels.patch b/src/0001-stages-selinux-don-t-require-file_contexts-if-labels.patch