Use $(CP) instead of $(INSTALL_BIN) for binaries.

Signed-off-by: Andy Boyett <agb-openwrt@padded-cell.net>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9694 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 06db69d..0186191 100644 (file)
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -112,8 +112,8 @@ endef
 
 define Package/e2fsprogs/install
        $(INSTALL_DIR) $(1)/usr/sbin
 
 define Package/e2fsprogs/install
        $(INSTALL_DIR) $(1)/usr/sbin

-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/e2fsck $(1)/usr/sbin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mke2fs $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/e2fsck $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mke2fs $(1)/usr/sbin/

        ln -sf mke2fs $(1)/usr/sbin/mkfs.ext2
        ln -sf mke2fs $(1)/usr/sbin/mkfs.ext3
        $(INSTALL_DIR) $(1)/usr/lib
        ln -sf mke2fs $(1)/usr/sbin/mkfs.ext2
        ln -sf mke2fs $(1)/usr/sbin/mkfs.ext3
        $(INSTALL_DIR) $(1)/usr/lib


@@ -132,12 +132,12 @@ endef
 
 define Package/tune2fs/install
        $(INSTALL_DIR) $(1)/usr/sbin
 
 define Package/tune2fs/install
        $(INSTALL_DIR) $(1)/usr/sbin

-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/tune2fs $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tune2fs $(1)/usr/sbin/

 endef
 
 define Package/resize2fs/install
        $(INSTALL_DIR) $(1)/usr/sbin
 endef
 
 define Package/resize2fs/install
        $(INSTALL_DIR) $(1)/usr/sbin

-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/resize2fs $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/resize2fs $(1)/usr/sbin/

 endef
 
 $(eval $(call BuildPackage,e2fsprogs))
 endef
 
 $(eval $(call BuildPackage,e2fsprogs))

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 2e7f031..2f24922 100644 (file)
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -126,7 +126,7 @@ endef
 
 define Package/fuse-utils/install
        $(INSTALL_DIR) $(1)/usr/bin
 
 define Package/fuse-utils/install
        $(INSTALL_DIR) $(1)/usr/bin

-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/

 endef
 
 define Package/libfuse/install
 endef
 
 define Package/libfuse/install

diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index 4fac7af..e8fb2ee 100644 (file)
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -62,7 +62,7 @@ endef
 
 define Package/gdbserver/install       
        $(INSTALL_DIR) $(1)/usr/bin
 
 define Package/gdbserver/install       
        $(INSTALL_DIR) $(1)/usr/bin

-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/gdbserver $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gdbserver $(1)/usr/bin/

 endef
 
 $(eval $(call BuildPackage,gdbserver))
 endef
 
 $(eval $(call BuildPackage,gdbserver))

diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile
index 86f24c2..0f24ae1 100644 (file)
--- a/package/ipsec-tools/Makefile
+++ b/package/ipsec-tools/Makefile
@@ -72,10 +72,10 @@ define Package/ipsec-tools/install
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipsec.so.* $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(1)/usr/lib/
        $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipsec.so.* $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(1)/usr/lib/
        $(INSTALL_DIR) $(1)/usr/sbin

-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/plainrsa-gen $(1)/usr/sbin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoon $(1)/usr/sbin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoonctl $(1)/usr/sbin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/setkey $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/plainrsa-gen $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/racoon $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/racoonctl $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/setkey $(1)/usr/sbin/

 endef
 
 define Package/ipsec-tools/conffiles
 endef
 
 define Package/ipsec-tools/conffiles

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index f764248..80646cd 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -256,7 +256,7 @@ define Package/iptables/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(INSTALL_DATA) ./files/firewall.awk $(1)/usr/lib
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_DIR) $(1)/usr/lib
        $(INSTALL_DATA) ./files/firewall.awk $(1)/usr/lib
        $(INSTALL_DIR) $(1)/usr/sbin

-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(1)/usr/sbin/

        $(INSTALL_DIR) $(1)/usr/lib/iptables
        (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
                $(CP) $(patsubst %,lib%.so,$(IPT_BUILTIN:xt_%=ipt_%)) $(1)/usr/lib/iptables/ \
        $(INSTALL_DIR) $(1)/usr/lib/iptables
        (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
                $(CP) $(patsubst %,lib%.so,$(IPT_BUILTIN:xt_%=ipt_%)) $(1)/usr/lib/iptables/ \


@@ -265,12 +265,12 @@ endef
 
 define Package/iptables-utils/install
        $(INSTALL_DIR) $(1)/usr/sbin
 
 define Package/iptables-utils/install
        $(INSTALL_DIR) $(1)/usr/sbin

-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(1)/usr/sbin/

 endef
 
 define Package/ip6tables/install
        $(INSTALL_DIR) $(1)/usr/sbin
 endef
 
 define Package/ip6tables/install
        $(INSTALL_DIR) $(1)/usr/sbin

-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(1)/usr/sbin/

        $(INSTALL_DIR) $(1)/usr/lib/iptables
        (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
                $(CP) libip6t_*.so $(1)/usr/lib/iptables/ \
        $(INSTALL_DIR) $(1)/usr/lib/iptables
        (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
                $(CP) libip6t_*.so $(1)/usr/lib/iptables/ \


@@ -279,7 +279,7 @@ endef
 
 define Package/ip6tables-utils/install
        $(INSTALL_DIR) $(1)/usr/sbin
 
 define Package/ip6tables-utils/install
        $(INSTALL_DIR) $(1)/usr/sbin

-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables-{save,restore} $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables-{save,restore} $(1)/usr/sbin/

 endef
 
 define BuildPlugin
 endef
 
 define BuildPlugin

diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index 8b2da50..f67294e 100644 (file)
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -81,7 +81,7 @@ endef
 
 define Package/atm-tools/install
        $(INSTALL_DIR) $(1)/usr/sbin/
 
 define Package/atm-tools/install
        $(INSTALL_DIR) $(1)/usr/sbin/

-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/atmarp{,d} $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/atmarp{,d} $(1)/usr/sbin/

        $(INSTALL_DIR) $(1)/lib/network
        $(INSTALL_BIN) ./files/ipoa.sh $(1)/lib/network/
 endef
        $(INSTALL_DIR) $(1)/lib/network
        $(INSTALL_BIN) ./files/ipoa.sh $(1)/lib/network/
 endef

diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 555099b..4a6dcdb 100644 (file)
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -137,7 +137,7 @@ define Package/openssl-util/install
        $(INSTALL_DIR) $(1)/etc/ssl/private
        chmod 0700 $(1)/etc/ssl/private
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_DIR) $(1)/etc/ssl/private
        chmod 0700 $(1)/etc/ssl/private
        $(INSTALL_DIR) $(1)/usr/bin

-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/openssl $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/openssl $(1)/usr/bin/

 endef
 
 $(eval $(call BuildPackage,libopenssl))
 endef
 
 $(eval $(call BuildPackage,libopenssl))

diff --git a/package/pcmcia-cs/Makefile b/package/pcmcia-cs/Makefile
index b785f5b..af9c755 100644 (file)
--- a/package/pcmcia-cs/Makefile
+++ b/package/pcmcia-cs/Makefile
@@ -62,8 +62,8 @@ define Package/pcmcia-cs/install
        $(INSTALL_DIR) $(1)/etc
        $(CP) $(PKG_INSTALL_DIR)/etc/pcmcia $(1)/etc/
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_DIR) $(1)/etc
        $(CP) $(PKG_INSTALL_DIR)/etc/pcmcia $(1)/etc/
        $(INSTALL_DIR) $(1)/usr/sbin

-       $(CP) $(PKG_INSTALL_DIR)/sbin/cardctl $(1)/usr/sbin/
-       $(CP) $(PKG_INSTALL_DIR)/sbin/cardmgr $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/cardctl $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/cardmgr $(1)/usr/sbin/

 endef
 
 $(eval $(call BuildPackage,pcmcia-cs))
 endef
 
 $(eval $(call BuildPackage,pcmcia-cs))

diff --git a/package/shfs/Makefile b/package/shfs/Makefile
index aa24d7e..8467bc1 100644 (file)
--- a/package/shfs/Makefile
+++ b/package/shfs/Makefile
@@ -80,9 +80,9 @@ endef
 
 define Package/shfs-utils/install
        $(INSTALL_DIR) $(1)/usr/bin
 
 define Package/shfs-utils/install
        $(INSTALL_DIR) $(1)/usr/bin

-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/shfs{,u}mount $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/shfs{,u}mount $(1)/usr/bin/

        $(INSTALL_DIR) $(1)/sbin
        $(INSTALL_DIR) $(1)/sbin

-       $(CP) $(PKG_INSTALL_DIR)/sbin/mount.shfs $(1)/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/mount.shfs $(1)/sbin/

 endef
 
 $(eval $(call KernelPackage,shfs))
 endef
 
 $(eval $(call KernelPackage,shfs))

diff --git a/package/udev/Makefile b/package/udev/Makefile
index bde7a61..9fcf9cf 100644 (file)
--- a/package/udev/Makefile
+++ b/package/udev/Makefile
@@ -52,14 +52,14 @@ define Package/udev/install
        $(CP) $(PKG_INSTALL_DIR)/etc/udev/* $(1)/etc/udev/
        install -d -m0775 $(1)/lib/udev
        install -d -m0775 $(1)/sbin/
        $(CP) $(PKG_INSTALL_DIR)/etc/udev/* $(1)/etc/udev/
        install -d -m0775 $(1)/lib/udev
        install -d -m0775 $(1)/sbin/

-       $(CP) $(PKG_INSTALL_DIR)/sbin/udevcontrol $(1)/sbin/
-       $(CP) $(PKG_INSTALL_DIR)/sbin/udevd $(1)/sbin/
-       $(CP) $(PKG_INSTALL_DIR)/sbin/udevsettle $(1)/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/udevcontrol $(1)/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/udevd $(1)/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/udevsettle $(1)/sbin/

        install -d -m0775 $(1)/usr/bin/
        install -d -m0775 $(1)/usr/bin/

-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/udevinfo $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/udevtest $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/udevinfo $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/udevtest $(1)/usr/bin/

        install -d -m0775 $(1)/usr/sbin/
        install -d -m0775 $(1)/usr/sbin/

-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/udevmonitor $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/udevmonitor $(1)/usr/sbin/

 endef
 
 define Package/udevtrigger/install
 endef
 
 define Package/udevtrigger/install

diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index 3e997a1..e66b2e3 100644 (file)
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -63,7 +63,7 @@ endef
 
 define Package/wireless-tools/install
        $(INSTALL_DIR) $(1)/usr/sbin
 
 define Package/wireless-tools/install
        $(INSTALL_DIR) $(1)/usr/sbin

-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(1)/usr/sbin/

 endef
 
 $(eval $(call BuildPackage,wireless-tools))
 endef
 
 $(eval $(call BuildPackage,wireless-tools))

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 607b79b..f30eb83 100644 (file)
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -29,8 +29,8 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
                $(TMP_DIR)/.targetinfo \
                $(TMP_DIR)/.packageinfo \
                $(PKG_BUILD_DIR)/
                $(TMP_DIR)/.targetinfo \
                $(TMP_DIR)/.packageinfo \
                $(PKG_BUILD_DIR)/

-       $(CP) $(TOOLCHAIN_DIR)/bin $(PKG_BUILD_DIR)/staging_dir/host/
-       $(CP) $(STAGING_DIR_HOST)/bin/* $(PKG_BUILD_DIR)/staging_dir/host/bin/
+       $(INSTALL_BIN) $(TOOLCHAIN_DIR)/bin $(PKG_BUILD_DIR)/staging_dir/host/
+       $(INSTALL_BIN) $(STAGING_DIR_HOST)/bin/* $(PKG_BUILD_DIR)/staging_dir/host/bin/

        $(CP) $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/
        rm -rf \
                $(PKG_BUILD_DIR)/target/linux/*/patches \
        $(CP) $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/
        rm -rf \
                $(PKG_BUILD_DIR)/target/linux/*/patches \

diff --git a/target/linux/au1000/image/Makefile b/target/linux/au1000/image/Makefile
index 3013d62..3cdd83e 100644 (file)
--- a/target/linux/au1000/image/Makefile
+++ b/target/linux/au1000/image/Makefile
@@ -56,7 +56,7 @@ define Image/Build
        $(TARGET_CROSS)objcopy -O srec -I binary --adjust-vma $(FLASH_FS) $(KDIR)/root.$(1) $(KDIR)/root.$(1).srec
        grep -v S7 $(KDIR)/root.$(1).srec > $(BIN_DIR)/openwrt-$(BOARD)-$(1).img
        grep -v S0 $(KDIR)/kernel.flash.srec >> $(BIN_DIR)/openwrt-$(BOARD)-$(1).img
        $(TARGET_CROSS)objcopy -O srec -I binary --adjust-vma $(FLASH_FS) $(KDIR)/root.$(1) $(KDIR)/root.$(1).srec
        grep -v S7 $(KDIR)/root.$(1).srec > $(BIN_DIR)/openwrt-$(BOARD)-$(1).img
        grep -v S0 $(KDIR)/kernel.flash.srec >> $(BIN_DIR)/openwrt-$(BOARD)-$(1).img

-       $(CP) $(KDIR)/kernel.flash.bin $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.bin
+       $(INSTALL_BIN) $(KDIR)/kernel.flash.bin $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.bin

        $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1).fs
        $(CP) $(KDIR)/kernel.flash.srec $(BIN_DIR)/openwrt-$(BOARD)-vmlinux-flash.srec
        $(CP) $(KDIR)/kernel.ram.srec $(BIN_DIR)/openwrt-$(BOARD)-vmlinux-ram.srec
        $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1).fs
        $(CP) $(KDIR)/kernel.flash.srec $(BIN_DIR)/openwrt-$(BOARD)-vmlinux-flash.srec
        $(CP) $(KDIR)/kernel.ram.srec $(BIN_DIR)/openwrt-$(BOARD)-vmlinux-ram.srec

diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile
index 6a0c223..e5537b4 100644 (file)
--- a/tools/firmware-utils/Makefile
+++ b/tools/firmware-utils/Makefile
@@ -31,7 +31,7 @@ define Build/Compile
 endef
 
 define Build/Install
 endef
 
 define Build/Install

-       $(CP) $(PKG_BUILD_DIR)/bin/* $(STAGING_DIR_HOST)/bin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/* $(STAGING_DIR_HOST)/bin/

 endef
 
 $(eval $(call HostBuild))
 endef
 
 $(eval $(call HostBuild))