From 14d2d03735225e1a6957fd21ed9f66ab971a83bd Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 1 Sep 2005 20:08:18 +0000 Subject: [PATCH] fix some typos SVN-Revision: 1824 --- openwrt/target/linux/Makefile | 6 +++--- openwrt/target/linux/image/ar7/Makefile | 4 ++-- openwrt/target/linux/image/brcm/Makefile | 6 +++--- openwrt/target/linux/image/soekris/Makefile | 2 +- openwrt/target/linux/linux-2.4/Makefile | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/openwrt/target/linux/Makefile b/openwrt/target/linux/Makefile index 01286405b8..e9edba256e 100644 --- a/openwrt/target/linux/Makefile +++ b/openwrt/target/linux/Makefile @@ -51,12 +51,12 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: rm -rf $(IB_DIR) mkdir -p $(IB_DIR)/packages mkdir -p $(IB_DIR)/scripts - cp -dpR ./imagebuilder/* $(IB_DIR)/ - cp -dpR $(TOPDIR)/bin/packages/*.ipk $(IB_DIR)/packages/ + cp -fpR ./imagebuilder/* $(IB_DIR)/ + cp -fpR $(TOPDIR)/bin/packages/*.ipk $(IB_DIR)/packages/ cp $(TOPDIR)/scripts/ipkg $(IB_DIR)/scripts/ $(MAKE) install-ib cp $(TOPDIR)/rules.mk $(IB_DIR) - cp -dpR ./image $(IB_DIR)/ + cp -fpR ./image $(IB_DIR)/ cp $(TOPDIR)/.config $(IB_DIR)/ 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/openwrt/target/linux/image/ar7/Makefile b/openwrt/target/linux/image/ar7/Makefile index c6a9045b48..2d252f6874 100644 --- a/openwrt/target/linux/image/ar7/Makefile +++ b/openwrt/target/linux/image/ar7/Makefile @@ -94,7 +94,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 -dpR $(KDIR)/vmlinux.bin $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ + cp -fpR $(KDIR)/vmlinux.bin $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ mkdir -p $(IB_DIR)/staging_dir_$(ARCH) - cp -dpR $(STAGING_DIR)/bin/addpattern $(IB_DIR)/staging_dir_$(ARCH)/bin/ + cp -fpR $(STAGING_DIR)/bin/addpattern $(IB_DIR)/staging_dir_$(ARCH)/bin/ diff --git a/openwrt/target/linux/image/brcm/Makefile b/openwrt/target/linux/image/brcm/Makefile index 09f2d1429c..54963b671b 100644 --- a/openwrt/target/linux/image/brcm/Makefile +++ b/openwrt/target/linux/image/brcm/Makefile @@ -71,7 +71,7 @@ endif install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx install-ib: mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin - cp -dpR $(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 -dpR $(BUILD_DIR)/loader.gz $(IB_DIR)/build_$(ARCH)/ - cp -dpR $(KDIR)/vmlinux.lzma $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ + cp -fpR $(BUILD_DIR)/loader.gz $(IB_DIR)/build_$(ARCH)/ + cp -fpR $(KDIR)/vmlinux.lzma $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ diff --git a/openwrt/target/linux/image/soekris/Makefile b/openwrt/target/linux/image/soekris/Makefile index 9ab3a73883..37600c91db 100644 --- a/openwrt/target/linux/image/soekris/Makefile +++ b/openwrt/target/linux/image/soekris/Makefile @@ -33,4 +33,4 @@ compile: install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz install-ib: mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) - cp -dpR $(KDIR)/bzImage $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ + cp -fpR $(KDIR)/bzImage $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ diff --git a/openwrt/target/linux/linux-2.4/Makefile b/openwrt/target/linux/linux-2.4/Makefile index a0d56bfaf2..9f95d721d0 100644 --- a/openwrt/target/linux/linux-2.4/Makefile +++ b/openwrt/target/linux/linux-2.4/Makefile @@ -142,7 +142,7 @@ $(eval $(call KMOD_template,VFAT,vfat,\ $(MODULES_DIR)/kernel/fs/vfat/vfat.o \ $(MODULES_DIR)/kernel/fs/fat/fat.o \ ,CONFIG_VFAT_FS,,30,fat vfat)) -ifneq (${shell ls $(MODULES_DIR)/kernel/crypto/*.o},) +ifneq ($(wildcard $(MODULES_DIR)/kernel/crypto/*.o),) CONFIG_CRYPTO:=m endif $(eval $(call KMOD_template,CRYPTO,crypto,\ @@ -166,7 +166,7 @@ $(eval $(call KMOD_template,TUN,tun,\ $(eval $(call KMOD_template,GRE,gre,\ $(MODULES_DIR)/kernel/net/ipv4/ip_gre.o \ ,CONFIG_NET_IPGRE)) -ifneq (${shell ls $(MODULES_DIR)/kernel/net/sched/*.o},) +ifneq ($(wildcard $(MODULES_DIR)/kernel/net/sched/*.o),) CONFIG_SCHED:=m endif $(eval $(call KMOD_template,SCHED,sched,\ -- 2.25.1