mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-04 23:08:26 +02:00
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
This commit is contained in:
parent
a5628b31a4
commit
99ba699421
2
Makefile
2
Makefile
@ -155,7 +155,7 @@ docclean:
|
|||||||
$(MAKE) -C docs/ clean
|
$(MAKE) -C docs/ clean
|
||||||
|
|
||||||
symlinkclean:
|
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
|
.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: ;
|
FORCE: ;
|
||||||
|
@ -79,9 +79,9 @@ endif
|
|||||||
|
|
||||||
|
|
||||||
define Image/mkfs/prepare/default
|
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 -not -perm +0100 -not -name 'ssh_host*' | xargs -r chmod 0644
|
||||||
find $(BUILD_DIR)/root -type f -perm +0100 -exec chmod 0755 {} \;
|
find $(BUILD_DIR)/root -type f -perm +0100 | xargs -r chmod 0755
|
||||||
find $(BUILD_DIR)/root -type d -exec chmod 0755 {} \;
|
find $(BUILD_DIR)/root -type d | xargs -r chmod 0755
|
||||||
mkdir -p $(BUILD_DIR)/root/tmp
|
mkdir -p $(BUILD_DIR)/root/tmp
|
||||||
chmod 0777 $(BUILD_DIR)/root/tmp
|
chmod 0777 $(BUILD_DIR)/root/tmp
|
||||||
endef
|
endef
|
||||||
|
@ -71,9 +71,9 @@ ifeq ($(DUMP),)
|
|||||||
$$(IPKG_$(1)): $(PKG_BUILD_DIR)/.built $$(IDIR_$(1))/CONTROL/control
|
$$(IPKG_$(1)): $(PKG_BUILD_DIR)/.built $$(IDIR_$(1))/CONTROL/control
|
||||||
$(call Package/$(1)/install,$$(IDIR_$(1)))
|
$(call Package/$(1)/install,$$(IDIR_$(1)))
|
||||||
mkdir -p $(PACKAGE_DIR)
|
mkdir -p $(PACKAGE_DIR)
|
||||||
-find $$(IDIR_$(1)) -name CVS -exec rm -rf {} +
|
-find $$(IDIR_$(1)) -name CVS | xargs -r rm -rf
|
||||||
-find $$(IDIR_$(1)) -name .svn -exec rm -rf {} +
|
-find $$(IDIR_$(1)) -name .svn | xargs -r rm -rf
|
||||||
-find $$(IDIR_$(1)) -name '.#*' -exec rm -f {} +
|
-find $$(IDIR_$(1)) -name '.#*' | xargs -r rm -f
|
||||||
$(RSTRIP) $$(IDIR_$(1))
|
$(RSTRIP) $$(IDIR_$(1))
|
||||||
$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
|
$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
|
||||||
@[ -f $$(IPKG_$(1)) ] || false
|
@[ -f $$(IPKG_$(1)) ] || false
|
||||||
|
@ -121,11 +121,3 @@ $(eval $(call Require,gnutar, \
|
|||||||
$(eval $(call RequireCommand,autoconf, \
|
$(eval $(call RequireCommand,autoconf, \
|
||||||
Please install GNU 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. \
|
|
||||||
))
|
|
||||||
|
@ -22,7 +22,7 @@ cd $TOPDIR
|
|||||||
|
|
||||||
# Some functions we might call several times a run
|
# Some functions we might call several times a run
|
||||||
delete_symlinks() {
|
delete_symlinks() {
|
||||||
find $1 -type l -exec rm -f {} +
|
find $1 -type l | xargs -r rm -f
|
||||||
}
|
}
|
||||||
|
|
||||||
setup_symlinks() {
|
setup_symlinks() {
|
||||||
|
@ -33,8 +33,8 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
|
|||||||
$(CP) $(TOPDIR)/target/linux/* $(IB_BUILD_DIR)/target/linux
|
$(CP) $(TOPDIR)/target/linux/* $(IB_BUILD_DIR)/target/linux
|
||||||
rm -rf $(IB_BUILD_DIR)/target/linux/*/patches
|
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
|
-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 .svn | xargs rm -rf
|
||||||
find $(IB_BUILD_DIR) -name CVS -exec rm -rf {} +
|
find $(IB_BUILD_DIR) -name CVS | xargs rm -rf
|
||||||
(cd $(BUILD_DIR); \
|
(cd $(BUILD_DIR); \
|
||||||
tar cfj $@ $(IB_NAME); \
|
tar cfj $@ $(IB_NAME); \
|
||||||
)
|
)
|
||||||
|
@ -35,8 +35,8 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
|
|||||||
$(CP) ./files/package/rules.mk $(SDK_BUILD_DIR)/package/
|
$(CP) ./files/package/rules.mk $(SDK_BUILD_DIR)/package/
|
||||||
echo OPENWRTVERSION:=$(OPENWRTVERSION) > $(SDK_BUILD_DIR)/.version.mk
|
echo OPENWRTVERSION:=$(OPENWRTVERSION) > $(SDK_BUILD_DIR)/.version.mk
|
||||||
rm -rf $(SDK_BUILD_DIR)/staging_dir*/ccache
|
rm -rf $(SDK_BUILD_DIR)/staging_dir*/ccache
|
||||||
find $(SDK_BUILD_DIR) -name .svn -exec rm -rf {} +
|
find $(SDK_BUILD_DIR) -name .svn | xargs -r rm -rf
|
||||||
find $(SDK_BUILD_DIR) -name CVS -exec rm -rf {} +
|
find $(SDK_BUILD_DIR) -name CVS | xargs -r rm -rf
|
||||||
(cd $(BUILD_DIR); \
|
(cd $(BUILD_DIR); \
|
||||||
tar cfj $@ $(SDK_NAME); \
|
tar cfj $@ $(SDK_NAME); \
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user