From 0359c6222e7253eed3c7a0e4b565c1d0608720e0 Mon Sep 17 00:00:00 2001 From: Mike Baker Date: Tue, 3 Apr 2007 11:56:08 +0000 Subject: [PATCH] Using find's -exec to remove directories causes 'not found' errors when find tries to search the removed directory. Hopefully fixed now. SVN-Revision: 6849 --- Makefile | 2 +- include/package-ipkg.mk | 6 +++--- scripts/feeds.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ab4c4d57b65c..05c4f450e1f0 100644 --- 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 d824d268f412..8b317065bfd4 100644 --- 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 d2dfe9da9f26..9fc3343a1be1 100755 --- 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() { -- 2.30.2