change cp to $(CP)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3112 3c298f89-4303-0410-b956-a3cf2f4a3e73

11 files changed, 27 insertions, 34 deletions

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)/