Patchwork cifs-utils: fix the installed but not shipped issue

login
register
mail settings
Submitter Robert Yang
Date Oct. 22, 2013, 7:33 a.m.
Message ID <1382427200-7587-1-git-send-email-liezhi.yang@windriver.com>
Download mbox | patch
Permalink /patch/60349/
State New, archived
Headers show

Comments

Robert Yang - Oct. 22, 2013, 7:33 a.m.
We will get the following ERROR/WARN if we enable the
installed-vs-shipped check in QA:

ERROR: QA Issue: cifs-utils: Files/directories were installed but not shipped
  /usr/bin

Remove the empty dir will fix the problem.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 recipes-support/cifs/cifs-utils_git.bb |    1 +
 1 file changed, 1 insertion(+)
Robert Yang - Oct. 22, 2013, 7:59 a.m.
Please ignore this one, I will send an update one with proper Subject set.

// Robert

On 10/22/2013 03:33 PM, Robert Yang wrote:
> We will get the following ERROR/WARN if we enable the
> installed-vs-shipped check in QA:
>
> ERROR: QA Issue: cifs-utils: Files/directories were installed but not shipped
>    /usr/bin
>
> Remove the empty dir will fix the problem.
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>   recipes-support/cifs/cifs-utils_git.bb |    1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/recipes-support/cifs/cifs-utils_git.bb b/recipes-support/cifs/cifs-utils_git.bb
> index 89ff265..15bcf2e 100644
> --- a/recipes-support/cifs/cifs-utils_git.bb
> +++ b/recipes-support/cifs/cifs-utils_git.bb
> @@ -21,6 +21,7 @@ do_install_append() {
>       # Remove empty /usr/sbin directories since the mount helper
>       # is installed to /sbin
>       rmdir ${D}${sbindir}
> +    rmdir --ignore-fail-on-non-empty ${D}${bindir}
>   }
>
>   RRECOMMENDS_${PN} = "kernel-module-cifs"
>

Patch

diff --git a/recipes-support/cifs/cifs-utils_git.bb b/recipes-support/cifs/cifs-utils_git.bb
index 89ff265..15bcf2e 100644
--- a/recipes-support/cifs/cifs-utils_git.bb
+++ b/recipes-support/cifs/cifs-utils_git.bb
@@ -21,6 +21,7 @@  do_install_append() {
     # Remove empty /usr/sbin directories since the mount helper
     # is installed to /sbin
     rmdir ${D}${sbindir}
+    rmdir --ignore-fail-on-non-empty ${D}${bindir}
 }
 
 RRECOMMENDS_${PN} = "kernel-module-cifs"