Skip to contentSkip to conversation

package/sudo: fix rmdir

PATCH New Fabrice Fontaine 2 participants 2 messages Nov 8, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/sudo: fix rmdir

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

---
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(-)
package/sudo/sudo.mk +1 -1
index 7d52eb0b57..a7966047f8 100644
@@ -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
 
Signature · 1 line
2.23.0
#1 lore raw

PATCH v2 1/1 package/sudo: fix rmdir

Fabrice, All,

On 2019-11-08 18:37 +0100, Fabrice Fontaine spake thusly:

Quoted 9 lines

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

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.

Quoted 27 lines

---
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(-)
package/sudo/sudo.mk +1 -1
index 7d52eb0b57..a7966047f8 100644
@@ -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
 
Signature · 6 lines
2.23.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'