diff --git a/local/sources/redoxfs b/local/sources/redoxfs index e6be9134d8..7387e45ffb 160000 --- a/local/sources/redoxfs +++ b/local/sources/redoxfs @@ -1 +1 @@ -Subproject commit e6be9134d8395f9ec6dcd46cb972c3c48aabe532 +Subproject commit 7387e45ffb57656b4357089e858873582b4d5d0c diff --git a/recipes/core/redoxfs/P2-readonly-live-media-open.patch b/recipes/core/redoxfs/P2-readonly-live-media-open.patch deleted file mode 100644 index ecfe0c2617..0000000000 --- a/recipes/core/redoxfs/P2-readonly-live-media-open.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/disk/file.rs b/src/disk/file.rs -index 78d51bc..f923d72 100644 ---- a/src/disk/file.rs -+++ b/src/disk/file.rs -@@ -43,10 +43,12 @@ impl ResultExt for std::io::Result { - - impl DiskFile { - pub fn open(path: impl AsRef) -> Result { -+ let path = path.as_ref(); - let file = OpenOptions::new() - .read(true) - .write(true) - .open(path) -+ .or_else(|_| OpenOptions::new().read(true).open(path)) - .or_eio()?; - Ok(DiskFile { file }) - } diff --git a/recipes/core/redoxfs/recipe.toml b/recipes/core/redoxfs/recipe.toml index 8c5a7ea32d..8e97ec7842 100644 --- a/recipes/core/redoxfs/recipe.toml +++ b/recipes/core/redoxfs/recipe.toml @@ -1,6 +1,5 @@ [source] -git = "https://gitlab.redox-os.org/redox-os/redoxfs.git" -patches = ["P2-readonly-live-media-open.patch"] +path = "../../../local/sources/redoxfs" [build] template = "custom"