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(-)

Comments

Mathieu Dubois-Briand Nov. 15, 2025, 11:03 a.m. UTC | #1
On Fri Nov 14, 2025 at 1:42 PM CET, Ross Burton via lists.openembedded.org wrote:
> 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>
> ---

Hi Ross,

I suspect this patch or the next one breaks nfs-utils installation, but
why?

ERROR: core-image-full-cmdline-1.0-r0 do_rootfs: Could not invoke dnf. Command '/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_64-poky-linux/core-image-full-cmdline/1.0/recipe-sysroot-native/usr/bin/dnf -v --rpmverbosity=info -y -c /srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_64-poky-linux/core-image-full-cmdline/1.0/rootfs/etc/dnf/dnf.conf --setopt=reposdir=/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_64-poky-linux/core-image-full-cmdline/1.0/rootfs/etc/yum.repos.d --installroot=/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_64-poky-linux/core-image-full-cmdline/1.0/rootfs --setopt=logdir=/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_64-poky-linux/core-image-full-cmdline/1.0/temp --repofrompath=oe-repo,/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_64-poky-linux/core-image-full-cmdline/1.0/oe-rootfs-repo --nogpgcheck install dnf packagegroup-core-boot packagegroup-core-full-cmdline packagegroup-core-ssh-openssh psplash rpm run-postinsts locale-base-c locale-base-en-us locale-base-en-gb' returned 1:
...
Error:
 Problem: package packagegroup-core-full-cmdline-sys-services-1.0-r0.noarch from oe-repo requires nfs-utils, but none of the providers can be installed
  - package packagegroup-core-full-cmdline-1.0-r0.noarch from oe-repo requires packagegroup-core-full-cmdline-sys-services, but none of the providers can be installed
  - package nfs-utils-2.8.4-r0.core2_64 from oe-repo requires nfs-utils-client, but none of the providers can be installed
  - conflicting requests
  - nothing provides nfs-utils-mount needed by nfs-utils-client-2.8.4-r0.core2_64 from oe-repo
(try to add '--skip-broken' to skip uninstallable packages)

https://autobuilder.yoctoproject.org/valkyrie/#/builders/4/builds/2733
(and most of the builds in https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/2725)

Can you have a look?

Thanks,
Mathieu
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
 }