From cf6b45d277fa44ec128b1d68d3061f2c1ea78879 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 11 Dec 2009 19:13:55 +0100
Subject: fix allmodconfig/allconfig for routerboard targets

---
 mk/build.mk | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'mk')

diff --git a/mk/build.mk b/mk/build.mk
index 67ec849cb..f51c92149 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -225,7 +225,10 @@ $(CONFIG)/mconf:
 
 defconfig:
 	@if [ ! -z "$(TARGET)" ];then \
-		grep "^config" target/Config.in |grep -i "$(TARGET)"|sed -e "s#^config \(.*\)#\1=y#" > $(TOPDIR)/.defconfig; \
+		grep "^config" target/Config.in \
+			|grep -i "$(TARGET)" \
+			|sed -e "s#^config \(.*\)#\1=y#" \
+			 > $(TOPDIR)/.defconfig; \
 		for symbol in ${DEFCONFIG}; do \
 			echo $$symbol >> $(TOPDIR)/.defconfig; \
 		done; \
@@ -235,6 +238,9 @@ ifneq (,$(filter %_qemu,${TARGET}))
 endif
 ifneq (,$(filter %_rescue,${TARGET}))
 	@echo ADK_LINUX_RESCUE=y >> $(TOPDIR)/.defconfig
+endif
+ifneq (,$(filter rb%,${TARGET}))
+	@echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/.defconfig
 endif
 	@if [ ! -z "$(TARGET)" ];then \
 		$(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \
@@ -242,7 +248,10 @@ endif
 
 modconfig:
 	@if [ ! -z "$(TARGET)" ];then \
-		grep "^config" target/Config.in |grep -i "$(TARGET)"|sed -e "s#^config \(.*\)#\1=y#" > $(TOPDIR)/all.config; \
+		grep "^config" target/Config.in \
+			|grep -i "$(TARGET)" \
+			|sed -e "s#^config \(.*\)#\1=y#" \
+			> $(TOPDIR)/all.config; \
 		for symbol in ${DEFCONFIG}; do \
 			echo $$symbol >> $(TOPDIR)/all.config; \
 		done; \
@@ -266,12 +275,14 @@ modconfig:
 			>> $(TOPDIR)/all.config; \
 	fi
 ifneq (,$(filter %_qemu,${TARGET}))
-
 	@echo ADK_LINUX_QEMU=y >> $(TOPDIR)/all.config
 endif
 ifneq (,$(filter %_rescue,${TARGET}))
 	@echo ADK_LINUX_RESCUE=y >> $(TOPDIR)/all.config
 endif
+ifneq (,$(filter rb%,${TARGET}))
+	@echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/all.config
+endif
 
 menuconfig: $(CONFIG)/mconf defconfig
 	@$(CONFIG)/mconf $(CONFIG_CONFIG_IN)
-- 
cgit v1.2.3


From b706a572926dd8ac76de3928bd1290ee880944f8 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 11 Dec 2009 19:56:36 +0100
Subject: try to autodetect host system and make it usable in menusystem

---
 mk/build.mk | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'mk')

diff --git a/mk/build.mk b/mk/build.mk
index f51c92149..2d1d4e035 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -224,11 +224,17 @@ $(CONFIG)/mconf:
 	@$(MAKE) -C $(CONFIG)
 
 defconfig:
+ifeq (${OStype},Linux)
+	@echo ADK_HOST_LINUX=y > $(TOPDIR)/.defconfig
+endif
+ifeq (${OStype},FreeBSD)
+	@echo ADK_HOST_FREEBSD=y > $(TOPDIR)/.defconfig
+endif
 	@if [ ! -z "$(TARGET)" ];then \
 		grep "^config" target/Config.in \
 			|grep -i "$(TARGET)" \
 			|sed -e "s#^config \(.*\)#\1=y#" \
-			 > $(TOPDIR)/.defconfig; \
+			 >> $(TOPDIR)/.defconfig; \
 		for symbol in ${DEFCONFIG}; do \
 			echo $$symbol >> $(TOPDIR)/.defconfig; \
 		done; \
@@ -242,9 +248,7 @@ endif
 ifneq (,$(filter rb%,${TARGET}))
 	@echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/.defconfig
 endif
-	@if [ ! -z "$(TARGET)" ];then \
-		$(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \
-	fi
+	@$(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN)
 
 modconfig:
 	@if [ ! -z "$(TARGET)" ];then \
-- 
cgit v1.2.3