aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-06-21 14:04:12 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-06-21 14:04:12 +0000
commite9cf67bfb29dadb7de75a75d4735c6d3299fb640 (patch)
tree9fa6a69701497f2cb761e565b4ef13e56396836f
parent913e09274d6e6056319d307a841ce9554085fb03 (diff)
downloadupstream-e9cf67bfb29dadb7de75a75d4735c6d3299fb640.tar.gz
upstream-e9cf67bfb29dadb7de75a75d4735c6d3299fb640.tar.bz2
upstream-e9cf67bfb29dadb7de75a75d4735c6d3299fb640.zip
move uClibc/files/config.* to uClibc/config/* and allow board-specific config overrides
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4041 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--toolchain/uClibc/Makefile7
-rw-r--r--toolchain/uClibc/config/i386 (renamed from toolchain/uClibc/files/config.i386)0
-rw-r--r--toolchain/uClibc/config/mips (renamed from toolchain/uClibc/files/config.mips)0
-rw-r--r--toolchain/uClibc/config/mipsel (renamed from toolchain/uClibc/files/config.mipsel)0
-rw-r--r--toolchain/uClibc/config/powerpc (renamed from toolchain/uClibc/files/config.powerpc)0
5 files changed, 6 insertions, 1 deletions
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 22c5913457..1499573ced 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -1,4 +1,5 @@
include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/target.mk
PKG_NAME:=uClibc
PKG_VERSION:=0.9.28
@@ -29,7 +30,11 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
define Build/Prepare
$(call Build/Prepare/Default)
$(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(PKG_BUILD_DIR)/Rules.mak
- $(CP) ./files/config.$(ARCH) $(PKG_BUILD_DIR)/.config
+ if [ -e config/$(ARCH).$(BOARD) ]; then \
+ $(CP) config/$(ARCH).$(BOARD) $(PKG_BUILD_DIR)/.config; \
+ else \
+ $(CP) config/$(ARCH) $(PKG_BUILD_DIR)/.config; \
+ fi
$(SED) 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_HEADERS_DIR)\",g' \
$(PKG_BUILD_DIR)/.config
ifeq ($(CONFIG_LARGEFILE),y)
diff --git a/toolchain/uClibc/files/config.i386 b/toolchain/uClibc/config/i386
index b1a9ec3a1c..b1a9ec3a1c 100644
--- a/toolchain/uClibc/files/config.i386
+++ b/toolchain/uClibc/config/i386
diff --git a/toolchain/uClibc/files/config.mips b/toolchain/uClibc/config/mips
index 06c3d829b6..06c3d829b6 100644
--- a/toolchain/uClibc/files/config.mips
+++ b/toolchain/uClibc/config/mips
diff --git a/toolchain/uClibc/files/config.mipsel b/toolchain/uClibc/config/mipsel
index 8a7db1a3dc..8a7db1a3dc 100644
--- a/toolchain/uClibc/files/config.mipsel
+++ b/toolchain/uClibc/config/mipsel
diff --git a/toolchain/uClibc/files/config.powerpc b/toolchain/uClibc/config/powerpc
index 457c7d5e53..457c7d5e53 100644
--- a/toolchain/uClibc/files/config.powerpc
+++ b/toolchain/uClibc/config/powerpc