Revert "Add osbuild patch for org.osbuild.dmverity stage fix"

This reverts commit daa7046.
coreos · Oct 7, 2024 · b76e1f9 · b76e1f9
1 parent 7550a58
commit b76e1f9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 60 deletions.
diff --git a/build.sh b/build.sh
@@ -173,8 +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-dmverity-make-device-objects-more-generic.patch     \
-        /usr/lib/coreos-assembler/0001-stages-coreos.platform-use-shutil.copy.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

diff --git a/src/0001-stages-dmverity-make-device-objects-more-generic.patch b/src/0001-stages-dmverity-make-device-objects-more-generic.patch