general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update busybox to support new glibc (>2.31)

Browse Source 
Signed-off-by: Zheng, Qi <huaiqing.zq@antgroup.com>
This commit is contained in:
Zheng, Qi 2021-10-18 17:11:20 +08:00 committed by Zongmin.Gu
parent e2d2cb375c
commit a825499d47
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/toolchains/busybox/build.sh
View File

@ -4,7 +4,7 @@ THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
INSTALL_DIR=/opt/occlum/toolchains/busybox INSTALL_DIR=/opt/occlum/toolchains/busybox
busybox_source="https://github.com/mirror/busybox.git" busybox_source="https://github.com/mirror/busybox.git"
busybox_tag="1_31_1" busybox_tag="1_32_1"
busybox_config=${THIS_DIR}/config busybox_config=${THIS_DIR}/config
function build_and_install_busybox() function build_and_install_busybox()

13
tools/toolchains/busybox/config
View File

@ -1,7 +1,7 @@
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Busybox version: 1.31.1 # Busybox version: 1.32.1
# Thu May 14 09:14:43 2020 # Mon Oct 18 08:41:30 2021
# #
CONFIG_HAVE_DOT_CONFIG=y CONFIG_HAVE_DOT_CONFIG=y
@ -76,6 +76,7 @@ CONFIG_PREFIX="./_install"
# CONFIG_DEBUG_SANITIZE is not set # CONFIG_DEBUG_SANITIZE is not set
# CONFIG_UNIT_TEST is not set # CONFIG_UNIT_TEST is not set
# CONFIG_WERROR is not set # CONFIG_WERROR is not set
# CONFIG_WARN_SIMPLE_MSG is not set
CONFIG_NO_DEBUG_LIB=y CONFIG_NO_DEBUG_LIB=y
# CONFIG_DMALLOC is not set # CONFIG_DMALLOC is not set
# CONFIG_EFENCE is not set # CONFIG_EFENCE is not set
@ -462,6 +463,7 @@ CONFIG_FEATURE_FIND_SIZE=y
CONFIG_FEATURE_FIND_PRUNE=y CONFIG_FEATURE_FIND_PRUNE=y
CONFIG_FEATURE_FIND_QUIT=y CONFIG_FEATURE_FIND_QUIT=y
CONFIG_FEATURE_FIND_DELETE=y CONFIG_FEATURE_FIND_DELETE=y
CONFIG_FEATURE_FIND_EMPTY=y
CONFIG_FEATURE_FIND_PATH=y CONFIG_FEATURE_FIND_PATH=y
CONFIG_FEATURE_FIND_REGEX=y CONFIG_FEATURE_FIND_REGEX=y
# CONFIG_FEATURE_FIND_CONTEXT is not set # CONFIG_FEATURE_FIND_CONTEXT is not set
@ -665,7 +667,7 @@ CONFIG_FEATURE_MOUNT_FSTAB=y
CONFIG_FEATURE_MOUNT_OTHERTAB=y CONFIG_FEATURE_MOUNT_OTHERTAB=y
CONFIG_MOUNTPOINT=y CONFIG_MOUNTPOINT=y
CONFIG_NOLOGIN=y CONFIG_NOLOGIN=y
CONFIG_NOLOGIN_DEPENDENCIES=y # CONFIG_NOLOGIN_DEPENDENCIES is not set
CONFIG_NSENTER=y CONFIG_NSENTER=y
CONFIG_PIVOT_ROOT=y CONFIG_PIVOT_ROOT=y
CONFIG_RDATE=y CONFIG_RDATE=y
@ -692,6 +694,7 @@ CONFIG_FEATURE_SWAPONOFF_LABEL=y
CONFIG_SWITCH_ROOT=y CONFIG_SWITCH_ROOT=y
CONFIG_TASKSET=y CONFIG_TASKSET=y
CONFIG_FEATURE_TASKSET_FANCY=y CONFIG_FEATURE_TASKSET_FANCY=y
CONFIG_FEATURE_TASKSET_CPULIST=y
CONFIG_UEVENT=y CONFIG_UEVENT=y
CONFIG_UMOUNT=y CONFIG_UMOUNT=y
CONFIG_FEATURE_UMOUNT_ALL=y CONFIG_FEATURE_UMOUNT_ALL=y
@ -809,6 +812,7 @@ CONFIG_MAKEDEVS=y
CONFIG_FEATURE_MAKEDEVS_TABLE=y CONFIG_FEATURE_MAKEDEVS_TABLE=y
CONFIG_MAN=y CONFIG_MAN=y
CONFIG_MICROCOM=y CONFIG_MICROCOM=y
CONFIG_MIM=y
CONFIG_MT=y CONFIG_MT=y
CONFIG_NANDWRITE=y CONFIG_NANDWRITE=y
CONFIG_NANDDUMP=y CONFIG_NANDDUMP=y
@ -1099,6 +1103,7 @@ CONFIG_SH_IS_ASH=y
# CONFIG_BASH_IS_ASH is not set # CONFIG_BASH_IS_ASH is not set
# CONFIG_BASH_IS_HUSH is not set # CONFIG_BASH_IS_HUSH is not set
CONFIG_BASH_IS_NONE=y CONFIG_BASH_IS_NONE=y
CONFIG_SHELL_ASH=y
CONFIG_ASH=y CONFIG_ASH=y
CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
CONFIG_ASH_INTERNAL_GLOB=y CONFIG_ASH_INTERNAL_GLOB=y
@ -1119,6 +1124,7 @@ CONFIG_ASH_GETOPTS=y
CONFIG_ASH_CMDCMD=y CONFIG_ASH_CMDCMD=y
CONFIG_CTTYHACK=y CONFIG_CTTYHACK=y
# CONFIG_HUSH is not set # CONFIG_HUSH is not set
# CONFIG_SHELL_HUSH is not set
# CONFIG_HUSH_BASH_COMPAT is not set # CONFIG_HUSH_BASH_COMPAT is not set
# CONFIG_HUSH_BRACE_EXPANSION is not set # CONFIG_HUSH_BRACE_EXPANSION is not set
# CONFIG_HUSH_LINENO_VAR is not set # CONFIG_HUSH_LINENO_VAR is not set
@ -1185,6 +1191,7 @@ CONFIG_FEATURE_ROTATE_LOGFILE=y
CONFIG_FEATURE_REMOTE_LOG=y CONFIG_FEATURE_REMOTE_LOG=y
CONFIG_FEATURE_SYSLOGD_DUP=y CONFIG_FEATURE_SYSLOGD_DUP=y
CONFIG_FEATURE_SYSLOGD_CFG=y CONFIG_FEATURE_SYSLOGD_CFG=y
# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG=y
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16