summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-04-12 19:18:38 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-04-12 19:18:38 +0000
commit99ba699421c041858df7fcb50379e3b21798ae12 (patch)
tree76c846e43279bd22c30a82c78efcc81ca125e6a2
parenta5628b31a4092369fcec6966fbddddd282cd6d08 (diff)
revert find | xargs => find | exec changes - this is completely unnecessary and introduces additional dependencies that we do not need
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6942 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--Makefile2
-rw-r--r--include/image.mk6
-rw-r--r--include/package-ipkg.mk6
-rw-r--r--include/prereq-build.mk8
-rwxr-xr-xscripts/feeds.sh2
-rw-r--r--target/imagebuilder/Makefile4
-rw-r--r--target/sdk/Makefile4
7 files changed, 12 insertions, 20 deletions
diff --git a/Makefile b/Makefile
index 2a5180c61b..6b30ef92fa 100644
--- a/Makefile
+++ b/Makefile
@@ -155,7 +155,7 @@ docclean:
$(MAKE) -C docs/ clean
symlinkclean:
- find package -type l -exec rm -f {} +
+ find package -type l | xargs -r rm -f
.SILENT: clean dirclean distclean symlinkclean config-clean download world help tmp/.packageinfo tmp/.targetinfo tmpinfo-clean tmp/.config-package.in tmp/.config-target.in .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target
FORCE: ;
diff --git a/include/image.mk b/include/image.mk
index eb59ea651c..0e6a7cdbea 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -79,9 +79,9 @@ endif
define Image/mkfs/prepare/default
- find $(BUILD_DIR)/root -type f -not -perm +0100 -not -name 'ssh_host*' -exec chmod 0644 {} \;
- find $(BUILD_DIR)/root -type f -perm +0100 -exec chmod 0755 {} \;
- find $(BUILD_DIR)/root -type d -exec chmod 0755 {} \;
+ find $(BUILD_DIR)/root -type f -not -perm +0100 -not -name 'ssh_host*' | xargs -r chmod 0644
+ find $(BUILD_DIR)/root -type f -perm +0100 | xargs -r chmod 0755
+ find $(BUILD_DIR)/root -type d | xargs -r chmod 0755
mkdir -p $(BUILD_DIR)/root/tmp
chmod 0777 $(BUILD_DIR)/root/tmp
endef
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 8b317065bf..86c802289c 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 | xargs -r rm -rf
+ -find $$(IDIR_$(1)) -name .svn | xargs -r rm -rf
+ -find $$(IDIR_$(1)) -name '.#*' | xargs -r rm -f
$(RSTRIP) $$(IDIR_$(1))
$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
@[ -f $$(IPKG_$(1)) ] || false
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 7355b9e31c..d3aec64399 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -121,11 +121,3 @@ $(eval $(call Require,gnutar, \
$(eval $(call RequireCommand,autoconf, \
Please install GNU autoconf. \
))
-
-define Require/find
- find . -maxdepth 1 -exec ls {} + > /dev/null 2>&1
-endef
-
-$(eval $(call Require,find, \
- Please install GNU find 4.2.12 or better. \
-))
diff --git a/scripts/feeds.sh b/scripts/feeds.sh
index 9fc3343a1b..a6d4ef9d71 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 | xargs -r rm -f
}
setup_symlinks() {
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index cf4a6fe1a1..5d0a87b28b 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -33,8 +33,8 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
$(CP) $(TOPDIR)/target/linux/* $(IB_BUILD_DIR)/target/linux
rm -rf $(IB_BUILD_DIR)/target/linux/*/patches
-cp $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/* $(IB_BUILD_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) # don't copy subdirectories here
- find $(IB_BUILD_DIR) -name .svn -exec rm -rf {} +
- find $(IB_BUILD_DIR) -name CVS -exec rm -rf {} +
+ find $(IB_BUILD_DIR) -name .svn | xargs rm -rf
+ find $(IB_BUILD_DIR) -name CVS | xargs rm -rf
(cd $(BUILD_DIR); \
tar cfj $@ $(IB_NAME); \
)
diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index c0fc027cb4..9f12631863 100644
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -35,8 +35,8 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
$(CP) ./files/package/rules.mk $(SDK_BUILD_DIR)/package/
echo OPENWRTVERSION:=$(OPENWRTVERSION) > $(SDK_BUILD_DIR)/.version.mk
rm -rf $(SDK_BUILD_DIR)/staging_dir*/ccache
- find $(SDK_BUILD_DIR) -name .svn -exec rm -rf {} +
- find $(SDK_BUILD_DIR) -name CVS -exec rm -rf {} +
+ find $(SDK_BUILD_DIR) -name .svn | xargs -r rm -rf
+ find $(SDK_BUILD_DIR) -name CVS | xargs -r rm -rf
(cd $(BUILD_DIR); \
tar cfj $@ $(SDK_NAME); \
)