From b706a572926dd8ac76de3928bd1290ee880944f8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 11 Dec 2009 19:56:36 +0100 Subject: try to autodetect host system and make it usable in menusystem --- Config.in | 13 +++++++++++++ mk/build.mk | 12 ++++++++---- target/Config.in | 2 ++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/Config.in b/Config.in index c2ffcd903..3f107feaf 100644 --- a/Config.in +++ b/Config.in @@ -7,6 +7,7 @@ config ADKVERSION mainmenu "OpenADK Configuration" + config MODULES bool default y @@ -90,6 +91,18 @@ config ADK_FORCE_PARALLEL help Do not enable this! It's for testing purposes only. +choice +prompt "Hostsystem (do not change!)" +config ADK_HOST_LINUX + prompt "Linux" + boolean + +config ADK_HOST_FREEBSD + prompt "FreeBSD" + boolean + +endchoice + endmenu source "target/Config.in" 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 \ diff --git a/target/Config.in b/target/Config.in index a5e62907c..4d30e4001 100644 --- a/target/Config.in +++ b/target/Config.in @@ -789,4 +789,6 @@ config ADK_TARGET_PACKAGE_RPM endchoice + endmenu + -- cgit v1.2.3