mirror of
https://github.com/godotengine/buildroot.git
synced 2026-01-06 18:09:44 +03:00
package/nfs-utils: bump version to 2.6.2
nfs-utils 2.6.2 adds nfsrahead tool to set readahead through sysfs, but this tool is mandatory and requires libmount that in order requires libblkid. Also we need a local patch that is already pending upstream to avoid failing static linking: https://patchwork.kernel.org/project/linux-nfs/patch/20220809223308.1421081-1-giulio.benetti@benettiengineering.com/ So let's select: - BR2_PACKAGE_UTIL_LINUX_LIBMOUNT - BR2_PACKAGE_UTIL_LINUX_LIBBLKID and add the pending patch for fixing static linking failure due to wrong order of libraries in linker list(-lblkid must follow -lmount). This is achieved by using pkg-config that is already a dependency of this package. Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
committed by
Thomas Petazzoni
parent
3485757c37
commit
11477df6b1
@@ -0,0 +1,34 @@
|
|||||||
|
From a69014a1b4e5b8068630abe3109f31eb64b6a076 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||||
|
Date: Wed, 10 Aug 2022 00:10:51 +0200
|
||||||
|
Subject: [PATCH] nfsrahead: fix linking while static linking
|
||||||
|
|
||||||
|
-lmount must preceed -lblkid and to obtain this let's add:
|
||||||
|
`pkg-config --libs mount`
|
||||||
|
in place of:
|
||||||
|
`-lmount`
|
||||||
|
This ways the library order will always be correct.
|
||||||
|
|
||||||
|
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||||
|
---
|
||||||
|
Pending Upstream:
|
||||||
|
https://patchwork.kernel.org/project/linux-nfs/patch/20220809223308.1421081-1-giulio.benetti@benettiengineering.com/
|
||||||
|
---
|
||||||
|
tools/nfsrahead/Makefile.am | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/tools/nfsrahead/Makefile.am b/tools/nfsrahead/Makefile.am
|
||||||
|
index 845ea0d5..280a2eb4 100644
|
||||||
|
--- a/tools/nfsrahead/Makefile.am
|
||||||
|
+++ b/tools/nfsrahead/Makefile.am
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
libexec_PROGRAMS = nfsrahead
|
||||||
|
nfsrahead_SOURCES = main.c
|
||||||
|
-nfsrahead_LDFLAGS= -lmount
|
||||||
|
+nfsrahead_LDFLAGS= `pkg-config --libs mount`
|
||||||
|
nfsrahead_LDADD = ../../support/nfs/libnfsconf.la
|
||||||
|
|
||||||
|
man5_MANS = nfsrahead.man
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
||||||
@@ -8,6 +8,8 @@ config BR2_PACKAGE_NFS_UTILS
|
|||||||
depends on BR2_USE_MMU # fork()
|
depends on BR2_USE_MMU # fork()
|
||||||
select BR2_PACKAGE_LIBTIRPC # IPv6 requires libtirpc
|
select BR2_PACKAGE_LIBTIRPC # IPv6 requires libtirpc
|
||||||
select BR2_PACKAGE_UTIL_LINUX
|
select BR2_PACKAGE_UTIL_LINUX
|
||||||
|
select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
|
||||||
|
select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
|
||||||
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
|
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
|
||||||
help
|
help
|
||||||
The NFS Linux kernel server.
|
The NFS Linux kernel server.
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.6.1/sha256sums.asc
|
# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.6.2/sha256sums.asc
|
||||||
sha256 60dfcd94a9f3d72a12bc7058d811787ec87a6d593d70da2123faf9aad3d7a1df nfs-utils-2.6.1.tar.xz
|
sha256 5200873e81c4d610e2462fc262fe18135f2dbe78b7979f95accd159ae64d5011 nfs-utils-2.6.2.tar.xz
|
||||||
# Locally computed
|
# Locally computed
|
||||||
sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING
|
sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
NFS_UTILS_VERSION = 2.6.1
|
NFS_UTILS_VERSION = 2.6.2
|
||||||
NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz
|
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_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION)
|
||||||
NFS_UTILS_LICENSE = GPL-2.0+
|
NFS_UTILS_LICENSE = GPL-2.0+
|
||||||
|
|||||||
Reference in New Issue
Block a user