Patchwork [meta-networking] cifs-utils: add --ignore-fail-on-non-empty for rmdir

login
register
mail settings
Submitter Robert Yang
Date Oct. 24, 2013, 2:40 p.m.
Message ID <1382625650-9266-1-git-send-email-liezhi.yang@windriver.com>
Download mbox | patch
Permalink /patch/60471/
State Accepted
Commit 2e4b24dad58095579ce3fb34a33b029cfcf0a813
Headers show

Comments

Robert Yang - Oct. 24, 2013, 2:40 p.m.
Add --ignore-fail-on-non-empty for rmdir in case there are files in the
directories.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta-networking/recipes-support/cifs/cifs-utils_git.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Joe MacDonald - Oct. 24, 2013, 7:49 p.m.
Merged, thanks.
-J.

[[oe] [meta-networking] [PATCH] cifs-utils: add --ignore-fail-on-non-empty for rmdir] On 13.10.24 (Thu 10:40) Robert Yang wrote:

> Add --ignore-fail-on-non-empty for rmdir in case there are files in the
> directories.
> 
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>  meta-networking/recipes-support/cifs/cifs-utils_git.bb |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-networking/recipes-support/cifs/cifs-utils_git.bb b/meta-networking/recipes-support/cifs/cifs-utils_git.bb
> index fc7a4d3..d8de714 100644
> --- a/meta-networking/recipes-support/cifs/cifs-utils_git.bb
> +++ b/meta-networking/recipes-support/cifs/cifs-utils_git.bb
> @@ -20,7 +20,7 @@ inherit autotools pkgconfig
>  do_install_append() {
>      # Remove empty /usr/bin and /usr/sbin directories since the mount helper
>      # is installed to /sbin
> -    rmdir ${D}${bindir} ${D}${sbindir}
> +    rmdir --ignore-fail-on-non-empty ${D}${bindir} ${D}${sbindir}
>  }
>  
>  RRECOMMENDS_${PN} = "kernel-module-cifs"

Patch

diff --git a/meta-networking/recipes-support/cifs/cifs-utils_git.bb b/meta-networking/recipes-support/cifs/cifs-utils_git.bb
index fc7a4d3..d8de714 100644
--- a/meta-networking/recipes-support/cifs/cifs-utils_git.bb
+++ b/meta-networking/recipes-support/cifs/cifs-utils_git.bb
@@ -20,7 +20,7 @@  inherit autotools pkgconfig
 do_install_append() {
     # Remove empty /usr/bin and /usr/sbin directories since the mount helper
     # is installed to /sbin
-    rmdir ${D}${bindir} ${D}${sbindir}
+    rmdir --ignore-fail-on-non-empty ${D}${bindir} ${D}${sbindir}
 }
 
 RRECOMMENDS_${PN} = "kernel-module-cifs"