From e0af0a4eb8fe94c5b9eb3baf074fdcf5183c10d0 Mon Sep 17 00:00:00 2001 From: Mike Baker Date: Wed, 1 Feb 2006 23:53:19 +0000 Subject: change cp to $(CP) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3112 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/Makefile | 12 ++++++------ target/linux/ar531x-2.4/Makefile | 2 +- target/linux/ar7-2.4/Makefile | 6 +++--- target/linux/aruba-2.6/Makefile | 4 ++-- target/linux/brcm-2.4/Makefile | 6 +++--- target/linux/brcm-2.6/Makefile | 2 +- target/linux/image/Makefile | 3 ++- target/linux/image/ar7/Makefile | 6 +++--- target/linux/image/aruba/Makefile | 4 ++-- target/linux/image/brcm/Makefile | 20 ++++++-------------- target/linux/image/brcm/lzma-loader/Makefile | 6 +++--- target/linux/image/generic/lzma-loader/Makefile | 6 +++--- target/linux/image/jffs2.mk | 2 +- target/linux/image/jffs2/Makefile | 2 +- target/linux/image/squashfs.mk | 2 +- target/linux/image/squashfs/Makefile | 2 +- target/linux/image/x86/Makefile | 8 ++++---- target/linux/imagebuilder/Makefile | 4 ++-- target/linux/package/base-files/Makefile | 6 +++--- target/linux/package/bcm43xx-dscape/Makefile | 6 +++--- target/linux/package/diag/Makefile | 2 +- target/linux/package/fuse/Makefile | 2 +- target/linux/package/hostap/Makefile | 6 +++--- target/linux/package/ieee80211-dscape/Makefile | 6 +++--- target/linux/package/madwifi/Makefile | 8 ++++---- target/linux/package/mini_fo/Makefile | 2 +- target/linux/package/openswan/Makefile | 2 +- target/linux/package/shfs/Makefile | 2 +- target/linux/package/spca5xx/Makefile | 2 +- target/linux/package/switch/Makefile | 4 ++-- target/linux/package/ueagle-atm/Makefile | 2 +- target/linux/package/wlcompat/Makefile | 4 ++-- target/linux/rules.mk | 2 +- target/linux/x86-2.4/Makefile | 4 ++-- target/linux/x86-2.6/Makefile | 4 ++-- target/lzma/Makefile | 4 ++-- target/utils/Makefile | 2 +- 37 files changed, 80 insertions(+), 87 deletions(-) (limited to 'target') diff --git a/target/linux/Makefile b/target/linux/Makefile index 626587b5b0..4ef6c45a06 100644 --- a/target/linux/Makefile +++ b/target/linux/Makefile @@ -60,13 +60,13 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: rm -rf $(IB_DIR) mkdir -p $(IB_DIR)/packages mkdir -p $(IB_DIR)/scripts - cp -fpR ./imagebuilder/* $(IB_DIR)/ - cp -fpR $(TOPDIR)/bin/packages/*.ipk $(IB_DIR)/packages/ - cp $(TOPDIR)/scripts/ipkg $(IB_DIR)/scripts/ + $(CP) ./imagebuilder/* $(IB_DIR)/ + $(CP) $(TOPDIR)/bin/packages/*.ipk $(IB_DIR)/packages/ + $(CP) $(TOPDIR)/scripts/ipkg $(IB_DIR)/scripts/ $(MAKE) install-ib - cp $(TOPDIR)/rules.mk $(IB_DIR) - cp -fpR ./image $(IB_DIR)/ - cp $(TOPDIR)/.config $(IB_DIR)/ + $(CP) $(TOPDIR)/rules.mk $(IB_DIR) + $(CP) ./image $(IB_DIR)/ + $(CP) $(TOPDIR)/.config $(IB_DIR)/ find $(IB_DIR) -name .svn | xargs rm -rf find $(IB_DIR) -name CVS | xargs rm -rf (cd $(BUILD_DIR); tar c $(IB_NAME) | bzip2 -c > $(BIN_DIR)/$(IB_NAME).tar.bz2) diff --git a/target/linux/ar531x-2.4/Makefile b/target/linux/ar531x-2.4/Makefile index 989bcc4582..6e6551b193 100644 --- a/target/linux/ar531x-2.4/Makefile +++ b/target/linux/ar531x-2.4/Makefile @@ -12,6 +12,6 @@ include ../kernel.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE) - @cp config $(LINUX_DIR)/.config + @$(CP) config $(LINUX_DIR)/.config touch $@ diff --git a/target/linux/ar7-2.4/Makefile b/target/linux/ar7-2.4/Makefile index daa734107d..10be12117b 100644 --- a/target/linux/ar7-2.4/Makefile +++ b/target/linux/ar7-2.4/Makefile @@ -13,13 +13,13 @@ ATM_FIRMWARE_DIR=sangam-atm-firmware-$(ATM_FIRMWARE_VERSION) $(eval $(call KMOD_template,SANGAM_ATM_A,sangam-atm-annex-a,\ $(MODULES_DIR)/kernel/drivers/atm/tiatm.o \ ,CONFIG_MIPS_SANGAM_ATM,kmod-atm,60,tiatm, \ - cp $(BUILD_DIR)/$(ATM_FIRMWARE_DIR)/ar0700xx_a.bin $$(I_SANGAM_ATM_A)/lib/modules/ar0700xx.bin \ + $(CP) $(BUILD_DIR)/$(ATM_FIRMWARE_DIR)/ar0700xx_a.bin $$(I_SANGAM_ATM_A)/lib/modules/ar0700xx.bin \ )) $(eval $(call KMOD_template,SANGAM_ATM_B,sangam-atm-annex-b,\ $(MODULES_DIR)/kernel/drivers/atm/tiatm.o \ ,CONFIG_MIPS_SANGAM_ATM,kmod-atm,60,tiatm, \ - cp $(BUILD_DIR)/$(ATM_FIRMWARE_DIR)/ar0700xx_b.bin $$(I_SANGAM_ATM_B)/lib/modules/ar0700xx.bin \ + $(CP) $(BUILD_DIR)/$(ATM_FIRMWARE_DIR)/ar0700xx_b.bin $$(I_SANGAM_ATM_B)/lib/modules/ar0700xx.bin \ )) $(eval $(call KMOD_template,CPMAC,cpmac,\ @@ -33,7 +33,7 @@ include ../kernel.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE) - @cp config $(LINUX_DIR)/.config + @$(CP) config $(LINUX_DIR)/.config touch $@ diff --git a/target/linux/aruba-2.6/Makefile b/target/linux/aruba-2.6/Makefile index 111bfd08a5..3e1ee17df2 100644 --- a/target/linux/aruba-2.6/Makefile +++ b/target/linux/aruba-2.6/Makefile @@ -15,9 +15,9 @@ $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE) ifeq ($(BR2_ARUBA_RAMDISK),y) - @cp config-ramdisk $(LINUX_DIR)/.config + @$(CP) config-ramdisk $(LINUX_DIR)/.config else - @cp config $(LINUX_DIR)/.config + @$(CP) config $(LINUX_DIR)/.config endif touch $@ diff --git a/target/linux/brcm-2.4/Makefile b/target/linux/brcm-2.4/Makefile index 33d5f1b835..ab68b7ae88 100644 --- a/target/linux/brcm-2.4/Makefile +++ b/target/linux/brcm-2.4/Makefile @@ -30,7 +30,7 @@ include ../kernel.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE) - @cp config $(LINUX_DIR)/.config + @$(CP) config $(LINUX_DIR)/.config touch $@ @@ -56,12 +56,12 @@ $(LINUX_DIR)/.drivers-unpacked: $(LINUX_DIR)/.unpacked zcat $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - # copy binary wlan driver mkdir -p $(LINUX_DIR)/drivers/net/wl - cp -fpR $(BUILD_DIR)/wl/*.o $(LINUX_DIR)/drivers/net/wl + $(CP) $(BUILD_DIR)/wl/*.o $(LINUX_DIR)/drivers/net/wl touch $@ $(LINUX_DIR)/.drivers-installed: $(LINUX_DIR)/.modules_done mkdir -p $(LINUX_BUILD_DIR)/modules/lib/modules/2.4.32/kernel/drivers/net/wl - @-[ -f $(LINUX_BUILD_DIR)/modules/lib/modules/2.4.32/kernel/drivers/net/wl/wl.o ] || cp $(LINUX_DIR)/drivers/net/wl/wl.o $(LINUX_BUILD_DIR)/modules/lib/modules/2.4.32/kernel/drivers/net/wl/ + @-[ -f $(LINUX_BUILD_DIR)/modules/lib/modules/2.4.32/kernel/drivers/net/wl/wl.o ] || $(CP) $(LINUX_DIR)/drivers/net/wl/wl.o $(LINUX_BUILD_DIR)/modules/lib/modules/2.4.32/kernel/drivers/net/wl/ touch $@ linux-dirclean: drivers-clean diff --git a/target/linux/brcm-2.6/Makefile b/target/linux/brcm-2.6/Makefile index 9b2e16c0bf..489278a67b 100644 --- a/target/linux/brcm-2.6/Makefile +++ b/target/linux/brcm-2.6/Makefile @@ -14,6 +14,6 @@ include ../kernel.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE) - @cp config $(LINUX_DIR)/.config + @$(CP) config $(LINUX_DIR)/.config touch $@ diff --git a/target/linux/image/Makefile b/target/linux/image/Makefile index 7c65b6e3e1..e64efbf357 100644 --- a/target/linux/image/Makefile +++ b/target/linux/image/Makefile @@ -33,12 +33,13 @@ install-ib: @$(TRACE) target/linux/image/$(BOARD)-install-ib -$(MAKE) -C $(BOARD) IB_DIR="$(IB_DIR)" install-ib mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) - cp $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/kernel[-_]*.ipk $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ + $(CP) $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/kernel[-_]*.ipk $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ install-prepare: find $(KDIR)/root -type f -not -perm +0100 | xargs chmod 0644 find $(KDIR)/root -type f -perm +0100 | xargs chmod 0755 find $(KDIR)/root -type d | xargs chmod 0755 + mkdir -p $(KDIR)/root/tmp chmod 0777 $(KDIR)/root/tmp rebuild: clean prepare compile install diff --git a/target/linux/image/ar7/Makefile b/target/linux/image/ar7/Makefile index 0b73787854..38fce6bdfc 100644 --- a/target/linux/image/ar7/Makefile +++ b/target/linux/image/ar7/Makefile @@ -62,7 +62,7 @@ $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-kernel.bin: $(KDIR)/vmlinux.bin endif $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-kernel.bin: - cp $(KDIR)/vmlinux.bin $@ + $(CP) $(KDIR)/vmlinux.bin $@ ifeq ($(FS),jffs2-8MB) ALIGN:=bs=131072 conv=sync @@ -106,7 +106,7 @@ endif install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-kernel.bin $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).bin install-ib: mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) - cp -fpR $(KDIR)/vmlinux.bin $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ + $(CP) $(KDIR)/vmlinux.bin $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ mkdir -p $(IB_DIR)/staging_dir_$(ARCH) - cp -fpR $(STAGING_DIR)/bin/addpattern $(IB_DIR)/staging_dir_$(ARCH)/bin/ + $(CP) $(STAGING_DIR)/bin/addpattern $(IB_DIR)/staging_dir_$(ARCH)/bin/ diff --git a/target/linux/image/aruba/Makefile b/target/linux/image/aruba/Makefile index 2a7f2e4682..a2cceaf0c1 100644 --- a/target/linux/image/aruba/Makefile +++ b/target/linux/image/aruba/Makefile @@ -62,5 +62,5 @@ endif install-ib: mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) - cp -fpR $(KDIR)/loader.elf $(IB_DIR)/build_$(ARCH)/ - cp -fpR $(KDIR)/vmlinux.lzma $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ + $(CP) $(KDIR)/loader.elf $(IB_DIR)/build_$(ARCH)/ + $(CP) $(KDIR)/vmlinux.lzma $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ diff --git a/target/linux/image/brcm/Makefile b/target/linux/image/brcm/Makefile index b15e10b412..18bd3265c3 100644 --- a/target/linux/image/brcm/Makefile +++ b/target/linux/image/brcm/Makefile @@ -32,7 +32,7 @@ endif $(KDIR)/loader.tmp.gz: - cp $(BUILD_DIR)/loader.gz $@ + $(CP) $(BUILD_DIR)/loader.gz $@ echo -ne "\\x00" >> $@ $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx: $(KDIR)/loader.tmp.gz @@ -73,19 +73,11 @@ FSNAME:=$(patsubst jffs2-%,jffs2,$(FS)) # ifeq ($(FS),squashfs) # $(BIN_DIR)/openwrt-wap54g-$(KERNEL)-$(FSNAME).trx: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx -# cp $< $@ +# $(CP) $< $@ # echo -ne '\x01' >> $@ # # install: $(BIN_DIR)/openwrt-wap54g-$(KERNEL)-$(FSNAME).trx # endif - -ifneq ($(FS),jffs2-8MB) -$(BIN_DIR)/openwrt-wrt54g3g-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx - $(STAGING_DIR)/bin/addpattern -4 -p W54F -v v1.99.5 -i $< -o $@ -g - -$(BIN_DIR)/openwrt-wrt54g-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx - $(STAGING_DIR)/bin/addpattern -4 -p W54G -v v4.20.6 -i $< -o $@ -g - $(BIN_DIR)/openwrt-wrt54gs_v4-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx $(STAGING_DIR)/bin/addpattern -4 -p W54s -v v1.05.2 -i $< -o $@ -g @@ -120,8 +112,8 @@ endif install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx install-ib: mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin - cp -fpR $(STAGING_DIR)/bin/addpattern $(STAGING_DIR)/bin/trx $(STAGING_DIR)/bin/motorola-bin $(IB_DIR)/staging_dir_$(ARCH)/bin + $(CP) -fpR $(STAGING_DIR)/bin/addpattern $(STAGING_DIR)/bin/trx $(STAGING_DIR)/bin/motorola-bin $(IB_DIR)/staging_dir_$(ARCH)/bin mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) - cp -fpR $(BUILD_DIR)/loader.gz $(IB_DIR)/build_$(ARCH)/ - cp -fpR $(BUILD_DIR)/loader.elf $(IB_DIR)/build_$(ARCH)/ - cp -fpR $(KDIR)/vmlinux.lzma $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ + $(CP) $(BUILD_DIR)/loader.gz $(IB_DIR)/build_$(ARCH)/ + $(CP) $(BUILD_DIR)/loader.elf $(IB_DIR)/build_$(ARCH)/ + $(CP) $(KDIR)/vmlinux.lzma $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ diff --git a/target/linux/image/brcm/lzma-loader/Makefile b/target/linux/image/brcm/lzma-loader/Makefile index 134fdde9dd..1d7b6a3196 100644 --- a/target/linux/image/brcm/lzma-loader/Makefile +++ b/target/linux/image/brcm/lzma-loader/Makefile @@ -9,7 +9,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) $(PKG_BUILD_DIR)/.prepared: mkdir $(PKG_BUILD_DIR) - cp -fpR ./src/* $(PKG_BUILD_DIR)/ + $(CP) ./src/* $(PKG_BUILD_DIR)/ touch $@ $(PKG_BUILD_DIR)/loader.gz: $(PKG_BUILD_DIR)/.prepared @@ -17,10 +17,10 @@ $(PKG_BUILD_DIR)/loader.gz: $(PKG_BUILD_DIR)/.prepared LD=$(TARGET_CROSS)ld CROSS_COMPILE=$(TARGET_CROSS) $(BUILD_DIR)/loader.gz: $(PKG_BUILD_DIR)/loader.gz - cp $< $@ + $(CP) $< $@ $(BUILD_DIR)/loader.elf: $(PKG_BUILD_DIR)/loader.o - cp $< $@ + $(CP) $< $@ source: prepare: $(PKG_BUILD_DIR)/.prepared diff --git a/target/linux/image/generic/lzma-loader/Makefile b/target/linux/image/generic/lzma-loader/Makefile index daa83535e9..089254bbaf 100644 --- a/target/linux/image/generic/lzma-loader/Makefile +++ b/target/linux/image/generic/lzma-loader/Makefile @@ -9,7 +9,7 @@ PKG_BUILD_DIR := $(KDIR)/$(PKG_NAME)-$(PKG_VERSION) $(PKG_BUILD_DIR)/.prepared: mkdir $(PKG_BUILD_DIR) - cp -fpR ./src/* $(PKG_BUILD_DIR)/ + $(CP) ./src/* $(PKG_BUILD_DIR)/ touch $@ $(PKG_BUILD_DIR)/lzma.elf: $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/vmlinux.lzma @@ -21,10 +21,10 @@ $(PKG_BUILD_DIR)/lzma.elf: $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/vmlinux.l $(PKG_BUILD_DIR)/vmlinux.lzma: $(KDIR)/vmlinux.lzma - cp $< $@ + $(CP) $< $@ $(KDIR)/loader.elf: $(PKG_BUILD_DIR)/lzma.elf - cp $< $@ + $(CP) $< $@ source: prepare: $(PKG_BUILD_DIR)/.prepared diff --git a/target/linux/image/jffs2.mk b/target/linux/image/jffs2.mk index b6396e66ab..c7d4335d8c 100644 --- a/target/linux/image/jffs2.mk +++ b/target/linux/image/jffs2.mk @@ -36,7 +36,7 @@ jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB jffs2-install-ib: compile-targets mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin - cp $(STAGING_DIR)/bin/mkfs.jffs2 $(IB_DIR)/staging_dir_$(ARCH)/bin + $(CP) $(STAGING_DIR)/bin/mkfs.jffs2 $(IB_DIR)/staging_dir_$(ARCH)/bin prepare-targets: jffs2-prepare compile-targets: jffs2-compile diff --git a/target/linux/image/jffs2/Makefile b/target/linux/image/jffs2/Makefile index d5f03bef4a..071bacdd47 100644 --- a/target/linux/image/jffs2/Makefile +++ b/target/linux/image/jffs2/Makefile @@ -18,7 +18,7 @@ $(MTD_DIR)/util/mkfs.jffs2: $(MTD_DIR)/.unpacked $(MAKE) LINUXDIR=$(LINUX_DIR) -C $(MTD_DIR)/util $(STAGING_DIR)/bin/mkfs.jffs2: $(MTD_DIR)/util/mkfs.jffs2 - cp $< $@ + $(CP) $< $@ source: $(DL_DIR)/$(MTD_SOURCE) prepare: $(MTD_DIR)/.unpacked diff --git a/target/linux/image/squashfs.mk b/target/linux/image/squashfs.mk index 7fe972a45e..0b39aa1611 100644 --- a/target/linux/image/squashfs.mk +++ b/target/linux/image/squashfs.mk @@ -28,7 +28,7 @@ squashfs-install: $(KDIR)/root.squashfs squashfs-install-ib: compile-targets mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin - cp $(STAGING_DIR)/bin/mksquashfs-lzma $(IB_DIR)/staging_dir_$(ARCH)/bin + $(CP) $(STAGING_DIR)/bin/mksquashfs-lzma $(IB_DIR)/staging_dir_$(ARCH)/bin prepare-targets: squashfs-prepare compile-targets: squashfs-compile diff --git a/target/linux/image/squashfs/Makefile b/target/linux/image/squashfs/Makefile index df21fd256c..77792565b3 100644 --- a/target/linux/image/squashfs/Makefile +++ b/target/linux/image/squashfs/Makefile @@ -17,7 +17,7 @@ $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/.unpacke $(MAKE) -C $(SQUASHFSLZMA_DIR)/squashfs-tools mksquashfs-lzma LZMAPATH=$(BUILD_DIR)/lzma $(STAGING_DIR)/bin/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma - cp $< $@ + $(CP) $< $@ source: $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) prepare: $(SQUASHFSLZMA_DIR)/.unpacked diff --git a/target/linux/image/x86/Makefile b/target/linux/image/x86/Makefile index 37600c91db..5820d022bc 100644 --- a/target/linux/image/x86/Makefile +++ b/target/linux/image/x86/Makefile @@ -6,7 +6,7 @@ KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) ifeq ($(FS),jffs2-8MB) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img: $(KDIR)/root.$(FS) - cp $^ $@ + $(CP) $^ $@ install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img @@ -16,7 +16,7 @@ endif ifeq ($(FS),tgz) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tar.gz: $(KDIR)/root.tar.gz - cp $^ $@ + $(CP) $^ $@ install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tar.gz @@ -24,7 +24,7 @@ endif $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz: $(KDIR)/bzImage - cp $^ $@ + $(CP) $^ $@ clean: @@ -33,4 +33,4 @@ compile: install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz install-ib: mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) - cp -fpR $(KDIR)/bzImage $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ + $(CP) $(KDIR)/bzImage $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ diff --git a/target/linux/imagebuilder/Makefile b/target/linux/imagebuilder/Makefile index 0ec71199c7..8ed7a5cc02 100644 --- a/target/linux/imagebuilder/Makefile +++ b/target/linux/imagebuilder/Makefile @@ -40,9 +40,9 @@ build: $(IPKG_KERNEL) install `ls packages/$${package}_*`; \ done if [ -d ./files ]; then \ - cp -a --remove-destination ./files/* $(LINUX_BUILD_DIR)/root; \ + $(CP) --remove-destination ./files/* $(LINUX_BUILD_DIR)/root; \ fi if [ -d ./files.$(LIST) ]; then \ - cp -a --remove-destination ./files.$(LIST)/* $(LINUX_BUILD_DIR)/root; \ + $(CP) --remove-destination ./files.$(LIST)/* $(LINUX_BUILD_DIR)/root; \ fi $(MAKE) -S -C image KERNEL="$(KERNEL)" BOARD="$(BOARD)" BIN_DIR="$(BIN_DIR)/$(LIST)" install diff --git a/target/linux/package/base-files/Makefile b/target/linux/package/base-files/Makefile index 994ce53388..637904c2e8 100644 --- a/target/linux/package/base-files/Makefile +++ b/target/linux/package/base-files/Makefile @@ -23,7 +23,7 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/jffs2root $(IDIR_OPENWRT)/sbin/jffs2root: $(PKG_BUILD_DIR)/jffs2root mkdir -p $(IDIR_OPENWRT)/sbin - cp $(PKG_BUILD_DIR)/jffs2root $(IDIR_OPENWRT)/sbin + $(CP) $(PKG_BUILD_DIR)/jffs2root $(IDIR_OPENWRT)/sbin $(IPKG_OPENWRT): $(IDIR_OPENWRT)/sbin/jffs2root endif @@ -36,7 +36,7 @@ $(IDIR_OPENWRT): $(SED) s,base-files-arch,base-files-$(BOARD)-$(KERNEL),g $(IDIR_OPENWRT)/CONTROL/control $(IPKG_OPENWRT): $(IDIR_OPENWRT) - [ -d files/$(BOARD)-$(KERNEL) ] && cp -fpR files/$(BOARD)-$(KERNEL)/* $(IDIR_OPENWRT)/ + [ -d files/$(BOARD)-$(KERNEL) ] && $(CP) -fpR files/$(BOARD)-$(KERNEL)/* $(IDIR_OPENWRT)/ find $(IDIR_OPENWRT) -name CVS | xargs rm -rf find $(IDIR_OPENWRT) -name .svn | xargs rm -rf $(RSTRIP) $(IDIR_OPENWRT) @@ -50,4 +50,4 @@ openwrt-install: compile-targets: install-dev $(IPKG_OPENWRT) install-dev: mkdir -p $(STAGING_DIR)/usr/include - cp -fpR ./include/[a-z]* $(STAGING_DIR)/usr/include/ + $(CP) ./include/[a-z]* $(STAGING_DIR)/usr/include/ diff --git a/target/linux/package/bcm43xx-dscape/Makefile b/target/linux/package/bcm43xx-dscape/Makefile index 5856bf7492..3c07e3daae 100644 --- a/target/linux/package/bcm43xx-dscape/Makefile +++ b/target/linux/package/bcm43xx-dscape/Makefile @@ -26,7 +26,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/fwcutter/.built: mkdir -p $(PKG_BUILD_DIR)/fwcutter - cp ./fwcutter/* $(PKG_BUILD_DIR)/fwcutter/ + $(CP) ./fwcutter/* $(PKG_BUILD_DIR)/fwcutter/ $(SCRIPT_DIR)/download.pl "$(PKG_BUILD_DIR)/fwcutter" "$(FIRMWARE_BLOB)" "$(FIRMWARE_BLOB_MD5SUM)" $(FIRMWARE_BLOB_URL) $(MAKE) -C $(PKG_BUILD_DIR)/fwcutter $(PKG_BUILD_DIR)/fwcutter/fwcutter -w $(PKG_BUILD_DIR)/fwcutter $(PKG_BUILD_DIR)/fwcutter/$(FIRMWARE_BLOB) @@ -50,7 +50,7 @@ $(IPKG_KMOD_BCM43XX_DSCAPE): echo rate_control; \ echo bcm43xx; \ ) >& $(IDIR_KMOD_BCM43XX_DSCAPE)/etc/modules.d/50-bcm43xx - cp -fpR $(PKG_BUILD_DIR)/*.ko $(IDIR_KMOD_BCM43XX_DSCAPE)/lib/modules/$(LINUX_VERSION) + $(CP) $(PKG_BUILD_DIR)/*.ko $(IDIR_KMOD_BCM43XX_DSCAPE)/lib/modules/$(LINUX_VERSION) install -m0755 -d $(IDIR_KMOD_BCM43XX_DSCAPE)/lib/firmware - cp -fpR $(PKG_BUILD_DIR)/fwcutter/*.fw $(IDIR_KMOD_BCM43XX_DSCAPE)/lib/firmware/ + $(CP) $(PKG_BUILD_DIR)/fwcutter/*.fw $(IDIR_KMOD_BCM43XX_DSCAPE)/lib/firmware/ $(IPKG_BUILD) $(IDIR_KMOD_BCM43XX_DSCAPE) $(PACKAGE_DIR) diff --git a/target/linux/package/diag/Makefile b/target/linux/package/diag/Makefile index 26bdcc952f..3329ee9852 100644 --- a/target/linux/package/diag/Makefile +++ b/target/linux/package/diag/Makefile @@ -27,5 +27,5 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_DIAG): mkdir -p $(IDIR_KMOD_DIAG)/lib/modules/$(LINUX_VERSION) - cp $(PKG_BUILD_DIR)/diag.o $(IDIR_KMOD_DIAG)/lib/modules/$(LINUX_VERSION)/ + $(CP) $(PKG_BUILD_DIR)/diag.o $(IDIR_KMOD_DIAG)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_DIAG) $(PACKAGE_DIR) diff --git a/target/linux/package/fuse/Makefile b/target/linux/package/fuse/Makefile index 62d6df36d9..b9a57d002d 100644 --- a/target/linux/package/fuse/Makefile +++ b/target/linux/package/fuse/Makefile @@ -74,7 +74,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_FUSE): mkdir -p $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION) - cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \ + $(CP) $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_FUSE) $(PACKAGE_DIR) diff --git a/target/linux/package/hostap/Makefile b/target/linux/package/hostap/Makefile index ac031e3bc9..3e8e604984 100644 --- a/target/linux/package/hostap/Makefile +++ b/target/linux/package/hostap/Makefile @@ -34,7 +34,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_HOSTAP): install -m0755 -d $(IDIR_KMOD_HOSTAP)/lib/modules/$(LINUX_VERSION) - cp -fpR \ + $(CP) \ $(PKG_BUILD_DIR)/driver/modules/hostap.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/driver/modules/hostap_crypt_ccmp.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/driver/modules/hostap_crypt_tkip.$(LINUX_KMOD_SUFFIX) \ @@ -44,14 +44,14 @@ $(IPKG_KMOD_HOSTAP): $(IPKG_KMOD_HOSTAP_PCI): install -m0755 -d $(IDIR_KMOD_HOSTAP_PCI)/lib/modules/$(LINUX_VERSION) - cp -fpR \ + $(CP) \ $(PKG_BUILD_DIR)/driver/modules/hostap_pci.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_HOSTAP_PCI)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_HOSTAP_PCI) $(PACKAGE_DIR) $(IPKG_KMOD_HOSTAP_PLX): install -m0755 -d $(IDIR_KMOD_HOSTAP_PLX)/lib/modules/$(LINUX_VERSION) - cp -fpR \ + $(CP) \ $(PKG_BUILD_DIR)/driver/modules/hostap_plx.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_HOSTAP_PLX)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_HOSTAP_PLX) $(PACKAGE_DIR) diff --git a/target/linux/package/ieee80211-dscape/Makefile b/target/linux/package/ieee80211-dscape/Makefile index 90fe09d3d8..3de9b34fb8 100644 --- a/target/linux/package/ieee80211-dscape/Makefile +++ b/target/linux/package/ieee80211-dscape/Makefile @@ -13,7 +13,7 @@ $(eval $(call PKG_template,KMOD_IEEE80211_DSCAPE,$(PKG_NAME),$(LINUX_VERSION)-$( $(PKG_BUILD_DIR)/.prepared: mkdir -p $(PKG_BUILD_DIR) - cp -fpR ./src/* $(PKG_BUILD_DIR)/ + $(CP) ./src/* $(PKG_BUILD_DIR)/ touch $@ $(PKG_BUILD_DIR)/.configured: @@ -32,12 +32,12 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_IEEE80211_DSCAPE): install -m0755 -d $(IDIR_KMOD_IEEE80211_DSCAPE)/lib/modules/$(LINUX_VERSION) #install -m0755 -d $(IDIR_KMOD_IEEE80211_DSCAPE)/etc/modules.d - cp -fpR $(PKG_BUILD_DIR)/*.ko $(IDIR_KMOD_IEEE80211_DSCAPE)/lib/modules/$(LINUX_VERSION) + $(CP) $(PKG_BUILD_DIR)/*.ko $(IDIR_KMOD_IEEE80211_DSCAPE)/lib/modules/$(LINUX_VERSION) $(IPKG_BUILD) $(IDIR_KMOD_IEEE80211_DSCAPE) $(PACKAGE_DIR) install-dev: mkdir -p $(STAGING_DIR)/usr/include/ieee80211-dscape - cp -fpR src/include/* $(STAGING_DIR)/usr/include/ieee80211-dscape/ + $(CP) src/include/* $(STAGING_DIR)/usr/include/ieee80211-dscape/ uninstall-dev: rm -rf $(STAGING_DIR)/usr/include/ieee80211-dscape diff --git a/target/linux/package/madwifi/Makefile b/target/linux/package/madwifi/Makefile index da94415408..eabbdd0f2b 100644 --- a/target/linux/package/madwifi/Makefile +++ b/target/linux/package/madwifi/Makefile @@ -77,20 +77,20 @@ $(IPKG_KMOD_MADWIFI): mkdir -p $(IDIR_KMOD_MADWIFI)/usr/sbin install -m0644 ./files/madwifi.modules $(IDIR_KMOD_MADWIFI)/etc/modules.d/20-madwifi install -m0755 ./files/madwifi.init $(IDIR_KMOD_MADWIFI)/etc/init.d/S20madwifi - cp -fpR $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \ + $(CP) $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \ $(BUS_MODULES) \ $(PKG_BUILD_DIR)/ath_rate/sample/ath_rate_sample.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/net80211/*.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)/ - cp -fpR $(PKG_BUILD_DIR)/tools/{madwifi_multi,80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats,wlanconfig} $(IDIR_KMOD_MADWIFI)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/tools/{madwifi_multi,80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats,wlanconfig} $(IDIR_KMOD_MADWIFI)/usr/sbin/ $(IPKG_BUILD) $(IDIR_KMOD_MADWIFI) $(PACKAGE_DIR) $(STAGING_DIR)/usr/include/madwifi/net80211/ieee80211.h: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include/madwifi - cp -fpR $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr/include/madwifi/ + $(CP) $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr/include/madwifi/ mkdir -p $(STAGING_DIR)/usr/include/madwifi/net80211 - cp -fpR $(PKG_BUILD_DIR)/net80211/*.h $(STAGING_DIR)/usr/include/madwifi/net80211/ + $(CP) $(PKG_BUILD_DIR)/net80211/*.h $(STAGING_DIR)/usr/include/madwifi/net80211/ touch $@ install-dev: $(STAGING_DIR)/usr/include/madwifi/net80211/ieee80211.h diff --git a/target/linux/package/mini_fo/Makefile b/target/linux/package/mini_fo/Makefile index 6fea0655d0..dcd5b91f3a 100644 --- a/target/linux/package/mini_fo/Makefile +++ b/target/linux/package/mini_fo/Makefile @@ -35,7 +35,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_MINI_FO): install -m0755 -d $(IDIR_KMOD_MINI_FO)/lib/modules/$(LINUX_VERSION) install -m0755 -d $(IDIR_KMOD_MINI_FO)/etc/modules.d - cp -fpR $(PKG_BUILD_DIR)/mini_fo.$(LINUX_KMOD_SUFFIX) \ + $(CP) $(PKG_BUILD_DIR)/mini_fo.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_MINI_FO)/lib/modules/$(LINUX_VERSION)/ echo "mini_fo" > $(IDIR_KMOD_MINI_FO)/etc/modules.d/15-mini-fo $(IPKG_BUILD) $(IDIR_KMOD_MINI_FO) $(PACKAGE_DIR) diff --git a/target/linux/package/openswan/Makefile b/target/linux/package/openswan/Makefile index e7faf3e361..9c1b1829f8 100644 --- a/target/linux/package/openswan/Makefile +++ b/target/linux/package/openswan/Makefile @@ -32,5 +32,5 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_OPENSWAN): mkdir -p $(IDIR_KMOD_OPENSWAN)/lib/modules/$(LINUX_VERSION) - cp -fpR $(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX) $(IDIR_KMOD_OPENSWAN)/lib/modules/$(LINUX_VERSION)/ + $(CP) $(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX) $(IDIR_KMOD_OPENSWAN)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_OPENSWAN) $(PACKAGE_DIR) diff --git a/target/linux/package/shfs/Makefile b/target/linux/package/shfs/Makefile index a0ac839479..4625bdb12e 100644 --- a/target/linux/package/shfs/Makefile +++ b/target/linux/package/shfs/Makefile @@ -40,7 +40,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_SHFS): install -m0755 -d $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION) - cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.$(LINUX_KMOD_SUFFIX) \ + $(CP) $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_SHFS) $(PACKAGE_DIR) diff --git a/target/linux/package/spca5xx/Makefile b/target/linux/package/spca5xx/Makefile index 95ffe5966f..6b66262a2f 100644 --- a/target/linux/package/spca5xx/Makefile +++ b/target/linux/package/spca5xx/Makefile @@ -33,7 +33,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_SPCA5XX): install -m0755 -d $(IDIR_KMOD_SPCA5XX)/lib/modules/$(LINUX_VERSION) - cp -fpR $(PKG_BUILD_DIR)/spca5xx.$(LINUX_KMOD_SUFFIX) \ + $(CP) $(PKG_BUILD_DIR)/spca5xx.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_SPCA5XX)/lib/modules/$(LINUX_VERSION)/ $(RSTRIP_KMOD) $(IDIR_KMOD_SPCA5XX) $(IPKG_BUILD) $(IDIR_KMOD_SPCA5XX) $(PACKAGE_DIR) diff --git a/target/linux/package/switch/Makefile b/target/linux/package/switch/Makefile index c86147930e..812fccb2cc 100644 --- a/target/linux/package/switch/Makefile +++ b/target/linux/package/switch/Makefile @@ -13,7 +13,7 @@ $(eval $(call PKG_template,KMOD_SWITCH,$(PKG_NAME),$(LINUX_VERSION)-$(BOARD)-$(P $(PKG_BUILD_DIR)/.prepared: mkdir -p $(PKG_BUILD_DIR) - cp -fpR ./src/* $(PKG_BUILD_DIR)/ + $(CP) ./src/* $(PKG_BUILD_DIR)/ touch $@ $(PKG_BUILD_DIR)/.configured: @@ -31,7 +31,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_SWITCH): install -m0755 -d $(IDIR_KMOD_SWITCH)/lib/modules/$(LINUX_VERSION) - cp -fpR $(PKG_BUILD_DIR)/*.$(LINUX_KMOD_SUFFIX) \ + $(CP) $(PKG_BUILD_DIR)/*.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_SWITCH)/lib/modules/$(LINUX_VERSION) $(IPKG_BUILD) $(IDIR_KMOD_SWITCH) $(PACKAGE_DIR) diff --git a/target/linux/package/ueagle-atm/Makefile b/target/linux/package/ueagle-atm/Makefile index 2da1f463e1..3872727f59 100644 --- a/target/linux/package/ueagle-atm/Makefile +++ b/target/linux/package/ueagle-atm/Makefile @@ -34,7 +34,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_UEAGLE_ATM): install -m0755 -d $(IDIR_KMOD_UEAGLE_ATM)/lib/modules/$(LINUX_VERSION) $(IDIR_KMOD_UEAGLE_ATM)/etc/modules.d install -m0644 ./files/$(PKG_NAME).modules $(IDIR_KMOD_UEAGLE_ATM)/etc/modules.d/10-$(PKG_NAME) - cp -fpR $(PKG_BUILD_DIR)/driver/ueagle-atm.$(LINUX_KMOD_SUFFIX) \ + $(CP) $(PKG_BUILD_DIR)/driver/ueagle-atm.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/usbatm_iso/usbatm.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_UEAGLE_ATM)/lib/modules/$(LINUX_VERSION)/ $(RSTRIP_KMOD) $(IDIR_KMOD_UEAGLE_ATM) diff --git a/target/linux/package/wlcompat/Makefile b/target/linux/package/wlcompat/Makefile index 718b584aae..cdc02ea229 100644 --- a/target/linux/package/wlcompat/Makefile +++ b/target/linux/package/wlcompat/Makefile @@ -33,11 +33,11 @@ $(IPKG_KMOD_WLCOMPAT): $(PKG_BUILD_DIR)/wlcompat.o mkdir -p $(IDIR_KMOD_WLCOMPAT)/etc/modules.d echo "wlcompat" > $(IDIR_KMOD_WLCOMPAT)/etc/modules.d/30-wlcompat mkdir -p $(IDIR_KMOD_WLCOMPAT)/lib/modules/$(LINUX_VERSION) - cp $(PKG_BUILD_DIR)/wlcompat.o $(IDIR_KMOD_WLCOMPAT)/lib/modules/$(LINUX_VERSION)/ + $(CP) $(PKG_BUILD_DIR)/wlcompat.o $(IDIR_KMOD_WLCOMPAT)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_WLCOMPAT) $(PACKAGE_DIR) $(IPKG_KMOD_WLCOMPAT_DEBUG): $(PKG_BUILD_DIR)/wlcompat-debug.o mkdir -p $(IDIR_KMOD_WLCOMPAT_DEBUG)/lib/modules/$(LINUX_VERSION) - cp $(PKG_BUILD_DIR)/wlcompat-debug.o $(IDIR_KMOD_WLCOMPAT_DEBUG)/lib/modules/$(LINUX_VERSION)/ + $(CP) $(PKG_BUILD_DIR)/wlcompat-debug.o $(IDIR_KMOD_WLCOMPAT_DEBUG)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_WLCOMPAT_DEBUG) $(PACKAGE_DIR) diff --git a/target/linux/rules.mk b/target/linux/rules.mk index c9cf9c5e5f..f0f2e72dbb 100644 --- a/target/linux/rules.mk +++ b/target/linux/rules.mk @@ -68,7 +68,7 @@ $$(PKG_$(1)): $(LINUX_DIR)/.modules_done echo "Depends: $$(IDEPEND_$(1))" >> $$(I_$(1))/CONTROL/control ifneq ($(strip $(3)),) mkdir -p $$(I_$(1))/lib/modules/$(LINUX_VERSION) - cp $(3) $$(I_$(1))/lib/modules/$(LINUX_VERSION) + $(CP) $(3) $$(I_$(1))/lib/modules/$(LINUX_VERSION) endif ifneq ($(6),) mkdir -p $$(I_$(1))/etc/modules.d diff --git a/target/linux/x86-2.4/Makefile b/target/linux/x86-2.4/Makefile index 97ded843f7..5f20f1e406 100644 --- a/target/linux/x86-2.4/Makefile +++ b/target/linux/x86-2.4/Makefile @@ -19,12 +19,12 @@ include ../kernel.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE) - @cp config $(LINUX_DIR)/.config + @$(CP) config $(LINUX_DIR)/.config touch $@ $(LINUX_BUILD_DIR)/bzImage: $(LINUX_DIR)/vmlinux $(MAKE) -C $(LINUX_DIR) TOPDIR=$(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) bzImage $(MAKE_TRACE) - cp -f $(LINUX_DIR)/arch/i386/boot/bzImage $@ + $(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $@ touch $@ compile: $(LINUX_BUILD_DIR)/bzImage diff --git a/target/linux/x86-2.6/Makefile b/target/linux/x86-2.6/Makefile index 3bb8c4d231..45a2e1c492 100644 --- a/target/linux/x86-2.6/Makefile +++ b/target/linux/x86-2.6/Makefile @@ -14,12 +14,12 @@ include ../kernel.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE) - @cp config $(LINUX_DIR)/.config + @$(CP) config $(LINUX_DIR)/.config touch $@ $(LINUX_BUILD_DIR)/bzImage: $(LINUX_DIR)/vmlinux $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) bzImage $(MAKE_TRACE) - cp -f $(LINUX_DIR)/arch/i386/boot/bzImage $@ + $(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $@ touch $@ compile: $(LINUX_BUILD_DIR)/bzImage diff --git a/target/lzma/Makefile b/target/lzma/Makefile index 8969e3d241..6e846c31c9 100644 --- a/target/lzma/Makefile +++ b/target/lzma/Makefile @@ -32,7 +32,7 @@ $(LZMA_DIR)/.built: $(LZMA_DIR)/.unpacked touch $@ lzma: $(TARGETS) - cp -f $^ $(LZMA_DIR) + $(CP) $^ $(LZMA_DIR) lzma-source: $(DL_DIR)/$(LZMA_SOURCE) @@ -49,5 +49,5 @@ lzma-dirclean: prepare: $(LZMA_DIR)/.unpacked compile: lzma install: lzma - cp $(LZMA_DIR)/lzma $(STAGING_DIR)/bin/ + $(CP) $(LZMA_DIR)/lzma $(STAGING_DIR)/bin/ clean: lzma-dirclean diff --git a/target/utils/Makefile b/target/utils/Makefile index c08bd1a55d..753db53deb 100644 --- a/target/utils/Makefile +++ b/target/utils/Makefile @@ -7,7 +7,7 @@ UTILS_BUILD_DIR:=$(BUILD_DIR)/target-utils prepare: $(UTILS_BUILD_DIR) compile: prepare $(patsubst %,$(UTILS_BUILD_DIR)/%,$(TARGETS)) mkdir -p $(STAGING_DIR)/bin - cp -a $(UTILS_BUILD_DIR)/* $(STAGING_DIR)/bin/ + $(CP) $(UTILS_BUILD_DIR)/* $(STAGING_DIR)/bin/ install: compile package: clean: -- cgit v1.2.3