Patchwork [5/5] nfs-utils: fix QA issue

login
register
mail settings
Submitter Hongxu Jia
Date Nov. 4, 2013, 9:56 a.m.
Message ID <6c79b4f19987602bbc7b421f95c688ca9a47222e.1383558655.git.hongxu.jia@windriver.com>
Download mbox | patch
Permalink /patch/61095/
State New
Headers show

Comments

Hongxu Jia - Nov. 4, 2013, 9:56 a.m.
...
WARNING: QA Issue: nfs-utils: Found a reference to /usr/ in /home/jiahongxu/yocto/build-20131025-gcc5/bitbake_build/tmp/work/x86_64-wrs-linux/nfs-utils/1.2.8-r1/packages-split/nfs-utils/sbin/osd_login
WARNING: QA Issue: Shell scripts in base_bindir and base_sbindir should not reference anything in exec_prefix
...

Install osd_login in ${sbindir} rather than ${base_sbindir} fixed this issue

[YOCTO #5142]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 ...et-sbindir-can-be-overridden-at-config-ti.patch | 24 ++++++++++++++++++++++
 .../nfs-utils/nfs-utils_1.2.8.bb                   |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/osd_login-let-sbindir-can-be-overridden-at-config-ti.patch

Patch

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/osd_login-let-sbindir-can-be-overridden-at-config-ti.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/osd_login-let-sbindir-can-be-overridden-at-config-ti.patch
new file mode 100644
index 0000000..ffa5b2f
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/osd_login-let-sbindir-can-be-overridden-at-config-ti.patch
@@ -0,0 +1,24 @@ 
+osd_login: let sbindir can be overridden at config time
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+Upstream-Status: Pending
+---
+ utils/osd_login/Makefile.am | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/utils/osd_login/Makefile.am b/utils/osd_login/Makefile.am
+--- a/utils/osd_login/Makefile.am
++++ b/utils/osd_login/Makefile.am
+@@ -1,9 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-# These binaries go in /sbin (not /usr/sbin), and that cannot be
+-# overridden at config time.
+-sbindir = /sbin
+-
+ sbin_SCRIPTS = osd_login
+ 
+ MAINTAINERCLEANFILES = Makefile.in
+-- 
+1.8.1.2
+
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
index e3e8136..84dd623 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
@@ -15,6 +15,7 @@  RRECOMMENDS_${PN} = "kernel-module-nfsd"
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.bz2 \
            file://nfs-utils-1.0.6-uclibc.patch \
            file://nfs-utils-1.2.3-sm-notify-res_init.patch \
+           file://osd_login-let-sbindir-can-be-overridden-at-config-ti.patch \
            file://nfsserver \
            file://nfs-utils.conf \
            file://nfs-server.service \