From da8269ed0fd609699b23c2e3e6c61bc54f7b2832 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Fri, 4 Sep 2015 15:59:45 +0100 Subject: nfs-utils: don't force use of /sbin as sbindir The Makefile for mount and osd_login utilities forces /sbin as asbindir, however on a merged /usr system this directory might not exist. Instead sed in the system sbindir. Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb index 6da85090d5..42101de795 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb @@ -90,6 +90,14 @@ RDEPENDS_${PN}-stats = "python" FILES_${PN} += "${systemd_unitdir}" +do_configure_prepend() { + sed -i -e 's,sbindir = /sbin,sbindir = ${base_sbindir},g' \ + ${S}/utils/mount/Makefile.am + + sed -i -e 's,sbindir = /sbin,sbindir = ${base_sbindir},g' \ + ${S}/utils/osd_login/Makefile.am +} + # Make clean needed because the package comes with # precompiled 64-bit objects that break the build do_compile_prepend() { -- cgit 1.2.3-korg