diff options
-rw-r--r-- | patches/fuse-2.9.4/0001-use-asm-types.h-to-define-__u64-etc.patch | 28 | ||||
-rw-r--r-- | patches/fuse-2.9.4/series | 4 | ||||
-rw-r--r-- | rules/fuse.make | 4 |
3 files changed, 34 insertions, 2 deletions
diff --git a/patches/fuse-2.9.4/0001-use-asm-types.h-to-define-__u64-etc.patch b/patches/fuse-2.9.4/0001-use-asm-types.h-to-define-__u64-etc.patch new file mode 100644 index 000000000..5b79e61a1 --- /dev/null +++ b/patches/fuse-2.9.4/0001-use-asm-types.h-to-define-__u64-etc.patch @@ -0,0 +1,28 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Sat, 30 May 2015 10:42:35 +0200 +Subject: [PATCH] use asm/types.h to define __u64 etc. + +Otherwise building fails on arm64 with conflicting type definitions. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + include/fuse_kernel.h | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/include/fuse_kernel.h b/include/fuse_kernel.h +index c632b58fbcf4..29eb58227198 100644 +--- a/include/fuse_kernel.h ++++ b/include/fuse_kernel.h +@@ -89,11 +89,7 @@ + #define _LINUX_FUSE_H + + #include <sys/types.h> +-#define __u64 uint64_t +-#define __s64 int64_t +-#define __u32 uint32_t +-#define __s32 int32_t +-#define __u16 uint16_t ++#include <asm/types.h> + + /* + * Version negotiation: diff --git a/patches/fuse-2.9.4/series b/patches/fuse-2.9.4/series new file mode 100644 index 000000000..8ade71715 --- /dev/null +++ b/patches/fuse-2.9.4/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-use-asm-types.h-to-define-__u64-etc.patch +# 14044a304d2cf460a7b33d5e064996e9 - git-ptx-patches magic diff --git a/rules/fuse.make b/rules/fuse.make index b8c5c8f7c..0f85810d8 100644 --- a/rules/fuse.make +++ b/rules/fuse.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_FUSE) += fuse # # Paths and names # -FUSE_VERSION := 2.9.3 -FUSE_MD5 := 33cae22ca50311446400daf8a6255c6a +FUSE_VERSION := 2.9.4 +FUSE_MD5 := ecb712b5ffc6dffd54f4a405c9b372d8 FUSE := fuse-$(FUSE_VERSION) FUSE_SUFFIX := tar.gz FUSE_URL := $(call ptx/mirror, SF, fuse/$(FUSE).$(FUSE_SUFFIX)) |