summaryrefslogtreecommitdiffstats
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:26:21 +0100
commit1e9ed16b82ae04839e015c8b4bb91403879875f1 (patch)
tree0d7f46919b31655d0ef1c048aa725eb5f7e0044b
parent73a6fe958f47642d18ba0098cfd45c3520d53560 (diff)
downloadpoky-1e9ed16b82ae04839e015c8b4bb91403879875f1.tar.gz
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. (From OE-Core rev: da8269ed0fd609699b23c2e3e6c61bc54f7b2832) 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 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"
90 90
91FILES_${PN} += "${systemd_unitdir}" 91FILES_${PN} += "${systemd_unitdir}"
92 92
93do_configure_prepend() {
94 sed -i -e 's,sbindir = /sbin,sbindir = ${base_sbindir},g' \
95 ${S}/utils/mount/Makefile.am
96
97 sed -i -e 's,sbindir = /sbin,sbindir = ${base_sbindir},g' \
98 ${S}/utils/osd_login/Makefile.am
99}
100
93# Make clean needed because the package comes with 101# Make clean needed because the package comes with
94# precompiled 64-bit objects that break the build 102# precompiled 64-bit objects that break the build
95do_compile_prepend() { 103do_compile_prepend() {