diff mbox series

[1/2] nfs-utils: clean up sbin installation

Message ID 20251114124218.3595920-1-ross.burton@arm.com
State New
Headers show
Series [1/2] nfs-utils: clean up sbin installation | expand

Commit Message

Ross Burton Nov. 14, 2025, 12:42 p.m. UTC 
There's no need to sed the Makefiles as there's an option to simply
respect sbindir.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.4.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.4.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.4.bb
index 08e7dd89003..fcbbadd914a 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.4.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.4.bb
@@ -51,6 +51,7 @@  EXTRA_OECONF = "--with-statduser=rpcuser \
                 --with-statdpath=/var/lib/nfs/statd \
                 --with-pluginpath=${libdir}/libnfsidmap \
                 --with-rpcgen=${HOSTTOOLS_DIR}/rpcgen \
+                --disable-sbin-override \
                "
 
 LDFLAGS += "-lsqlite3 -levent"
@@ -117,9 +118,8 @@  FILES:${PN}-staticdev += "${libdir}/libnfsidmap/*.a"
 FILES:${PN} += "${systemd_unitdir} ${libdir}/libnfsidmap/ ${nonarch_libdir}/modprobe.d"
 
 do_configure:prepend() {
-	sed -i -e 's,sbindir = .*,sbindir = ${base_sbindir},g' \
-		-e 's,udev_rulesdir = .*,udev_rulesdir = ${nonarch_base_libdir}/udev/rules.d/,g' \
-		${S}/utils/mount/Makefile.am ${S}/utils/nfsdcltrack/Makefile.am \
+	# Upstream hardcodes the rules directory to /usr/lib/udev/rules.d/
+	sed -i -e 's,udev_rulesdir = .*,udev_rulesdir = ${nonarch_base_libdir}/udev/rules.d/,g' \
 		${S}/systemd/Makefile.am ${S}/tools/nfsrahead/Makefile.am
 }