summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-07 10:49:59 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-07 10:49:59 +0100
commit8b0401f6010bb6318fe86f6a6eb11098a0952903 (patch)
tree5214f33cd25ccd1a0a811d39e685df82ad81d76b /package
parent76a462aed5771be7b02b0785f01147ebe995a611 (diff)
parentdbd90668a07f2deffc9b0bd658b1cc3958e00647 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
-rw-r--r--package/busybox/config/shell/Config.in2
-rw-r--r--package/mksh/Makefile10
2 files changed, 3 insertions, 9 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