diff options
-rw-r--r-- | mk/build.mk | 7 | ||||
-rw-r--r-- | target/config/Config.in.runtime | 11 |
2 files changed, 6 insertions, 12 deletions
diff --git a/mk/build.mk b/mk/build.mk index f4e2ae6e4..8638e8747 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -486,17 +486,18 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) bulktoolchain: for libc in glibc uclibc musl;do \ while read arch; do \ - mkdir -p $(TOPDIR)/firmware/toolchain_$${arch}_$$libc; \ + mkdir -p ${TOPDIR}/firmware; \ ( \ echo === building $$arch $$libc toolchain-$$arch on $$(date); \ 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) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \ $(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; \ 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 \ done <${TOPDIR}/target/tarch.lst ;\ if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \ diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 3634564ed..7848a25ce 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -77,7 +77,7 @@ prompt "Initial login shell for the root user" default ADK_ROOTSH_MKSH config ADK_ROOTSH_MKSH - select ADK_PACKAGE_MKSH + select ADK_PACKAGE_MKSH if !ADK_TOOLCHAIN_ONLY bool "mksh (MirBSD Korn Shell)" help Use mksh (a Korn Shell variant) as standard login shell @@ -97,13 +97,6 @@ config ADK_ROOTSH_BASH help 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 select ADK_PACKAGE_TCSH bool "tcsh (Tenex C Shell)" @@ -124,7 +117,7 @@ prompt "System /bin/sh (POSIX script shell)" default ADK_BINSH_MKSH config ADK_BINSH_MKSH - select ADK_PACKAGE_MKSH + select ADK_PACKAGE_MKSH if !ADK_TOOLCHAIN_ONLY bool "mksh (MirBSD Korn Shell)" help Use mksh (a Korn Shell variant) as system shell, which is |