diff mbox series

[meta-filesystems,8/8] fuse: Use upstream version of fuse_kernel.h include fix

Message ID 20261118040831.2284885-8-khem.raj@oss.qualcomm.com
State New
Headers show
Series [meta-oe,1/8] geany-plugins: Remove unused patch | expand

Commit Message

Khem Raj Nov. 18, 2026, 4:08 a.m. UTC
Replace aarch64.patch with the change upstream actually merged,
libfuse commit 914871b20a90 ("fuse_kernel.h: clean includes"), which
uses <linux/types.h> on Linux and keeps the stdint.h definitions for
other operating systems.

AI-Generated: Uses Claude Code
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 .../0001-fuse_kernel.h-clean-includes.patch   | 36 +++++++++++++++++++
 .../recipes-support/fuse/files/aarch64.patch  | 33 -----------------
 .../recipes-support/fuse/fuse_2.9.9.bb        |  2 +-
 3 files changed, 37 insertions(+), 34 deletions(-)
 create mode 100644 meta-filesystems/recipes-support/fuse/files/0001-fuse_kernel.h-clean-includes.patch
 delete mode 100644 meta-filesystems/recipes-support/fuse/files/aarch64.patch
diff mbox series

Patch

diff --git a/meta-filesystems/recipes-support/fuse/files/0001-fuse_kernel.h-clean-includes.patch b/meta-filesystems/recipes-support/fuse/files/0001-fuse_kernel.h-clean-includes.patch
new file mode 100644
index 0000000000..a89da971de
--- /dev/null
+++ b/meta-filesystems/recipes-support/fuse/files/0001-fuse_kernel.h-clean-includes.patch
@@ -0,0 +1,36 @@ 
+From 914871b20a901e3e1e981c92bc42b1c93b7ab81b Mon Sep 17 00:00:00 2001
+From: Riku Voipio <riku.voipio@linaro.org>
+Date: Thu, 7 Feb 2013 12:04:21 +0100
+Subject: [PATCH] fuse_kernel.h: clean includes
+
+Use <linux/types.h> for linux and define types used for other operating systems
+using <stdint.h> types.
+
+Upstream-Status: Backport [https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ include/fuse_kernel.h | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+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:
diff --git a/meta-filesystems/recipes-support/fuse/files/aarch64.patch b/meta-filesystems/recipes-support/fuse/files/aarch64.patch
deleted file mode 100644
index 4c14a8f827..0000000000
--- a/meta-filesystems/recipes-support/fuse/files/aarch64.patch
+++ /dev/null
@@ -1,33 +0,0 @@ 
-fuse: add aarch64 support
-
-u64/u32 is not defined in sys/types.h, include linux/types.h like
-the kernel version of fuse.h does. Patch sent to upstream mailing list.
-
-Upstream-Status: Backport [https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b]
-Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- include/fuse_kernel.h | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/include/fuse_kernel.h b/include/fuse_kernel.h
-index c632b58..e804278 100644
---- a/include/fuse_kernel.h
-+++ b/include/fuse_kernel.h
-@@ -88,12 +88,7 @@
- #ifndef _LINUX_FUSE_H
- #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 <linux/types.h>
-
- /*
-  * Version negotiation:
---
-1.8.1.2
-
diff --git a/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb b/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb
index 1600068c0f..f127514f68 100644
--- a/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb
+++ b/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb
@@ -11,7 +11,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"

 SRC_URI = "https://github.com/libfuse/libfuse/releases/download/${BP}/${BP}.tar.gz \
-           file://aarch64.patch \
+           file://0001-fuse_kernel.h-clean-includes.patch \
            file://0001-fuse-fix-the-return-value-of-help-option.patch \
            file://fuse2-0007-util-ulockmgr_server.c-conditionally-define-closefro.patch \
            file://fuse.conf \