Using find's -exec to remove directories causes 'not found' errors when find tries...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6849 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/Makefile b/Makefile
index ab4c4d5..05c4f45 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -171,7 +171,7 @@ docclean:
        $(MAKE) -C docs/ clean
 
 symlinkclean:
-       find package -type l -exec rm -f {} \;
+       find package -type l -exec rm -f {} +
 
 .SILENT: clean dirclean distclean symlinkclean config-clean download world
 FORCE: ;

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index d824d26..8b31706 100644 (file)
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -71,9 +71,9 @@ ifeq ($(DUMP),)
     $$(IPKG_$(1)): $(PKG_BUILD_DIR)/.built $$(IDIR_$(1))/CONTROL/control
        $(call Package/$(1)/install,$$(IDIR_$(1)))
        mkdir -p $(PACKAGE_DIR)
-       -find $$(IDIR_$(1)) -name CVS   -exec rm -rf {} \;
-       -find $$(IDIR_$(1)) -name .svn  -exec rm -rf {} \;
-       -find $$(IDIR_$(1)) -name '.#*' -exec rm -f  {} \;
+       -find $$(IDIR_$(1)) -name CVS   -exec rm -rf {} +
+       -find $$(IDIR_$(1)) -name .svn  -exec rm -rf {} +
+       -find $$(IDIR_$(1)) -name '.#*' -exec rm -f  {} +
        $(RSTRIP) $$(IDIR_$(1))
        $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
        @[ -f $$(IPKG_$(1)) ] || false 

diff --git a/scripts/feeds.sh b/scripts/feeds.sh
index d2dfe9d..9fc3343 100755 (executable)
--- a/scripts/feeds.sh
+++ b/scripts/feeds.sh
@@ -22,7 +22,7 @@ cd $TOPDIR
 
 # Some functions we might call several times a run
 delete_symlinks() {
-       find $1 -type l -exec rm -f {} \;
+       find $1 -type l -exec rm -f {} +
 }
 
 setup_symlinks() {