svn commit: trunk/busybox: libbb
vda at busybox.net
vda at busybox.net
Tue Dec 12 23:46:32 UTC 2006
Author: vda
Date: 2006-12-12 15:46:31 -0800 (Tue, 12 Dec 2006)
New Revision: 16863
Log:
build system: small fix for "release" target to work
Modified:
trunk/busybox/Makefile.custom
trunk/busybox/libbb/recursive_action.c
Changeset:
Modified: trunk/busybox/Makefile.custom
===================================================================
--- trunk/busybox/Makefile.custom 2006-12-12 22:31:15 UTC (rev 16862)
+++ trunk/busybox/Makefile.custom 2006-12-12 23:46:31 UTC (rev 16863)
@@ -46,17 +46,17 @@
release: distclean
cd ..; \
rm -r -f busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION); \
- cp -a busybox busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) && \
+ cp -a busybox busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) && { \
find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type d \
-name .svn \
-print \
- -exec rm -r -f {} \; && \
+ -exec rm -r -f {} \; ; \
find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type f \
-name .\#* \
-print \
- -exec rm -f {} \; && \
+ -exec rm -f {} \; ; \
tar -czf busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION).tar.gz \
- busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/;
+ busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ ; }
.PHONY: checkhelp
checkhelp:
Modified: trunk/busybox/libbb/recursive_action.c
===================================================================
--- trunk/busybox/libbb/recursive_action.c 2006-12-12 22:31:15 UTC (rev 16862)
+++ trunk/busybox/libbb/recursive_action.c 2006-12-12 23:46:31 UTC (rev 16863)
@@ -93,6 +93,10 @@
dir = opendir(fileName);
if (!dir) {
+ /* findutils-4.1.20 reports this */
+ /* (i.e. it doesn't silently return with exit code 1) */
+ /* To trigger: "find -exec rm -rf {} \;" */
+ bb_perror_msg("%s", fileName);
return FALSE;
}
status = TRUE;
More information about the busybox-cvs
mailing list