aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <joshua.lock@collabora.co.uk>2015-09-04 15:59:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-06 15:24:19 +0100
commitda8269ed0fd609699b23c2e3e6c61bc54f7b2832 (patch)
treee1d4737af3ad1b207f83c98bd99872216d8d0a6d
parentaa761ddad6643ac755de0b8e9841f19245b3f5c1 (diff)
downloadopenembedded-core-contrib-da8269ed0fd609699b23c2e3e6c61bc54f7b2832.tar.gz
openembedded-core-contrib-da8269ed0fd609699b23c2e3e6c61bc54f7b2832.tar.bz2
openembedded-core-contrib-da8269ed0fd609699b23c2e3e6c61bc54f7b2832.zip
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 <joshua.lock@collabora.co.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb8
1 files changed, 8 insertions, 0 deletions
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 6da85090d52..42101de7955 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() {