initial buildroot for linux 5.15
This commit is contained in:
@@ -0,0 +1,22 @@
|
||||
Fix build on the AArch64 platform
|
||||
|
||||
Upstream-Status: Submitted
|
||||
|
||||
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
|
||||
|
||||
--- 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:
|
||||
+64
@@ -0,0 +1,64 @@
|
||||
From 5a43d0f724c56f8836f3f92411e0de1b5f82db32 Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Sat, 24 Jul 2021 22:02:45 +0100
|
||||
Subject: [PATCH] util/ulockmgr_server.c: conditionally define closefrom (fix
|
||||
glibc-2.34+)
|
||||
|
||||
closefrom(3) has joined us in glibc-land from *BSD and Solaris. Since
|
||||
it's available in glibc 2.34+, we want to detect it and only define our
|
||||
fallback if the libc doesn't provide it.
|
||||
|
||||
Bug: https://bugs.gentoo.org/803923
|
||||
Signed-off-by: Sam James <sam@gentoo.org>
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/libfuse/libfuse/commit/5a43d0f724c56f8836f3f92411e0de1b5f82db32]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
configure.ac | 1 +
|
||||
util/ulockmgr_server.c | 6 ++++++
|
||||
2 files changed, 7 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 9946a0efa..a2d481aa9 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -55,6 +55,7 @@ fi
|
||||
|
||||
AC_CHECK_FUNCS([fork setxattr fdatasync splice vmsplice utimensat])
|
||||
AC_CHECK_FUNCS([posix_fallocate])
|
||||
+AC_CHECK_FUNCS([closefrom])
|
||||
AC_CHECK_MEMBERS([struct stat.st_atim])
|
||||
AC_CHECK_MEMBERS([struct stat.st_atimespec])
|
||||
|
||||
diff --git a/util/ulockmgr_server.c b/util/ulockmgr_server.c
|
||||
index 273c7d923..a04dac5c6 100644
|
||||
--- a/util/ulockmgr_server.c
|
||||
+++ b/util/ulockmgr_server.c
|
||||
@@ -22,6 +22,10 @@
|
||||
#include <sys/socket.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
+#ifdef HAVE_CONFIG_H
|
||||
+ #include "config.h"
|
||||
+#endif
|
||||
+
|
||||
struct message {
|
||||
unsigned intr : 1;
|
||||
unsigned nofd : 1;
|
||||
@@ -124,6 +128,7 @@ static int receive_message(int sock, void *buf, size_t buflen, int *fdp,
|
||||
return res;
|
||||
}
|
||||
|
||||
+#if !defined(HAVE_CLOSEFROM)
|
||||
static int closefrom(int minfd)
|
||||
{
|
||||
DIR *dir = opendir("/proc/self/fd");
|
||||
@@ -141,6 +146,7 @@ static int closefrom(int minfd)
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
+#endif
|
||||
|
||||
static void send_reply(int cfd, struct message *msg)
|
||||
{
|
||||
@@ -0,0 +1,14 @@
|
||||
config BR2_PACKAGE_LIBFUSE
|
||||
bool "libfuse"
|
||||
# Really doesn't like static, see fuse/lib/fuse.c
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_USE_MMU # fork()
|
||||
help
|
||||
FUSE (Filesystem in UserSpacE)
|
||||
|
||||
https://github.com/libfuse/libfuse
|
||||
|
||||
comment "libfuse needs a toolchain w/ threads, dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
@@ -0,0 +1,6 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7c1b4b5 fuse-2.9.9.tar.gz
|
||||
|
||||
# Hash for license files:
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
|
||||
@@ -0,0 +1,48 @@
|
||||
################################################################################
|
||||
#
|
||||
# libfuse
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBFUSE_VERSION = 2.9.9
|
||||
LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
|
||||
LIBFUSE_SITE = https://github.com/libfuse/libfuse/releases/download/fuse-$(LIBFUSE_VERSION)
|
||||
LIBFUSE_LICENSE = GPL-2.0, LGPL-2.1
|
||||
LIBFUSE_LICENSE_FILES = COPYING COPYING.LIB
|
||||
LIBFUSE_CPE_ID_VENDOR = libfuse_project
|
||||
LIBFUSE_INSTALL_STAGING = YES
|
||||
# We're patching configure.ac
|
||||
LIBFUSE_AUTORECONF = YES
|
||||
# add host-gettext for AM_ICONV macro
|
||||
LIBFUSE_DEPENDENCIES = \
|
||||
host-gettext \
|
||||
$(if $(BR2_PACKAGE_LIBICONV),libiconv)
|
||||
LIBFUSE_CONF_OPTS = \
|
||||
--disable-example \
|
||||
--enable-lib \
|
||||
--enable-util \
|
||||
UDEV_RULES_PATH=/lib/udev/rules.d
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
|
||||
define LIBFUSE_INSTALL_UDEV
|
||||
mkdir -p $(TARGET_DIR)/lib/udev/rules.d
|
||||
cp $(STAGING_DIR)/lib/udev/rules.d/*-fuse.rules $(TARGET_DIR)/lib/udev/rules.d
|
||||
endef
|
||||
|
||||
LIBFUSE_POST_INSTALL_TARGET_HOOKS += LIBFUSE_INSTALL_UDEV
|
||||
endif
|
||||
|
||||
define LIBFUSE_INSTALL_TARGET_CMDS
|
||||
cp -dpf $(STAGING_DIR)/usr/bin/fusermount $(TARGET_DIR)/usr/bin/
|
||||
cp -dpf $(STAGING_DIR)/usr/lib/libfuse.so* $(TARGET_DIR)/usr/lib/
|
||||
endef
|
||||
|
||||
define LIBFUSE_DEVICES
|
||||
/dev/fuse c 666 0 0 10 229 0 0 -
|
||||
endef
|
||||
|
||||
define LIBFUSE_PERMISSIONS
|
||||
/usr/bin/fusermount f 4755 0 0 - - - - -
|
||||
endef
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user