diff options
| author | Jonathan Bauer | 2016-12-23 13:12:09 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2016-12-23 13:12:09 +0100 |
| commit | 6806ae4a850fc7785a8c05304237cf53b5b8f951 (patch) | |
| tree | b1dd8413d6c7b9a250251da7f0d49bb52b4ddc57 /core/modules/busybox | |
| parent | wrong kernel version variable used (diff) | |
| download | mltk-6806ae4a850fc7785a8c05304237cf53b5b8f951.tar.gz mltk-6806ae4a850fc7785a8c05304237cf53b5b8f951.tar.xz mltk-6806ae4a850fc7785a8c05304237cf53b5b8f951.zip | |
merge with latest dev version (tm-scripts commit f5a59daf8d70a9027118292cd40b18c221897408)
Diffstat (limited to 'core/modules/busybox')
| -rw-r--r-- | core/modules/busybox/module.build | 1 | ||||
| -rw-r--r-- | core/modules/busybox/module.conf | 2 | ||||
| -rw-r--r-- | core/modules/busybox/openslx-busybox-config | 9 |
3 files changed, 7 insertions, 5 deletions
diff --git a/core/modules/busybox/module.build b/core/modules/busybox/module.build index 46b60c1c..8a7d58fb 100644 --- a/core/modules/busybox/module.build +++ b/core/modules/busybox/module.build @@ -1,4 +1,3 @@ -#!/bin/bash fetch_source() { git clone --depth 1 "${REQUIRED_GIT}" --branch "$REQUIRED_BRANCH" src || perror "Could not clone busybox git" diff --git a/core/modules/busybox/module.conf b/core/modules/busybox/module.conf index 6acfa16c..3214d95e 100644 --- a/core/modules/busybox/module.conf +++ b/core/modules/busybox/module.conf @@ -1,5 +1,5 @@ REQUIRED_GIT="git://git.busybox.net/busybox" -REQUIRED_BRANCH="1_22_1" +REQUIRED_BRANCH="1_25_1" REQUIRED_BINARIES="busybox" REQUIRED_DIRECTORIES=" /bin diff --git a/core/modules/busybox/openslx-busybox-config b/core/modules/busybox/openslx-busybox-config index 00a008d7..92a7af47 100644 --- a/core/modules/busybox/openslx-busybox-config +++ b/core/modules/busybox/openslx-busybox-config @@ -178,7 +178,9 @@ CONFIG_BASENAME=y CONFIG_CAT=y CONFIG_DATE=y CONFIG_FEATURE_DATE_ISOFMT=y -# CONFIG_FEATURE_DATE_NANO is not set +CONFIG_FEATURE_DATE_NANO=y +CONFIG_TRUNCATE=y +CONFIG_UNLINK=y CONFIG_FEATURE_DATE_COMPAT=y # CONFIG_HOSTID is not set CONFIG_ID=y @@ -207,7 +209,7 @@ CONFIG_CP=y # CONFIG_FEATURE_CP_LONG_OPTIONS is not set CONFIG_CUT=y CONFIG_DD=y -# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y # CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set # CONFIG_FEATURE_DD_IBS_OBS is not set CONFIG_DF=y @@ -384,10 +386,11 @@ CONFIG_FEATURE_VI_REGEX_SEARCH=y CONFIG_FEATURE_VI_USE_SIGNALS=y CONFIG_FEATURE_VI_DOT_CMD=y CONFIG_FEATURE_VI_READONLY=y -# CONFIG_FEATURE_VI_SETOPTS is not set +CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y +CONFIG_FEATURE_VI_UNDO=y # CONFIG_FEATURE_ALLOW_EXEC is not set # |