Upgrade nfs-utils and ccache
cover Upgrade nfs-utils and ccache
From: Robert Yang <[email protected]>
The following changes since commit ba3bd832e810bfb96bfa6fcd52710de185dbee22:
overlayfs: Disable renaming of network interfaces (2025-09-15 17:52:52 +0100)
are available in the Git repository at:
https://github.com/robertlinux/yocto rbt/pu
https://github.com/robertlinux/yocto/tree/rbt/pu
Robert Yang (2):
nfs-utils: 2.8.3 -> 2.8.4
ccache: 4.11.3 -> 4.12
.../0002-Fix-build-with-glibc-2.42.patch | 57 -------------------
...{nfs-utils_2.8.3.bb => nfs-utils_2.8.4.bb} | 3 +-
.../{ccache_4.11.3.bb => ccache_4.12.bb} | 4 +-
3 files changed, 3 insertions(+), 61 deletions(-)
delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0002-Fix-build-with-glibc-2.42.patch
rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.8.3.bb => nfs-utils_2.8.4.bb} (97%)
rename meta/recipes-devtools/ccache/{ccache_4.11.3.bb => ccache_4.12.bb} (88%)Signature · 1 line
2.49.0
PATCH 1/2 nfs-utils: 2.8.3 -> 2.8.4
From: Robert Yang <[email protected]>
* Remove backported patch 0002-Fix-build-with-glibc-2.42.patch.
Signed-off-by Robert Yang <[email protected]>
---
.../0002-Fix-build-with-glibc-2.42.patch | 57 -------------------
...{nfs-utils_2.8.3.bb => nfs-utils_2.8.4.bb} | 3 +-
2 files changed, 1 insertion(+), 59 deletions(-)
delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0002-Fix-build-with-glibc-2.42.patch
rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.8.3.bb => nfs-utils_2.8.4.bb} (97%)meta/recipes-connectivity/nfs-utils/nfs-utils/0002-Fix-build-with-glibc-2.42.patch deleted +0 -57
@@ -1,57 +0,0 @@ -From d74ef9afacf9dc4a067a2f984f52ad136fb46c31 Mon Sep 17 00:00:00 2001 -From: Yaakov Selkowitz <[email protected]> -Date: Fri, 27 Jun 2025 04:54:08 -0500 -Subject: [PATCH] Fix build with glibc-2.42 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -exportfs.c: In function ârelease_lockfileâ: -exportfs.c:83:17: error: ignoring return value of âlockfâ declared with attribute âwarn_unused_resultâ [-Werror=unused-result] - 83 | lockf(_lockfd, F_ULOCK, 0); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~ -exportfs.c: In function âgrab_lockfileâ: -exportfs.c:77:17: error: ignoring return value of âlockfâ declared with attribute âwarn_unused_resultâ [-Werror=unused-result] - 77 | lockf(_lockfd, F_LOCK, 0); - | ^~~~~~~~~~~~~~~~~~~~~~~~~ - -lockf is now marked with attribute warn_unused_result: - -https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=f3c82fc1b41261f582f5f9fa12f74af9bcbc88f9 - -Upstream-Status: Backport [https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=9f974046c37b7c28705d5558328759fff708b1cb] -Signed-off-by: Steve Dickson <[email protected]> -Signed-off-by: Khem Raj <[email protected]> ---- - utils/exportfs/exportfs.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c -index b03a047..748c38e 100644 ---- a/utils/exportfs/exportfs.c -+++ b/utils/exportfs/exportfs.c -@@ -74,13 +74,19 @@ grab_lockfile(void) - { - _lockfd = open(lockfile, O_CREAT|O_RDWR, 0666); - if (_lockfd != -1) -- lockf(_lockfd, F_LOCK, 0); -+ if (lockf(_lockfd, F_LOCK, 0) != 0) { -+ xlog_warn("%s: lockf() failed: errno %d (%s)", -+ __func__, errno, strerror(errno)); -+ } - } - static void - release_lockfile(void) - { - if (_lockfd != -1) { -- lockf(_lockfd, F_ULOCK, 0); -+ if (lockf(_lockfd, F_ULOCK, 0) != 0) { -+ xlog_warn("%s: lockf() failed: errno %d (%s)", -+ __func__, errno, strerror(errno)); -+ } - close(_lockfd); - _lockfd = -1; - } --- -2.43.0 -
meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.4.bb renamed from meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.3.bb +1 -2
@@ -22,12 +22,11 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://nfsserver \ file://nfscommon \ file://0001-locktest-Makefile.am-Do-not-use-build-flags.patch \ - file://0002-Fix-build-with-glibc-2.42.patch \ file://0004-Use-nogroup-for-nobody-group.patch \ file://0005-find-OE-provided-Kerberos.patch \ " -SRC_URI[sha256sum] = "11e7c5847a8423a72931c865bd9296e7fd56ff270a795a849183900961711725" +SRC_URI[sha256sum] = "11c4cc598a434d7d340bad3e072a373ba1dcc2c49f855d44b202222b78ecdbf5" # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies.
Signature · 1 line
2.49.0
PATCH 2/2 ccache: 4.11.3 -> 4.12
In reply to [email protected]From: Robert Yang <[email protected]>
License-Update: Third party packages' versions updated
Signed-off-by Robert Yang <[email protected]>
---
.../ccache/{ccache_4.11.3.bb => ccache_4.12.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/ccache/{ccache_4.11.3.bb => ccache_4.12.bb} (88%)meta/recipes-devtools/ccache/ccache_4.12.bb renamed from meta/recipes-devtools/ccache/ccache_4.11.3.bb +2 -2
@@ -7,7 +7,7 @@ HOMEPAGE = "http://ccache.samba.org" SECTION = "devel" LICENSE = "GPL-3.0-or-later & MIT & BSL-1.0 & ISC" -LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=b98c3470e22877fefa43a01a2dd0669c \ +LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=5633f18ca110f0d4cb907eba07c920ef \ file://src/third_party/cpp-httplib/httplib.h;endline=6;md5=663aca6f84e7d67ade228aad32afc0ea \ file://src/third_party/nonstd-span/nonstd/span.hpp;endline=9;md5=b4af92a7f068b38c5b3410dceb30c186 \ file://src/third_party/win32-compat/win32/mktemp.c;endline=17;md5=d287e9c1f1cd2bb2bd164490e1cf449a \
@@ -17,7 +17,7 @@ DEPENDS = "zstd fmt xxhash" SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz" -SRC_URI[sha256sum] = "28a407314f03a7bd7a008038dbaffa83448bc670e2fc119609b1d99fb33bb600" +SRC_URI[sha256sum] = "e884c62cbacae2e9488b8641a671a79fb7a1221db01310dacef61c9e55c2e55b" inherit cmake github-releases
Signature · 1 line
2.49.0