瀏覽代碼

add some bulktoolchain finetuning

Waldemar Brodkorb 11 年之前
父節點
當前提交
214429f44e
共有 2 個文件被更改,包括 6 次插入12 次删除
  1. 4 3
      mk/build.mk
  2. 2 9
      target/config/Config.in.runtime

+ 4 - 3
mk/build.mk

@@ -486,17 +486,18 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
 bulktoolchain:
 bulktoolchain:
 	for libc in glibc uclibc musl;do \
 	for libc in glibc uclibc musl;do \
 		while read arch; do \
 		while read arch; do \
-		    mkdir -p $(TOPDIR)/firmware/toolchain_$${arch}_$$libc; \
+			mkdir -p ${TOPDIR}/firmware; \
 		    ( \
 		    ( \
 			echo === building $$arch $$libc toolchain-$$arch on $$(date); \
 			echo === building $$arch $$libc toolchain-$$arch on $$(date); \
 			tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#"); \
 			tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#"); \
+			if [ -f ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz ];then exit;fi; \
 			$(GMAKE) prereq && \
 			$(GMAKE) prereq && \
 				$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \
 				$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \
 				$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \
 				$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \
-				tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_* target_$${arch}_$${libc}_*; \
+				tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_* target_$${arch}_$${libc}*; \
 				$(GMAKE) cleantoolchain; \
 				$(GMAKE) cleantoolchain; \
 			rm .config; \
 			rm .config; \
-		    ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_$${arch}_$${libc}/build.log; \
+		    ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_$${arch}_$${libc}_build.log; \
 		    if [ -f .exit ];then break;fi \
 		    if [ -f .exit ];then break;fi \
 		done <${TOPDIR}/target/tarch.lst ;\
 		done <${TOPDIR}/target/tarch.lst ;\
 		if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \
 		if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \

+ 2 - 9
target/config/Config.in.runtime

@@ -77,7 +77,7 @@ prompt "Initial login shell for the root user"
 default ADK_ROOTSH_MKSH
 default ADK_ROOTSH_MKSH
 
 
 config ADK_ROOTSH_MKSH
 config ADK_ROOTSH_MKSH
-	select ADK_PACKAGE_MKSH
+	select ADK_PACKAGE_MKSH if !ADK_TOOLCHAIN_ONLY
 	bool "mksh (MirBSD Korn Shell)"
 	bool "mksh (MirBSD Korn Shell)"
 	help
 	help
 	  Use mksh (a Korn Shell variant) as standard login shell
 	  Use mksh (a Korn Shell variant) as standard login shell
@@ -97,13 +97,6 @@ config ADK_ROOTSH_BASH
 	help
 	help
 	  Use GNU bash as standard login shell for the superuser.
 	  Use GNU bash as standard login shell for the superuser.
 
 
-config ADK_ROOTSH_MKSH
-	select ADK_PACKAGE_MKSH
-	bool "mksh (MirBSD Korn Shell)"
-	help
-	  Use mksh (a Korn Shell variant) as standard login shell
-	  for the superuser.
-
 config ADK_ROOTSH_TCSH
 config ADK_ROOTSH_TCSH
 	select ADK_PACKAGE_TCSH
 	select ADK_PACKAGE_TCSH
 	bool "tcsh (Tenex C Shell)"
 	bool "tcsh (Tenex C Shell)"
@@ -124,7 +117,7 @@ prompt "System /bin/sh (POSIX script shell)"
 default ADK_BINSH_MKSH
 default ADK_BINSH_MKSH
 
 
 config ADK_BINSH_MKSH
 config ADK_BINSH_MKSH
-	select ADK_PACKAGE_MKSH
+	select ADK_PACKAGE_MKSH if !ADK_TOOLCHAIN_ONLY
 	bool "mksh (MirBSD Korn Shell)"
 	bool "mksh (MirBSD Korn Shell)"
 	help
 	help
 	  Use mksh (a Korn Shell variant) as system shell, which is
 	  Use mksh (a Korn Shell variant) as system shell, which is