Change toolchain to glibc.
Change-Id: I1af77372e437fa27d64fc895ef9f1ba4dda59a34
diff --git a/build_version b/build_version
index 3f4e93a..cf113a2 100755
--- a/build_version
+++ b/build_version
@@ -1,4 +1,4 @@
PROJECT=T108-2
PARTITION=ab
SEC_SUPPORT=Y
-DEV_INFO_RESET=Y
+DEV_INFO_RESET=N
diff --git a/config/defconfig_asr1806p301 b/config/defconfig_asr1806p301
index 1aade0a..d739970 100755
--- a/config/defconfig_asr1806p301
+++ b/config/defconfig_asr1806p301
@@ -430,9 +430,8 @@
# Stripping options
#
# CONFIG_NO_STRIP is not set
-# CONFIG_USE_STRIP is not set
-CONFIG_USE_SSTRIP=y
-CONFIG_SSTRIP_DISCARD_TRAILING_ZEROES=y
+CONFIG_USE_STRIP=y
+CONFIG_STRIP_ARGS="--strip-all"
# CONFIG_STRIP_KERNEL_EXPORTS is not set
# CONFIG_USE_MKLIBS is not set
CONFIG_USE_UCLIBCXX=y
@@ -517,13 +516,13 @@
# CONFIG_GCC_DEFAULT_SSP is not set
# CONFIG_SJLJ_EXCEPTIONS is not set
# CONFIG_INSTALL_GFORTRAN is not set
+# CONFIG_INSTALL_GCCGO is not set
#
# C Library
#
-# CONFIG_LIBC_USE_GLIBC is not set
-CONFIG_LIBC_USE_MUSL=y
-# CONFIG_MUSL_DISABLE_CRYPT_SIZE_HACK is not set
+CONFIG_LIBC_USE_GLIBC=y
+# CONFIG_LIBC_USE_MUSL is not set
#
# Debuggers
@@ -531,14 +530,14 @@
CONFIG_GDB=y
# CONFIG_GDB_PYTHON is not set
# CONFIG_HAS_PREBUILT_LLVM_TOOLCHAIN is not set
-CONFIG_USE_MUSL=y
+CONFIG_USE_GLIBC=y
CONFIG_SSP_SUPPORT=y
CONFIG_BINUTILS_VERSION_2_42=y
CONFIG_BINUTILS_VERSION="2.42"
CONFIG_GCC_VERSION="13.3.0"
CONFIG_GCC_USE_DEFAULT_VERSION=y
-CONFIG_LIBC="musl"
-CONFIG_TARGET_SUFFIX="muslgnueabi"
+CONFIG_LIBC="glibc"
+CONFIG_TARGET_SUFFIX="gnueabi"
# CONFIG_IB is not set
# CONFIG_SDK is not set
# CONFIG_MAKE_TOOLCHAIN is not set
@@ -2033,6 +2032,7 @@
# CONFIG_BUSYBOX_CONFIG_FEATURE_VI_COLON_EXPAND is not set
CONFIG_BUSYBOX_CONFIG_FEATURE_VI_YANKMARK=y
CONFIG_BUSYBOX_CONFIG_FEATURE_VI_SEARCH=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_VI_REGEX_SEARCH is not set
CONFIG_BUSYBOX_CONFIG_FEATURE_VI_USE_SIGNALS=y
CONFIG_BUSYBOX_CONFIG_FEATURE_VI_DOT_CMD=y
CONFIG_BUSYBOX_CONFIG_FEATURE_VI_READONLY=y
@@ -2621,13 +2621,18 @@
CONFIG_PACKAGE_fwtool=y
CONFIG_PACKAGE_getrandom=y
CONFIG_PACKAGE_jsonfilter=y
+# CONFIG_PACKAGE_libasan is not set
CONFIG_PACKAGE_libatomic=y
CONFIG_PACKAGE_libc=y
CONFIG_PACKAGE_libgcc=y
# CONFIG_PACKAGE_libgomp is not set
+# CONFIG_PACKAGE_liblsan is not set
CONFIG_PACKAGE_libpthread=y
CONFIG_PACKAGE_librt=y
CONFIG_PACKAGE_libstdcpp=y
+CONFIG_PACKAGE_libthread-db=y
+# CONFIG_PACKAGE_libtsan is not set
+# CONFIG_PACKAGE_libubsan is not set
CONFIG_PACKAGE_logd=y
CONFIG_PACKAGE_mtd=y
CONFIG_PACKAGE_netifd=y
@@ -5343,6 +5348,7 @@
#
CONFIG_OPENSSL_ENGINE=y
# CONFIG_OPENSSL_ENGINE_BUILTIN is not set
+# CONFIG_OPENSSL_WITH_ASYNC is not set
# CONFIG_PACKAGE_libopenssl-afalg_sync is not set
CONFIG_PACKAGE_libopenssl-conf=y
# CONFIG_PACKAGE_libopenssl-devcrypto is not set
@@ -5808,7 +5814,6 @@
# CONFIG_PACKAGE_libuci2 is not set
CONFIG_PACKAGE_libuclient=y
CONFIG_PACKAGE_libucode=y
-# CONFIG_PACKAGE_libucontext is not set
CONFIG_PACKAGE_libudebug=y
CONFIG_PACKAGE_libudev-zero=y
# CONFIG_PACKAGE_libudns is not set
@@ -6961,7 +6966,7 @@
# CONFIG_PACKAGE_mac-telnet-server is not set
# CONFIG_PACKAGE_map is not set
# CONFIG_PACKAGE_mbusd is not set
-CONFIG_PACKAGE_mdns-repeater=y
+# CONFIG_PACKAGE_mdns-repeater is not set
# CONFIG_PACKAGE_memcached is not set
# CONFIG_PACKAGE_mii-tool is not set
# CONFIG_PACKAGE_mikrotik-btest is not set
@@ -7698,6 +7703,8 @@
# CONFIG_PACKAGE_lcdproc-clients is not set
# CONFIG_PACKAGE_lcdproc-drivers is not set
# CONFIG_PACKAGE_lcdproc-server is not set
+# CONFIG_PACKAGE_ldconfig is not set
+# CONFIG_PACKAGE_ldd is not set
# CONFIG_PACKAGE_less is not set
# CONFIG_PACKAGE_less-wide is not set
# CONFIG_PACKAGE_libflashrom is not set
diff --git a/external/subpack/net/openssh/patches/sshd.patch b/external/subpack/net/openssh/patches/sshd.patch
deleted file mode 100644
index 6414581..0000000
--- a/external/subpack/net/openssh/patches/sshd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sshd.c
-+++ b/sshd.c
-@@ -1792,7 +1792,7 @@ main(int ac, char **av)
- "without OpenSSL"
- #endif
- );
--
-+ use_privsep = 0;
- /* Store privilege separation user for later use if required. */
- privsep_chroot = use_privsep && (getuid() == 0 || geteuid() == 0);
- if ((privsep_pw = getpwnam(SSH_PRIVSEP_USER)) == NULL) {
diff --git a/pack.sh b/pack.sh
index 8b26069..18be866 100755
--- a/pack.sh
+++ b/pack.sh
@@ -43,7 +43,7 @@
MBTK_M1901_VERSION_DIR=out/$MBTK_M1901_VERSION
MBTK_M1901_MDB_DIR=$MBTK_M1901_VERSION_DIR/MDB
-# BIN_LIC=-glibc
+BIN_LIC=-glibc
if [ "$BUILD_PARTITION" == "ab" ];then
CUSTOM_MODEL="$BUILD_PROJECT"_AB_V2
@@ -214,8 +214,8 @@
copy "$BIN_BLF"_MBTK.blf
fi
else
- #copy "$BIN_BLF"_MBTK.blf
- copy "$BIN_BLF".blf
+ copy "$BIN_BLF"_MBTK.blf
+ #copy "$BIN_BLF".blf
fi
# 修改版本号
diff --git a/package/mbtk-rootfs/Makefile b/package/mbtk-rootfs/Makefile
index 62b7ada..530b1fa 100755
--- a/package/mbtk-rootfs/Makefile
+++ b/package/mbtk-rootfs/Makefile
@@ -33,6 +33,7 @@
endef
define Package/$(PKG_NAME)/extra_provides
+ echo "libc.so"; \
echo "libdnet.so.1"; \
echo "cfg80211.ko"; \
echo "libhttpclient.so"; \