Merge branch 'master' of git+ssh://openadk.org/git/openadk

mk/build.mk

@@ -288,6 +288,8 @@ $(CONFIG)/gconf:
 	@$(MAKE) -C $(CONFIG) gconf
 
 defconfig: .menu $(CONFIG)/conf
+	@${BASH} ${TOPDIR}/scripts/update-sys
+	@${BASH} ${TOPDIR}/scripts/update-pkg
 ifeq (${OStype},Linux)
 	@echo ADK_HOST_LINUX=y > $(TOPDIR)/.defconfig
 endif

scripts/update-sys

@@ -19,6 +19,8 @@ check_native() {
 	fi
 }
 
+touch $topdir/target/config/Config.in.native
+
 for i in $(ls $topdir/target/);do
 	if [ -d "$topdir/target/$i/sys-enabled" ];then
 		cat $topdir/target/$i/sys-enabled/* > $topdir/target/$i/Config.in.systems 2>/dev/null

target/config/Config.in

@@ -204,7 +204,8 @@ config ADK_TARGET_LIB_UCLIBC
 		   !ADK_TARGET_SYSTEM_LEMOTE_YEELONG && \
 		   !ADK_LINUX_SPARC64 && \
 		   !ADK_LINUX_SPARC && \
-		   !ADK_LINUX_PPC64
+		   !ADK_LINUX_PPC64 && \
+		   !ADK_LINUX_NATIVE
 	help
  	 http://uclibc.org
 
@@ -213,7 +214,6 @@ config ADK_TARGET_LIB_EGLIBC
 	boolean
 	select ADK_eglibc
 	depends on \
-		ADK_LINUX_NATIVE || \
 		ADK_LINUX_ARM || \
 		ADK_LINUX_ARMEB || \
 		ADK_LINUX_MIPS || \
@@ -234,7 +234,6 @@ config ADK_TARGET_LIB_GLIBC
 	boolean
 	select ADK_glibc
 	depends on \
-		ADK_LINUX_NATIVE || \
 		ADK_LINUX_ARM || \
 		ADK_LINUX_ARMEB || \
 		ADK_LINUX_MIPS || \
@@ -250,6 +249,12 @@ config ADK_TARGET_LIB_GLIBC
 	help
 	 http://www.gnu.org/libc
 
+config ADK_TARGET_LIB_LIBC
+	prompt "Native C library"
+	boolean
+	select ADK_libc
+	depends on ADK_LINUX_NATIVE
+
 endchoice
 
 config ADK_TARGET_SUFFIX

target/config/Config.in.arch.choice

@@ -6,9 +6,9 @@ config ADK_CHOOSE_TARGET_ARCH
 
 config ADK_LINUX_NATIVE
 	bool "native build"
-	select ADK_libc
 	select ADK_native
 	select ADK_NATIVE
+	select ADK_TARGET_LIB_LIBC
 	depends on ADK_HOST_LINUX
 	help
 	  Make a native build. Use host tools.