Skip to content

Commit

Permalink
[fuse] Patch fixing aarch64 issues Fixes MER#1472
Browse files Browse the repository at this point in the history
  • Loading branch information
ghosalmartin committed Jan 24, 2016
1 parent 81f05bd commit 73bc65b
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
@@ -1,3 +1,3 @@
[submodule "libfuse"]
[submodule "fuse"]
path = fuse
url = https://github.com/libfuse/libfuse
34 changes: 34 additions & 0 deletions rpm/200-backport_arm64_fuse_kernel_h_clean_includes.patch
@@ -0,0 +1,34 @@
From 914871b20a901e3e1e981c92bc42b1c93b7ab81b Mon Sep 17 00:00:00 2001
From: Riku Voipio <riku.voipio@linaro.org>
Date: Thu, 07 Feb 2013 11:04:21 +0000
Subject: fuse_kernel.h: clean includes

Use <linux/types.h> for linux and define types used for other operating systems
using <stdint.h> types.
---
(limited to 'include/fuse_kernel.h')

diff --git a/include/fuse_kernel.h b/include/fuse_kernel.h
index 501450c..df8e9b9 100644
--- a/include/fuse_kernel.h
+++ b/include/fuse_kernel.h
@@ -91,12 +91,16 @@
#ifndef _LINUX_FUSE_H
#define _LINUX_FUSE_H

-#include <sys/types.h>
+#ifdef __linux__
+#include <linux/types.h>
+#else
+#include <stdint.h>
#define __u64 uint64_t
#define __s64 int64_t
#define __u32 uint32_t
#define __s32 int32_t
#define __u16 uint16_t
+#endif

/*
* Version negotiation:
--
cgit v0.9.0.3-67-gacbf
5 changes: 4 additions & 1 deletion rpm/fuse.spec
Expand Up @@ -19,6 +19,7 @@ Source1: %{name}.conf
Source100: fuse.yaml
Patch0: fuse-udev_rules.patch
Patch1: fuse-0001-More-parentheses.patch
Patch2: 200-backport_arm64_fuse_kernel_h_clean_includes.patch
Requires: which
BuildRequires: gettext-devel

Expand Down Expand Up @@ -58,6 +59,8 @@ userspace program. This package contains the FUSE libraries.
%patch0 -p1
# fuse-0001-More-parentheses.patch
%patch1 -p1
# 200-backport_arm64_fuse_kernel_h_clean_includes.patch
%patch2 -p1
# >> setup
# << setup

Expand All @@ -84,7 +87,7 @@ rm -rf %{buildroot}
%make_install

# >> install post
install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/fuse.conf
install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}.conf
%ifnarch %{ix86} x86_64
# HACK!!! Please remove when possible.
# For some reason /dev/fuse doesn't exist on ARM builds and make install
Expand Down

0 comments on commit 73bc65b

Please sign in to comment.