fuse-ext2: fix compilation errors

Issue genodelabs#199.
cnuke · Dec 17, 2021 · 7eb2937 · 7eb2937
1 parent 84b50e2
commit 7eb2937
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/ports/fuse-ext2.hash b/ports/fuse-ext2.hash
@@ -1 +1 @@
-867fc9cb8f828f6463871d5db396b8cda9d7b5b5
+33c7d685fb6bdd21ffe934c05b660f3328e349ec
diff --git a/src/lib/fuse-ext2/patches/ext2fs.h.patch b/src/lib/fuse-ext2/patches/ext2fs.h.patch
@@ -1,9 +1,11 @@
 +++ src/lib/fuse-ext2/e2fsprogs-1.41.12.newgit/ext2fs/ext2fs.h
-@@ -49,9 +49,12 @@
+@@ -49,9 +49,14 @@
  #include <sys/types.h>
  #endif
 
-+typedef unsigned int dev_t;
++#ifndef _DEV_T_DECLARED
++typedef unsigned long dev_t;
++#endif
 +
  #include <stdio.h>
  #include <stdlib.h>

diff --git a/src/lib/fuse-ext2/patches/gen_bitmap.c.patch b/src/lib/fuse-ext2/patches/gen_bitmap.c.patch
@@ -0,0 +1,10 @@
++++ src/lib/fuse-ext2/e2fsprogs-1.41.12.newgit/ext2fs/gen_bitmap.c
+@@ -517,7 +517,7 @@
+ }
+
+ int ext2fs_test_inode_bitmap_range(ext2fs_inode_bitmap bitmap,
+-				   ino_t inode, int num)
++				   ext2_ino_t inode, int num)
+ {
+ 	EXT2_CHECK_MAGIC(bitmap, EXT2_ET_MAGIC_INODE_BITMAP);
+ 	if ((inode < bitmap->start) || (inode+num-1 > bitmap->real_end)) {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		867fc9cb8f828f6463871d5db396b8cda9d7b5b5
		33c7d685fb6bdd21ffe934c05b660f3328e349ec