diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-04-12 19:18:38 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-04-12 19:18:38 +0000 |
| commit | 99ba699421c041858df7fcb50379e3b21798ae12 (patch) | |
| tree | 76c846e43279bd22c30a82c78efcc81ca125e6a2 /include | |
| parent | a5628b31a4092369fcec6966fbddddd282cd6d08 (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
Diffstat (limited to 'include')
| -rw-r--r-- | include/image.mk | 6 | ||||
| -rw-r--r-- | include/package-ipkg.mk | 6 | ||||
| -rw-r--r-- | include/prereq-build.mk | 8 |
3 files changed, 6 insertions, 14 deletions
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. \ -)) |