diff options
-rw-r--r-- | package/busybox/config/shell/Config.in | 2 | ||||
-rw-r--r-- | package/mksh/Makefile | 10 | ||||
-rw-r--r-- | scripts/scan-pkgs.sh | 7 | ||||
-rw-r--r-- | target/config/Config.in.adk | 1 | ||||
-rw-r--r-- | target/config/Config.in.runtime | 27 | ||||
-rw-r--r-- | target/config/Config.in.tools | 4 | ||||
-rw-r--r-- | tools/Makefile | 3 | ||||
-rw-r--r-- | tools/ccache/Makefile | 25 |
8 files changed, 53 insertions, 26 deletions
diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in index 52a96c7e2..488041e22 100644 --- a/package/busybox/config/shell/Config.in +++ b/package/busybox/config/shell/Config.in @@ -8,7 +8,7 @@ menu "Shells" config BUSYBOX_ASH bool "ash" - default y + default n depends on !BUSYBOX_NOMMU help Tha 'ash' shell adds about 60k in the default configuration and is diff --git a/package/mksh/Makefile b/package/mksh/Makefile index 1c18044f3..159a3efda 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -4,17 +4,14 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mksh -PKG_VERSION:= 48b +PKG_VERSION:= 49 PKG_RELEASE:= 1 -PKG_MD5SUM:= ab9baa6b5a4de9d0e6a3ce9957c18da0 +PKG_MD5SUM:= e8c205cac72c3dc8540bbc3897421422 PKG_DESCR:= MirBSD Korn Shell PKG_SECTION:= shells PKG_URL:= http://www.mirbsd.org/ PKG_SITES:= ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/} -PKG_FLAVOURS_MKSH:= FULL -PKGFD_FULL:= Include all features - DISTFILES= ${PKG_NAME}-R${PKG_VERSION}.tgz WRKDIST= ${WRKDIR}/${PKG_NAME} @@ -22,10 +19,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MKSH,mksh,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifeq ($(strip ${ADK_PACKAGE_MKSH_FULL}),) TARGET_CPPFLAGS+= -DMKSH_SMALL=1 -endif - CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 5563dcca2..8af04795b 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -83,11 +83,4 @@ if [[ -n $NEED_JAVA ]]; then fi fi -if [[ -n $ADK_USE_CCACHE ]]; then - if ! which ccache >/dev/null 2>&1; then - echo >&2 You have selected to build with ccache, but ccache could not be found. - out=1 - fi -fi - exit $out diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk index c8f820321..46de14044 100644 --- a/target/config/Config.in.adk +++ b/target/config/Config.in.adk @@ -46,6 +46,7 @@ config ADK_WGET_TIMEOUT config ADK_USE_CCACHE bool "Use ccache to speedup recompilation" + select ADK_HOST_NEED_CCACHE default n help Useful if you have enough space for the cache and need speedup compilation. diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index c28fd55a3..b6716cbdd 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -50,7 +50,7 @@ config ADK_RUNTIME_CONSOLE_VGA config ADK_RUNTIME_CONSOLE_SERIAL bool "console output on serial" help - Start getty on serial console. (ttyS0) + Start getty on serial console. config ADK_RUNTIME_CONSOLE_BOTH bool "console output on VGA and serial" @@ -74,7 +74,14 @@ config ADK_RUNTIME_KBD_LAYOUT choice prompt "Initial login shell for the root user" -default ADK_ROOTSH_ASH +default ADK_ROOTSH_MKSH + +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_ASH select BUSYBOX_ASH @@ -114,7 +121,14 @@ endchoice choice prompt "System /bin/sh (POSIX script shell)" -default ADK_BINSH_ASH +default ADK_BINSH_MKSH + +config ADK_BINSH_MKSH + select ADK_PACKAGE_MKSH + bool "mksh (MirBSD Korn Shell)" + help + Use mksh (a Korn Shell variant) as system shell, which is + both small and powerful, so quite suited for this task. config ADK_BINSH_ASH select BUSYBOX_ASH @@ -131,13 +145,6 @@ config ADK_BINSH_BASH Use GNU bash as system shell. This is discouraged due to its size and slowness. -config ADK_BINSH_MKSH - select ADK_PACKAGE_MKSH - bool "mksh (MirBSD Korn Shell)" - help - Use mksh (a Korn Shell variant) as system shell, which is - both small and powerful, so quite suited for this task. - config ADK_BINSH_ZSH select ADK_PACKAGE_ZSH bool "zsh (The Z Shell)" diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index d863179b8..c4dcdace4 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -34,6 +34,10 @@ config ADK_HOST_NEED_XZ boolean default n +config ADK_HOST_NEED_CCACHE + boolean + default n + config ADK_TOOLS_ADDPATTERN_ARGS string default "-p W54G -v v4.20.6" if ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G diff --git a/tools/Makefile b/tools/Makefile index 2d29372dc..a8156cb79 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -29,6 +29,9 @@ endif ifeq ($(ADK_HOST_NEED_LZMA),y) TARGETS+=lzma endif +ifeq ($(ADK_HOST_NEED_CCACHE),y) +TARGETS+=ccache +endif TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS)) TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS)) diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile new file mode 100644 index 000000000..fde838067 --- /dev/null +++ b/tools/ccache/Makefile @@ -0,0 +1,25 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= ccache +PKG_VERSION:= 3.1.9 +PKG_RELEASE:= 1 +PKG_MD5SUM:= a5e9954b1dae036762f7b13673a2cf76 +PKG_SITES:= http://samba.org/ftp/ccache/ + +include ../rules.mk + +install: ${STAGING_HOST_DIR}/usr/bin/ccache + +$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared + (cd ${WRKBUILD}; ./configure --prefix=$(STAGING_HOST_DIR)/usr) + ${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}' + touch $@ + +${STAGING_HOST_DIR}/usr/bin/ccache: $(WRKBUILD)/.compiled + $(INSTALL_BIN) $(WRKBUILD)/ccache \ + ${STAGING_HOST_DIR}/usr/bin + +include $(TOPDIR)/mk/tools.mk |