initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -0,0 +1,52 @@
|
||||
From d05ba5335e869bcd68c0def795c55fd5037914e3 Mon Sep 17 00:00:00 2001
|
||||
From: Petr Vorel <petr.vorel () gmail ! com>
|
||||
Date: Thu, 22 Jul 2021 16:15:44 +0000
|
||||
Subject: [PATCH] nfsdcltrack/sqlite: Fix printf format
|
||||
|
||||
sqlite.c: In function 'sqlite_remove_unreclaimed':
|
||||
sqlite.c:547:71: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=]
|
||||
547 | ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld",
|
||||
| ~~^
|
||||
| |
|
||||
| long int
|
||||
| %lld
|
||||
548 | grace_start);
|
||||
| ~~~~~~~~~~~
|
||||
| |
|
||||
| time_t {aka long long int}
|
||||
|
||||
Found in Buildroot riscv32 build.
|
||||
|
||||
Link: http://autobuild.buildroot.net/results/9bc1d43a588338b7395af7bc97535ee16a6ea2d9/build-end.log
|
||||
|
||||
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
|
||||
Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=4f2a5b64386600430ec6b71e57b88c5efaa70aed
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
---
|
||||
utils/nfsdcltrack/sqlite.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c
|
||||
index f79aebb3..cea4a411 100644
|
||||
--- a/utils/nfsdcltrack/sqlite.c
|
||||
+++ b/utils/nfsdcltrack/sqlite.c
|
||||
@@ -46,6 +46,7 @@
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
+#include <inttypes.h>
|
||||
#include <unistd.h>
|
||||
#include <sqlite3.h>
|
||||
#include <linux/limits.h>
|
||||
@@ -544,7 +545,7 @@ sqlite_remove_unreclaimed(time_t grace_start)
|
||||
int ret;
|
||||
char *err = NULL;
|
||||
|
||||
- ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld",
|
||||
+ ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %"PRIu64,
|
||||
grace_start);
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
From 14eb2cae4fca95609ae4efde2444fd0a5ddfca04 Mon Sep 17 00:00:00 2001
|
||||
From: Petr Vorel <petr.vorel () gmail ! com>
|
||||
Date: Thu, 22 Jul 2021 16:15:45 +0000
|
||||
Subject: [PATCH] nfsdcltrack/nfsdcltrack.c: Fix printf format
|
||||
|
||||
nfsdcltrack.c: In function 'cltrack_gracedone':
|
||||
nfsdcltrack.c:528:47: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=]
|
||||
528 | xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime);
|
||||
| ~~^ ~~~~~~~~~
|
||||
| | |
|
||||
| long int time_t {aka long long int}
|
||||
| %lld
|
||||
|
||||
Found in Buildroot riscv32 build.
|
||||
|
||||
Link: http://autobuild.buildroot.net/results/9bc1d43a588338b7395af7bc97535ee16a6ea2d9/build-end.log
|
||||
|
||||
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
|
||||
Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=5a53426c0f4e84f6644c11e4f01015597d3bb82c
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
---
|
||||
utils/nfsdcltrack/nfsdcltrack.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c
|
||||
index e926f1c0..0b37c094 100644
|
||||
--- a/utils/nfsdcltrack/nfsdcltrack.c
|
||||
+++ b/utils/nfsdcltrack/nfsdcltrack.c
|
||||
@@ -33,6 +33,7 @@
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
+#include <inttypes.h>
|
||||
#include <unistd.h>
|
||||
#include <libgen.h>
|
||||
#include <sys/inotify.h>
|
||||
@@ -525,7 +526,7 @@ cltrack_gracedone(const char *timestr)
|
||||
if (*tail)
|
||||
return -EINVAL;
|
||||
|
||||
- xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime);
|
||||
+ xlog(D_GENERAL, "%s: grace done. gracetime=%"PRIu64, __func__, gracetime);
|
||||
|
||||
ret = sqlite_remove_unreclaimed(gracetime);
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
From 383d787d1b77f165da68495cb0363220b66935a4 Mon Sep 17 00:00:00 2001
|
||||
From: Steve Dickson <steved@redhat.com>
|
||||
Date: Tue, 27 Jul 2021 21:12:17 -0400
|
||||
Subject: [PATCH] nfsdcltrack: Use uint64_t instead of time_t
|
||||
|
||||
With recent commits (4f2a5b64,5a53426c) that fixed
|
||||
compile errors on x86_64 machines, caused similar
|
||||
errors on i686 machines.
|
||||
|
||||
The variable type that was being used was a time_t,
|
||||
which changes size between architects, which
|
||||
caused the compile error.
|
||||
|
||||
Changing the variable to uint64_t fixed the issue.
|
||||
|
||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
||||
Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=383d787d1b77f165da68495cb0363220b66935a4
|
||||
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
|
||||
---
|
||||
utils/nfsdcltrack/nfsdcltrack.c | 2 +-
|
||||
utils/nfsdcltrack/sqlite.c | 2 +-
|
||||
utils/nfsdcltrack/sqlite.h | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c
|
||||
index 0b37c094..7c1c4bcc 100644
|
||||
--- a/utils/nfsdcltrack/nfsdcltrack.c
|
||||
+++ b/utils/nfsdcltrack/nfsdcltrack.c
|
||||
@@ -508,7 +508,7 @@ cltrack_gracedone(const char *timestr)
|
||||
{
|
||||
int ret;
|
||||
char *tail;
|
||||
- time_t gracetime;
|
||||
+ uint64_t gracetime;
|
||||
|
||||
|
||||
ret = sqlite_prepare_dbh(storagedir);
|
||||
diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c
|
||||
index cea4a411..cf0c6a45 100644
|
||||
--- a/utils/nfsdcltrack/sqlite.c
|
||||
+++ b/utils/nfsdcltrack/sqlite.c
|
||||
@@ -540,7 +540,7 @@ out_err:
|
||||
* remove any client records that were not reclaimed since grace_start.
|
||||
*/
|
||||
int
|
||||
-sqlite_remove_unreclaimed(time_t grace_start)
|
||||
+sqlite_remove_unreclaimed(uint64_t grace_start)
|
||||
{
|
||||
int ret;
|
||||
char *err = NULL;
|
||||
diff --git a/utils/nfsdcltrack/sqlite.h b/utils/nfsdcltrack/sqlite.h
|
||||
index 06e7c044..ba8cdfa8 100644
|
||||
--- a/utils/nfsdcltrack/sqlite.h
|
||||
+++ b/utils/nfsdcltrack/sqlite.h
|
||||
@@ -26,7 +26,7 @@ int sqlite_insert_client(const unsigned char *clname, const size_t namelen,
|
||||
int sqlite_remove_client(const unsigned char *clname, const size_t namelen);
|
||||
int sqlite_check_client(const unsigned char *clname, const size_t namelen,
|
||||
const bool has_session);
|
||||
-int sqlite_remove_unreclaimed(const time_t grace_start);
|
||||
+int sqlite_remove_unreclaimed(const uint64_t grace_start);
|
||||
int sqlite_query_reclaiming(const time_t grace_start);
|
||||
|
||||
#endif /* _SQLITE_H */
|
||||
--
|
||||
2.32.0
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
comment "nfs-utils needs a toolchain w/ threads"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
config BR2_PACKAGE_NFS_UTILS
|
||||
bool "nfs-utils"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libtirpc, rpcbind
|
||||
depends on BR2_USE_MMU # fork()
|
||||
select BR2_PACKAGE_LIBTIRPC # IPv6 requires libtirpc
|
||||
select BR2_PACKAGE_UTIL_LINUX
|
||||
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
|
||||
help
|
||||
The NFS Linux kernel server.
|
||||
|
||||
http://linux-nfs.org/
|
||||
|
||||
if BR2_PACKAGE_NFS_UTILS
|
||||
|
||||
config BR2_PACKAGE_NFS_UTILS_NFSV4
|
||||
bool "NFSv4/NFSv4.1"
|
||||
depends on !BR2_STATIC_LIBS # keyutils, lvm2
|
||||
select BR2_PACKAGE_KEYUTILS
|
||||
select BR2_PACKAGE_LIBEVENT
|
||||
select BR2_PACKAGE_LVM2
|
||||
select BR2_PACKAGE_SQLITE
|
||||
help
|
||||
Enable NFSv4/NFSv4.1 support
|
||||
|
||||
comment "NFSv4/NFSv4.1 support needs a toolchain w/ dynamic library"
|
||||
depends on BR2_STATIC_LIBS
|
||||
|
||||
config BR2_PACKAGE_NFS_UTILS_GSS
|
||||
bool "gss"
|
||||
depends on BR2_PACKAGE_NFS_UTILS_NFSV4
|
||||
select BR2_PACKAGE_LIBTIRPC_GSS
|
||||
help
|
||||
Enable GSS support
|
||||
|
||||
config BR2_PACKAGE_NFS_UTILS_RPCDEBUG
|
||||
bool "rpcdebug"
|
||||
help
|
||||
The RPC debugging utility
|
||||
|
||||
config BR2_PACKAGE_NFS_UTILS_RPC_LOCKD
|
||||
bool "rpc.lockd"
|
||||
help
|
||||
NFS lock manager for Linux kernels older than 2.4
|
||||
|
||||
config BR2_PACKAGE_NFS_UTILS_RPC_NFSD
|
||||
bool "rpc.nfsd"
|
||||
default y
|
||||
select BR2_PACKAGE_RPCBIND # runtime
|
||||
help
|
||||
NFS server
|
||||
|
||||
config BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD
|
||||
bool "rpc.rquotad"
|
||||
help
|
||||
NFS remote quota server
|
||||
|
||||
endif
|
||||
@@ -0,0 +1,83 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# nfs This shell script takes care of starting and stopping
|
||||
# the NFS services. Stolen from RedHat FC5.
|
||||
|
||||
mkdir -p /var/lock/subsys
|
||||
mkdir -p /run/nfs/sm
|
||||
mkdir -p /run/nfs/sm.bak
|
||||
touch /run/nfs/rmtab
|
||||
|
||||
CFG_FILE=/etc/default/nfsd
|
||||
|
||||
NR_THREADS=2
|
||||
if [ -f "${CFG_FILE}" ]; then
|
||||
. "${CFG_FILE}"
|
||||
fi
|
||||
|
||||
|
||||
start() {
|
||||
# Start daemons.
|
||||
printf "Starting NFS statd: "
|
||||
rpc.statd
|
||||
[ $? = 0 ] && echo "OK" || echo "FAIL"
|
||||
touch /var/lock/subsys/nfslock
|
||||
|
||||
printf "Starting NFS services: "
|
||||
/usr/sbin/exportfs -r
|
||||
[ $? = 0 ] && echo "OK" || echo "FAIL"
|
||||
|
||||
printf "Starting NFS daemon: "
|
||||
rpc.nfsd ${NR_THREADS}
|
||||
[ $? = 0 ] && echo "OK" || echo "FAIL"
|
||||
|
||||
printf "Starting NFS mountd: "
|
||||
rpc.mountd
|
||||
[ $? = 0 ] && echo "OK" || echo "FAIL"
|
||||
touch /var/lock/subsys/nfs
|
||||
}
|
||||
|
||||
stop() {
|
||||
# Stop daemons.
|
||||
printf "Shutting down NFS mountd: "
|
||||
killall -q rpc.mountd 2>/dev/null
|
||||
[ $? = 0 ] && echo "OK" || echo "FAIL"
|
||||
|
||||
printf "Shutting down NFS daemon: "
|
||||
killall -q nfsd 2>/dev/null
|
||||
[ $? = 0 ] && echo "OK" || echo "FAIL"
|
||||
|
||||
printf "Shutting down NFS services: "
|
||||
/usr/sbin/exportfs -au
|
||||
[ $? = 0 ] && echo "OK" || echo "FAIL"
|
||||
|
||||
printf "Stopping NFS statd: "
|
||||
killall -q rpc.statd 2>/dev/null
|
||||
[ $? = 0 ] && echo "OK" || echo "FAIL"
|
||||
rm -f /var/lock/subsys/nfs
|
||||
rm -f /var/run/rpc.statd.pid
|
||||
rm -f /var/lock/subsys/nfslock
|
||||
}
|
||||
|
||||
# See how we were called.
|
||||
case "$1" in
|
||||
start)
|
||||
start
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
restart)
|
||||
stop
|
||||
start
|
||||
;;
|
||||
reload)
|
||||
/usr/sbin/exportfs -r
|
||||
touch /var/lock/subsys/nfs
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|restart|reload}"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit 0
|
||||
@@ -0,0 +1,4 @@
|
||||
# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.5.4/sha256sums.asc
|
||||
sha256 51997d94e4c8bcef5456dd36a9ccc38e231207c4e9b6a9a2c108841e6aebe3dd nfs-utils-2.5.4.tar.xz
|
||||
# Locally computed
|
||||
sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING
|
||||
@@ -0,0 +1,128 @@
|
||||
################################################################################
|
||||
#
|
||||
# nfs-utils
|
||||
#
|
||||
################################################################################
|
||||
|
||||
NFS_UTILS_VERSION = 2.5.4
|
||||
NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz
|
||||
NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION)
|
||||
NFS_UTILS_LICENSE = GPL-2.0+
|
||||
NFS_UTILS_LICENSE_FILES = COPYING
|
||||
NFS_UTILS_DEPENDENCIES = host-nfs-utils host-pkgconf libtirpc util-linux
|
||||
NFS_UTILS_CPE_ID_VENDOR = linux-nfs
|
||||
NFS_UTILS_AUTORECONF = YES
|
||||
|
||||
NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no
|
||||
|
||||
NFS_UTILS_CONF_OPTS = \
|
||||
--enable-tirpc \
|
||||
--enable-ipv6 \
|
||||
--without-tcp-wrappers \
|
||||
--with-statedir=/run/nfs \
|
||||
--with-rpcgen=$(HOST_DIR)/bin/rpcgen
|
||||
|
||||
HOST_NFS_UTILS_DEPENDENCIES = host-pkgconf host-libtirpc
|
||||
|
||||
HOST_NFS_UTILS_CONF_OPTS = \
|
||||
--enable-tirpc \
|
||||
--disable-nfsv4 \
|
||||
--disable-nfsv41 \
|
||||
--disable-gss \
|
||||
--disable-uuid \
|
||||
--disable-ipv6 \
|
||||
--without-tcp-wrappers \
|
||||
--with-statedir=/run/nfs \
|
||||
--disable-caps \
|
||||
--without-systemd \
|
||||
--with-rpcgen=internal \
|
||||
--with-tirpcinclude=$(HOST_DIR)/include/tirpc
|
||||
|
||||
NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug
|
||||
NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd
|
||||
NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad
|
||||
NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_NFSD) += usr/sbin/exportfs \
|
||||
usr/sbin/rpc.mountd usr/sbin/rpc.nfsd usr/lib/systemd/system/nfs-server.service
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NFS_UTILS_NFSV4),y)
|
||||
NFS_UTILS_CONF_OPTS += --enable-nfsv4 --enable-nfsv41
|
||||
NFS_UTILS_DEPENDENCIES += keyutils libevent lvm2 sqlite
|
||||
else
|
||||
NFS_UTILS_CONF_OPTS += --disable-nfsv4 --disable-nfsv41
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NFS_UTILS_GSS),y)
|
||||
NFS_UTILS_CONF_OPTS += \
|
||||
--enable-gss \
|
||||
--enable-svcgss \
|
||||
--with-krb5=$(STAGING_DIR)/usr
|
||||
NFS_UTILS_DEPENDENCIES += libkrb5
|
||||
else
|
||||
NFS_UTILS_CONF_OPTS += --disable-gss --disable-svcgss
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP),y)
|
||||
NFS_UTILS_CONF_OPTS += --enable-caps
|
||||
NFS_UTILS_DEPENDENCIES += libcap
|
||||
else
|
||||
NFS_UTILS_CONF_OPTS += --disable-caps
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y)
|
||||
NFS_UTILS_CONF_OPTS += --enable-uuid
|
||||
else
|
||||
NFS_UTILS_CONF_OPTS += --disable-uuid
|
||||
endif
|
||||
|
||||
define NFS_UTILS_INSTALL_FIXUP
|
||||
cd $(TARGET_DIR) && rm -f $(NFS_UTILS_TARGETS_)
|
||||
touch $(TARGET_DIR)/etc/exports
|
||||
$(INSTALL) -D -m 644 \
|
||||
$(@D)/utils/mount/nfsmount.conf $(TARGET_DIR)/etc/nfsmount.conf
|
||||
endef
|
||||
NFS_UTILS_POST_INSTALL_TARGET_HOOKS += NFS_UTILS_INSTALL_FIXUP
|
||||
|
||||
ifeq ($(BR2_INIT_SYSTEMD),y)
|
||||
NFS_UTILS_CONF_OPTS += --with-systemd=/usr/lib/systemd/system
|
||||
NFS_UTILS_DEPENDENCIES += systemd
|
||||
else
|
||||
NFS_UTILS_CONF_OPTS += --without-systemd
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NFS_UTILS_RPC_NFSD),y)
|
||||
define NFS_UTILS_LINUX_CONFIG_FIXUPS
|
||||
$(call KCONFIG_ENABLE_OPT,CONFIG_NFSD)
|
||||
endef
|
||||
|
||||
define NFS_UTILS_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -D -m 0755 package/nfs-utils/S60nfs \
|
||||
$(TARGET_DIR)/etc/init.d/S60nfs
|
||||
endef
|
||||
|
||||
endif
|
||||
|
||||
define NFS_UTILS_INSTALL_INIT_SYSTEMD
|
||||
$(INSTALL) -D -m 0755 package/nfs-utils/nfs-utils_env.sh \
|
||||
$(TARGET_DIR)/usr/libexec/nfs-utils/nfs-utils_env.sh
|
||||
|
||||
$(INSTALL) -D -m 0644 package/nfs-utils/nfs-utils_tmpfiles.conf \
|
||||
$(TARGET_DIR)/usr/lib/tmpfiles.d/nfs-utils.conf
|
||||
endef
|
||||
|
||||
define NFS_UTILS_REMOVE_NFSIOSTAT
|
||||
rm -f $(TARGET_DIR)/usr/sbin/nfsiostat
|
||||
endef
|
||||
|
||||
# nfsiostat is interpreted python, so remove it unless it's in the target
|
||||
NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT)
|
||||
|
||||
define HOST_NFS_UTILS_BUILD_CMDS
|
||||
$(MAKE) -C $(@D)/tools/rpcgen
|
||||
endef
|
||||
|
||||
define HOST_NFS_UTILS_INSTALL_CMDS
|
||||
$(INSTALL) -D -m 0755 $(@D)/tools/rpcgen/rpcgen $(HOST_DIR)/bin/rpcgen
|
||||
endef
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
Executable
+3
@@ -0,0 +1,3 @@
|
||||
#!/bin/sh
|
||||
# This script is empty, it simply needs to exist to make the
|
||||
# nfs-config.service happy.
|
||||
@@ -0,0 +1,4 @@
|
||||
d /run/nfs/sm 0700 root root -
|
||||
d /run/nfs/sm.bak 0700 root root -
|
||||
f /run/nfs/rmtab 0644 root root -
|
||||
f /run/nfs/etab 0644 root root -
|
||||
Reference in New Issue
Block a user