[v2,1/1] package/sudo: fix rmdir
diff mbox series

Message ID 20191108173719.27345-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series
  • [v2,1/1] package/sudo: fix rmdir
Related show

Commit Message

Fabrice Fontaine Nov. 8, 2019, 5:37 p.m. UTC
Pass --ignore-fail-on-non-empty to rmdir to fix the following error:

rmdir /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-2/output/target/etc/sudoers.d
rmdir: failed to remove '/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-2/output/target/etc/sudoers.d': Directory not empty

Fixes:
 - http://autobuild.buildroot.org/results/0cfc61a98760c1d3a98aa0f1e126767881c49abd

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Yann E. Morin):
 - Pass --ignore-fail-on-non-empty option to rmdir instead of $(RM) -rf

 package/sudo/sudo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Yann E. MORIN Nov. 8, 2019, 7:19 p.m. UTC | #1
Fabrice, All,

On 2019-11-08 18:37 +0100, Fabrice Fontaine spake thusly:
> Pass --ignore-fail-on-non-empty to rmdir to fix the following error:
> 
> rmdir /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-2/output/target/etc/sudoers.d
> rmdir: failed to remove '/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-2/output/target/etc/sudoers.d': Directory not empty
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/0cfc61a98760c1d3a98aa0f1e126767881c49abd
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

I expanded the commit log with a blurb about why 'rm -rf' is not
adequate, and pushed to master now. Thanks.

Regards,
Yann E. MORIN.

> ---
> Changes v1 -> v2 (after review of Yann E. Morin):
>  - Pass --ignore-fail-on-non-empty option to rmdir instead of $(RM) -rf
> 
>  package/sudo/sudo.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
> index 7d52eb0b57..a7966047f8 100644
> --- a/package/sudo/sudo.mk
> +++ b/package/sudo/sudo.mk
> @@ -66,7 +66,7 @@ endef
>  
>  define SUDO_REMOVE_DIST_EXAMPLES
>  	$(RM) $(TARGET_DIR)/etc/sudoers.dist
> -	rmdir $(TARGET_DIR)/etc/sudoers.d
> +	rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/etc/sudoers.d
>  endef
>  SUDO_POST_INSTALL_TARGET_HOOKS += SUDO_REMOVE_DIST_EXAMPLES
>  
> -- 
> 2.23.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

Patch
diff mbox series

diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index 7d52eb0b57..a7966047f8 100644
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -66,7 +66,7 @@  endef
 
 define SUDO_REMOVE_DIST_EXAMPLES
 	$(RM) $(TARGET_DIR)/etc/sudoers.dist
-	rmdir $(TARGET_DIR)/etc/sudoers.d
+	rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/etc/sudoers.d
 endef
 SUDO_POST_INSTALL_TARGET_HOOKS += SUDO_REMOVE_DIST_EXAMPLES