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

login
register
mail settings
Submitter Hongxu Jia
Date Nov. 4, 2013, 7:59 a.m.
Message ID <527753E1.2060606@windriver.com>
Download mbox | patch
Permalink /patch/61079/
State New
Headers show

Comments

Hongxu Jia - Nov. 4, 2013, 7:59 a.m.
On 11/04/2013 03:13 PM, Hongxu Jia wrote:
> ...
> 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
> ...
>
> Move osd_login from ${base_sbindir} to ${sbindir} fixed this issue
>
> [YOCTO #5142]
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
>   meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb | 2 ++
>   1 file changed, 2 insertions(+)
>
> 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..5329822 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
> @@ -89,4 +89,6 @@ do_install_append () {
>   	rm -f ${D}${sbindir}/rpcdebug
>   	rm -f ${D}${sbindir}/rpcgen
>   	rm -f ${D}${sbindir}/locktest
> +
> +	mv ${D}${base_sbindir}/osd_login ${D}${sbindir}/osd_login
There will be error while rerun 'bitbake nfs-utils -cinstall -f'.

It's better to modify osd_login's Makefile to let its be installed in 
${sbindir}
rather than the hardcoded moving in bb,

I have updated git://git.pokylinux.org/poky-contrib hongxu/fix-qa-issue

--- /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
+

//Hongxu


>   }

Patch

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 \