diff --git a/cross_tools/configs/config_aarch64 b/cross_tools/configs/config_aarch64
index 4f8a0a992a7fe81f841b039fa9595c95ff75a29f..16507ff5b662c6a63f7192151bda7b7dfb88aa72 100644
--- a/cross_tools/configs/config_aarch64
+++ b/cross_tools/configs/config_aarch64
@@ -4,10 +4,7 @@
#
CT_CONFIGURE_has_static_link=y
CT_CONFIGURE_has_cxx11=y
-CT_CONFIGURE_has_wget=y
CT_CONFIGURE_has_curl=y
-CT_CONFIGURE_has_meson=y
-CT_CONFIGURE_has_ninja=y
CT_CONFIGURE_has_rsync=y
CT_CONFIGURE_has_make_3_81_or_newer=y
CT_CONFIGURE_has_make_4_0_or_newer=y
@@ -65,13 +62,12 @@ CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y
#
# Downloading
#
-CT_DOWNLOAD_AGENT_WGET=y
-# CT_DOWNLOAD_AGENT_CURL is not set
+CT_DOWNLOAD_AGENT_CURL=y
# CT_DOWNLOAD_AGENT_NONE is not set
# CT_FORBID_DOWNLOAD is not set
# CT_FORCE_DOWNLOAD is not set
CT_CONNECT_TIMEOUT=10
-CT_DOWNLOAD_WGET_OPTIONS="--passive-ftp --tries=3 -nc --progress=dot:binary"
+CT_DOWNLOAD_CURL_OPTIONS="--location --ftp-pasv --retry 3 --fail --silent"
# CT_ONLY_DOWNLOAD is not set
# CT_USE_MIRROR is not set
CT_VERIFY_DOWNLOAD_DIGEST=y
@@ -266,7 +262,7 @@ CT_LINUX_PKG_NAME="linux"
# CT_LINUX_SRC_RELEASE is not set
# CT_LINUX_SRC_DEVEL is not set
CT_LINUX_SRC_CUSTOM=y
-CT_LINUX_CUSTOM_LOCATION="/usr1/openeuler/src/kernel-5.10"
+CT_LINUX_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/kernel"
CT_LINUX_PATCH_GLOBAL=y
# CT_LINUX_PATCH_BUNDLED is not set
# CT_LINUX_PATCH_LOCAL is not set
@@ -362,7 +358,7 @@ CT_BINUTILS_PKG_NAME="binutils"
# CT_BINUTILS_SRC_RELEASE is not set
# CT_BINUTILS_SRC_DEVEL is not set
CT_BINUTILS_SRC_CUSTOM=y
-CT_BINUTILS_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/binutils/binutils-2.37"
+CT_BINUTILS_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/binutils/binutils-2.37"
CT_BINUTILS_PATCH_GLOBAL=y
# CT_BINUTILS_PATCH_BUNDLED is not set
# CT_BINUTILS_PATCH_LOCAL is not set
@@ -442,7 +438,7 @@ CT_GLIBC_PKG_NAME="glibc"
# CT_GLIBC_SRC_RELEASE is not set
# CT_GLIBC_SRC_DEVEL is not set
CT_GLIBC_SRC_CUSTOM=y
-CT_GLIBC_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/glibc/glibc-2.34"
+CT_GLIBC_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/glibc/glibc-2.35"
CT_GLIBC_PATCH_GLOBAL=y
# CT_GLIBC_PATCH_BUNDLED is not set
# CT_GLIBC_PATCH_LOCAL is not set
@@ -451,8 +447,8 @@ CT_GLIBC_PATCH_GLOBAL=y
# CT_GLIBC_PATCH_NONE is not set
CT_GLIBC_PATCH_ORDER="global"
# CT_GLIBC_VERY_NEW is not set
-# CT_GLIBC_V_2_35 is not set
-CT_GLIBC_V_2_34=y
+CT_GLIBC_V_2_35=y
+# CT_GLIBC_V_2_34 is not set
# CT_GLIBC_V_2_33 is not set
# CT_GLIBC_V_2_32 is not set
# CT_GLIBC_V_2_31 is not set
@@ -466,14 +462,14 @@ CT_GLIBC_V_2_34=y
# CT_GLIBC_V_2_23 is not set
# CT_GLIBC_V_2_19 is not set
# CT_GLIBC_V_2_17 is not set
-CT_GLIBC_VERSION="2.34"
+CT_GLIBC_VERSION="2.35"
CT_GLIBC_MIRRORS="$(CT_Mirrors GNU glibc)"
CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_GLIBC_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
CT_GLIBC_SIGNATURE_FORMAT="packed/.sig"
+CT_GLIBC_later_than_2_34=y
CT_GLIBC_2_34_or_later=y
-CT_GLIBC_2_34_or_older=y
CT_GLIBC_later_than_2_32=y
CT_GLIBC_2_32_or_later=y
CT_GLIBC_later_than_2_31=y
@@ -566,7 +562,7 @@ CT_GCC_PKG_NAME="gcc"
# CT_GCC_SRC_RELEASE is not set
# CT_GCC_SRC_DEVEL is not set
CT_GCC_SRC_CUSTOM=y
-CT_GCC_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/gcc/gcc-10.3.0"
+CT_GCC_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/gcc/gcc-10.3.0"
CT_GCC_PATCH_GLOBAL=y
# CT_GCC_PATCH_BUNDLED is not set
# CT_GCC_PATCH_LOCAL is not set
@@ -678,7 +674,7 @@ CT_GDB_PKG_NAME="gdb"
# CT_GDB_SRC_RELEASE is not set
# CT_GDB_SRC_DEVEL is not set
CT_GDB_SRC_CUSTOM=y
-CT_GDB_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/gdb/gdb-11.1"
+CT_GDB_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/gdb/gdb-11.1"
CT_GDB_PATCH_GLOBAL=y
# CT_GDB_PATCH_BUNDLED is not set
# CT_GDB_PATCH_LOCAL is not set
@@ -738,7 +734,7 @@ CT_EXPAT_PKG_NAME="expat"
# CT_EXPAT_SRC_RELEASE is not set
# CT_EXPAT_SRC_DEVEL is not set
CT_EXPAT_SRC_CUSTOM=y
-CT_EXPAT_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/expat/expat-2.4.1"
+CT_EXPAT_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/expat/expat-2.4.8"
CT_EXPAT_PATCH_GLOBAL=y
# CT_EXPAT_PATCH_BUNDLED is not set
# CT_EXPAT_PATCH_LOCAL is not set
@@ -746,9 +742,9 @@ CT_EXPAT_PATCH_GLOBAL=y
# CT_EXPAT_PATCH_LOCAL_BUNDLED is not set
# CT_EXPAT_PATCH_NONE is not set
CT_EXPAT_PATCH_ORDER="global"
-# CT_EXPAT_VERY_NEW is not set
-CT_EXPAT_V_2_4=y
-CT_EXPAT_VERSION="2.4.1"
+CT_EXPAT_VERY_NEW=y
+# CT_EXPAT_V_2_4 is not set
+CT_EXPAT_VERSION="new"
CT_EXPAT_MIRRORS="http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION} https://github.com/libexpat/libexpat/releases/download/R_${CT_EXPAT_VERSION//./_}"
CT_EXPAT_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_EXPAT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -761,7 +757,7 @@ CT_GETTEXT_PKG_NAME="gettext"
# CT_GETTEXT_SRC_RELEASE is not set
# CT_GETTEXT_SRC_DEVEL is not set
CT_GETTEXT_SRC_CUSTOM=y
-CT_GETTEXT_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/gettext/gettext-0.21"
+CT_GETTEXT_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/gettext/gettext-0.21"
CT_GETTEXT_PATCH_GLOBAL=y
# CT_GETTEXT_PATCH_BUNDLED is not set
# CT_GETTEXT_PATCH_LOCAL is not set
@@ -801,7 +797,7 @@ CT_GMP_PKG_NAME="gmp"
# CT_GMP_SRC_RELEASE is not set
# CT_GMP_SRC_DEVEL is not set
CT_GMP_SRC_CUSTOM=y
-CT_GMP_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/gmp/gmp-6.2.1"
+CT_GMP_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/gmp/gmp-6.2.1"
CT_GMP_PATCH_GLOBAL=y
# CT_GMP_PATCH_BUNDLED is not set
# CT_GMP_PATCH_LOCAL is not set
@@ -825,7 +821,7 @@ CT_ISL_PKG_NAME="isl"
# CT_ISL_SRC_RELEASE is not set
# CT_ISL_SRC_DEVEL is not set
CT_ISL_SRC_CUSTOM=y
-CT_ISL_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/isl/isl-0.16.1"
+CT_ISL_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/isl/isl-0.16.1"
CT_ISL_PATCH_GLOBAL=y
# CT_ISL_PATCH_BUNDLED is not set
# CT_ISL_PATCH_LOCAL is not set
@@ -862,7 +858,7 @@ CT_LIBICONV_PKG_NAME="libiconv"
# CT_LIBICONV_SRC_RELEASE is not set
# CT_LIBICONV_SRC_DEVEL is not set
CT_LIBICONV_SRC_CUSTOM=y
-CT_LIBICONV_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/libiconv/libiconv-1.16"
+CT_LIBICONV_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/libiconv/libiconv-1.16"
CT_LIBICONV_PATCH_GLOBAL=y
# CT_LIBICONV_PATCH_BUNDLED is not set
# CT_LIBICONV_PATCH_LOCAL is not set
@@ -886,7 +882,7 @@ CT_MPC_PKG_NAME="mpc"
# CT_MPC_SRC_RELEASE is not set
# CT_MPC_SRC_DEVEL is not set
CT_MPC_SRC_CUSTOM=y
-CT_MPC_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/libmpc/mpc-1.2.0"
+CT_MPC_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/libmpc/mpc-1.2.0"
CT_MPC_PATCH_GLOBAL=y
# CT_MPC_PATCH_BUNDLED is not set
# CT_MPC_PATCH_LOCAL is not set
@@ -913,7 +909,7 @@ CT_MPFR_PKG_NAME="mpfr"
# CT_MPFR_SRC_RELEASE is not set
# CT_MPFR_SRC_DEVEL is not set
CT_MPFR_SRC_CUSTOM=y
-CT_MPFR_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/mpfr/mpfr-4.1.0"
+CT_MPFR_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/mpfr/mpfr-4.1.0"
CT_MPFR_PATCH_GLOBAL=y
# CT_MPFR_PATCH_BUNDLED is not set
# CT_MPFR_PATCH_LOCAL is not set
@@ -940,7 +936,7 @@ CT_NCURSES_PKG_NAME="ncurses"
# CT_NCURSES_SRC_RELEASE is not set
# CT_NCURSES_SRC_DEVEL is not set
CT_NCURSES_SRC_CUSTOM=y
-CT_NCURSES_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/ncurses/ncurses-6.3"
+CT_NCURSES_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/ncurses/ncurses-6.3"
CT_NCURSES_PATCH_GLOBAL=y
# CT_NCURSES_PATCH_BUNDLED is not set
# CT_NCURSES_PATCH_LOCAL is not set
@@ -972,7 +968,7 @@ CT_ZLIB_PKG_NAME="zlib"
# CT_ZLIB_SRC_RELEASE is not set
# CT_ZLIB_SRC_DEVEL is not set
CT_ZLIB_SRC_CUSTOM=y
-CT_ZLIB_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/zlib/zlib-1.2.11"
+CT_ZLIB_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/zlib/zlib-1.2.11"
CT_ZLIB_PATCH_GLOBAL=y
# CT_ZLIB_PATCH_BUNDLED is not set
# CT_ZLIB_PATCH_LOCAL is not set
diff --git a/cross_tools/configs/config_arm32 b/cross_tools/configs/config_arm32
index 8dce379c3741134c06fdfef3a84bf2faca92fc4c..3c220421e5c594ab841539704cbdbdebea5206eb 100644
--- a/cross_tools/configs/config_arm32
+++ b/cross_tools/configs/config_arm32
@@ -4,10 +4,7 @@
#
CT_CONFIGURE_has_static_link=y
CT_CONFIGURE_has_cxx11=y
-CT_CONFIGURE_has_wget=y
CT_CONFIGURE_has_curl=y
-CT_CONFIGURE_has_meson=y
-CT_CONFIGURE_has_ninja=y
CT_CONFIGURE_has_rsync=y
CT_CONFIGURE_has_make_3_81_or_newer=y
CT_CONFIGURE_has_make_4_0_or_newer=y
@@ -66,13 +63,12 @@ CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y
#
# Downloading
#
-CT_DOWNLOAD_AGENT_WGET=y
-# CT_DOWNLOAD_AGENT_CURL is not set
+CT_DOWNLOAD_AGENT_CURL=y
# CT_DOWNLOAD_AGENT_NONE is not set
# CT_FORBID_DOWNLOAD is not set
# CT_FORCE_DOWNLOAD is not set
CT_CONNECT_TIMEOUT=10
-CT_DOWNLOAD_WGET_OPTIONS="--passive-ftp --tries=3 -nc --progress=dot:binary"
+CT_DOWNLOAD_CURL_OPTIONS="--location --ftp-pasv --retry 3 --fail --silent"
# CT_ONLY_DOWNLOAD is not set
# CT_USE_MIRROR is not set
CT_VERIFY_DOWNLOAD_DIGEST=y
@@ -282,7 +278,7 @@ CT_LINUX_PKG_NAME="linux"
# CT_LINUX_SRC_RELEASE is not set
# CT_LINUX_SRC_DEVEL is not set
CT_LINUX_SRC_CUSTOM=y
-CT_LINUX_CUSTOM_LOCATION="/usr1/openeuler/src/kernel-5.10"
+CT_LINUX_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/kernel"
CT_LINUX_PATCH_GLOBAL=y
# CT_LINUX_PATCH_BUNDLED is not set
# CT_LINUX_PATCH_LOCAL is not set
@@ -379,7 +375,7 @@ CT_BINUTILS_PKG_NAME="binutils"
# CT_BINUTILS_SRC_RELEASE is not set
# CT_BINUTILS_SRC_DEVEL is not set
CT_BINUTILS_SRC_CUSTOM=y
-CT_BINUTILS_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/binutils/binutils-2.37"
+CT_BINUTILS_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/binutils/binutils-2.37"
CT_BINUTILS_PATCH_GLOBAL=y
# CT_BINUTILS_PATCH_BUNDLED is not set
# CT_BINUTILS_PATCH_LOCAL is not set
@@ -459,7 +455,7 @@ CT_GLIBC_PKG_NAME="glibc"
# CT_GLIBC_SRC_RELEASE is not set
# CT_GLIBC_SRC_DEVEL is not set
CT_GLIBC_SRC_CUSTOM=y
-CT_GLIBC_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/glibc/glibc-2.34"
+CT_GLIBC_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/glibc/glibc-2.35"
CT_GLIBC_PATCH_GLOBAL=y
# CT_GLIBC_PATCH_BUNDLED is not set
# CT_GLIBC_PATCH_LOCAL is not set
@@ -468,8 +464,8 @@ CT_GLIBC_PATCH_GLOBAL=y
# CT_GLIBC_PATCH_NONE is not set
CT_GLIBC_PATCH_ORDER="global"
# CT_GLIBC_VERY_NEW is not set
-# CT_GLIBC_V_2_35 is not set
-CT_GLIBC_V_2_34=y
+CT_GLIBC_V_2_35=y
+# CT_GLIBC_V_2_34 is not set
# CT_GLIBC_V_2_33 is not set
# CT_GLIBC_V_2_32 is not set
# CT_GLIBC_V_2_31 is not set
@@ -483,14 +479,14 @@ CT_GLIBC_V_2_34=y
# CT_GLIBC_V_2_23 is not set
# CT_GLIBC_V_2_19 is not set
# CT_GLIBC_V_2_17 is not set
-CT_GLIBC_VERSION="2.34"
+CT_GLIBC_VERSION="2.35"
CT_GLIBC_MIRRORS="$(CT_Mirrors GNU glibc)"
CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_GLIBC_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
CT_GLIBC_SIGNATURE_FORMAT="packed/.sig"
+CT_GLIBC_later_than_2_34=y
CT_GLIBC_2_34_or_later=y
-CT_GLIBC_2_34_or_older=y
CT_GLIBC_later_than_2_32=y
CT_GLIBC_2_32_or_later=y
CT_GLIBC_later_than_2_31=y
@@ -583,7 +579,7 @@ CT_GCC_PKG_NAME="gcc"
# CT_GCC_SRC_RELEASE is not set
# CT_GCC_SRC_DEVEL is not set
CT_GCC_SRC_CUSTOM=y
-CT_GCC_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/gcc/gcc-10.3.0"
+CT_GCC_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/gcc/gcc-10.3.0"
CT_GCC_PATCH_GLOBAL=y
# CT_GCC_PATCH_BUNDLED is not set
# CT_GCC_PATCH_LOCAL is not set
@@ -694,7 +690,7 @@ CT_GDB_PKG_NAME="gdb"
# CT_GDB_SRC_RELEASE is not set
# CT_GDB_SRC_DEVEL is not set
CT_GDB_SRC_CUSTOM=y
-CT_GDB_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/gdb/gdb-11.1"
+CT_GDB_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/gdb/gdb-11.1"
CT_GDB_PATCH_GLOBAL=y
# CT_GDB_PATCH_BUNDLED is not set
# CT_GDB_PATCH_LOCAL is not set
@@ -753,7 +749,7 @@ CT_EXPAT_PKG_NAME="expat"
# CT_EXPAT_SRC_RELEASE is not set
# CT_EXPAT_SRC_DEVEL is not set
CT_EXPAT_SRC_CUSTOM=y
-CT_EXPAT_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/expat/expat-2.4.1"
+CT_EXPAT_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/expat/expat-2.4.8"
CT_EXPAT_PATCH_GLOBAL=y
# CT_EXPAT_PATCH_BUNDLED is not set
# CT_EXPAT_PATCH_LOCAL is not set
@@ -761,9 +757,9 @@ CT_EXPAT_PATCH_GLOBAL=y
# CT_EXPAT_PATCH_LOCAL_BUNDLED is not set
# CT_EXPAT_PATCH_NONE is not set
CT_EXPAT_PATCH_ORDER="global"
-# CT_EXPAT_VERY_NEW is not set
-CT_EXPAT_V_2_4=y
-CT_EXPAT_VERSION="2.4.1"
+CT_EXPAT_VERY_NEW=y
+# CT_EXPAT_V_2_4 is not set
+CT_EXPAT_VERSION="new"
CT_EXPAT_MIRRORS="http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION} https://github.com/libexpat/libexpat/releases/download/R_${CT_EXPAT_VERSION//./_}"
CT_EXPAT_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_EXPAT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -776,7 +772,7 @@ CT_GETTEXT_PKG_NAME="gettext"
# CT_GETTEXT_SRC_RELEASE is not set
# CT_GETTEXT_SRC_DEVEL is not set
CT_GETTEXT_SRC_CUSTOM=y
-CT_GETTEXT_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/gettext/gettext-0.21"
+CT_GETTEXT_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/gettext/gettext-0.21"
CT_GETTEXT_PATCH_GLOBAL=y
# CT_GETTEXT_PATCH_BUNDLED is not set
# CT_GETTEXT_PATCH_LOCAL is not set
@@ -816,7 +812,7 @@ CT_GMP_PKG_NAME="gmp"
# CT_GMP_SRC_RELEASE is not set
# CT_GMP_SRC_DEVEL is not set
CT_GMP_SRC_CUSTOM=y
-CT_GMP_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/gmp/gmp-6.2.1"
+CT_GMP_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/gmp/gmp-6.2.1"
CT_GMP_PATCH_GLOBAL=y
# CT_GMP_PATCH_BUNDLED is not set
# CT_GMP_PATCH_LOCAL is not set
@@ -840,7 +836,7 @@ CT_ISL_PKG_NAME="isl"
# CT_ISL_SRC_RELEASE is not set
# CT_ISL_SRC_DEVEL is not set
CT_ISL_SRC_CUSTOM=y
-CT_ISL_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/isl/isl-0.16.1"
+CT_ISL_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/isl/isl-0.16.1"
CT_ISL_PATCH_GLOBAL=y
# CT_ISL_PATCH_BUNDLED is not set
# CT_ISL_PATCH_LOCAL is not set
@@ -897,7 +893,7 @@ CT_LIBICONV_PKG_NAME="libiconv"
# CT_LIBICONV_SRC_RELEASE is not set
# CT_LIBICONV_SRC_DEVEL is not set
CT_LIBICONV_SRC_CUSTOM=y
-CT_LIBICONV_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/libiconv/libiconv-1.16"
+CT_LIBICONV_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/libiconv/libiconv-1.16"
CT_LIBICONV_PATCH_GLOBAL=y
# CT_LIBICONV_PATCH_BUNDLED is not set
# CT_LIBICONV_PATCH_LOCAL is not set
@@ -921,7 +917,7 @@ CT_MPC_PKG_NAME="mpc"
# CT_MPC_SRC_RELEASE is not set
# CT_MPC_SRC_DEVEL is not set
CT_MPC_SRC_CUSTOM=y
-CT_MPC_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/libmpc/mpc-1.2.0"
+CT_MPC_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/libmpc/mpc-1.2.0"
CT_MPC_PATCH_GLOBAL=y
# CT_MPC_PATCH_BUNDLED is not set
# CT_MPC_PATCH_LOCAL is not set
@@ -948,7 +944,7 @@ CT_MPFR_PKG_NAME="mpfr"
# CT_MPFR_SRC_RELEASE is not set
# CT_MPFR_SRC_DEVEL is not set
CT_MPFR_SRC_CUSTOM=y
-CT_MPFR_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/mpfr/mpfr-4.1.0"
+CT_MPFR_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/mpfr/mpfr-4.1.0"
CT_MPFR_PATCH_GLOBAL=y
# CT_MPFR_PATCH_BUNDLED is not set
# CT_MPFR_PATCH_LOCAL is not set
@@ -975,7 +971,7 @@ CT_NCURSES_PKG_NAME="ncurses"
# CT_NCURSES_SRC_RELEASE is not set
# CT_NCURSES_SRC_DEVEL is not set
CT_NCURSES_SRC_CUSTOM=y
-CT_NCURSES_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/ncurses/ncurses-6.3"
+CT_NCURSES_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/ncurses/ncurses-6.3"
CT_NCURSES_PATCH_GLOBAL=y
# CT_NCURSES_PATCH_BUNDLED is not set
# CT_NCURSES_PATCH_LOCAL is not set
@@ -1007,7 +1003,7 @@ CT_ZLIB_PKG_NAME="zlib"
# CT_ZLIB_SRC_RELEASE is not set
# CT_ZLIB_SRC_DEVEL is not set
CT_ZLIB_SRC_CUSTOM=y
-CT_ZLIB_CUSTOM_LOCATION="/usr1/cross-ng/std_build/open_source/zlib/zlib-1.2.11"
+CT_ZLIB_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/zlib/zlib-1.2.11"
CT_ZLIB_PATCH_GLOBAL=y
# CT_ZLIB_PATCH_BUNDLED is not set
# CT_ZLIB_PATCH_LOCAL is not set
diff --git a/cross_tools/configs/config_x86_64 b/cross_tools/configs/config_x86_64
index 632facc2d066e821bc3712c8daac1e643d0e764c..cc78145d84d48a8739baf7b80151851589578ce0 100644
--- a/cross_tools/configs/config_x86_64
+++ b/cross_tools/configs/config_x86_64
@@ -432,7 +432,7 @@ CT_GLIBC_PKG_NAME="glibc"
# CT_GLIBC_SRC_RELEASE is not set
# CT_GLIBC_SRC_DEVEL is not set
CT_GLIBC_SRC_CUSTOM=y
-CT_GLIBC_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/glibc/glibc-2.34"
+CT_GLIBC_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/glibc/glibc-2.35"
CT_GLIBC_PATCH_GLOBAL=y
# CT_GLIBC_PATCH_BUNDLED is not set
# CT_GLIBC_PATCH_LOCAL is not set
@@ -728,7 +728,7 @@ CT_EXPAT_PKG_NAME="expat"
# CT_EXPAT_SRC_RELEASE is not set
# CT_EXPAT_SRC_DEVEL is not set
CT_EXPAT_SRC_CUSTOM=y
-CT_EXPAT_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/expat/expat-2.4.1"
+CT_EXPAT_CUSTOM_LOCATION="/usr1/yocto-embedded-tools/cross_tools/open_source/expat/expat-2.4.8"
CT_EXPAT_PATCH_GLOBAL=y
# CT_EXPAT_PATCH_BUNDLED is not set
# CT_EXPAT_PATCH_LOCAL is not set
@@ -736,9 +736,9 @@ CT_EXPAT_PATCH_GLOBAL=y
# CT_EXPAT_PATCH_LOCAL_BUNDLED is not set
# CT_EXPAT_PATCH_NONE is not set
CT_EXPAT_PATCH_ORDER="global"
-# CT_EXPAT_VERY_NEW is not set
-CT_EXPAT_V_2_4=y
-CT_EXPAT_VERSION="2.4.1"
+CT_EXPAT_VERY_NEW=y
+# CT_EXPAT_V_2_4 is not set
+CT_EXPAT_VERSION="new"
CT_EXPAT_MIRRORS="http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION} https://github.com/libexpat/libexpat/releases/download/R_${CT_EXPAT_VERSION//./_}"
CT_EXPAT_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_EXPAT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
diff --git a/cross_tools/patches/glibc-fix-missing-convert-scm-timestamps.patch b/cross_tools/patches/glibc-fix-missing-convert-scm-timestamps.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e6a1587d182b600f808f91f37dc8e3c432aa771f
--- /dev/null
+++ b/cross_tools/patches/glibc-fix-missing-convert-scm-timestamps.patch
@@ -0,0 +1,30 @@
+Commit 948ce73b31 made recvmsg/recvmmsg to always call
+__convert_scm_timestamps for 64 bit time_t symbol, so adjust it to
+always build it for __TIMESIZE != 64.
+
+It fixes build for architecture with 32 bit time_t support when
+configured with minimum kernel of 5.1.
+---
+ sysdeps/unix/sysv/linux/convert_scm_timestamps.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c
+index 82171bf325..dfc8c2beff 100644
+--- a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c
++++ b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c
+@@ -16,9 +16,9 @@
+ License along with the GNU C Library; if not, see
+ . */
+
+-#include
++#include
+
+-#ifndef __ASSUME_TIME64_SYSCALLS
++#if __TIMESIZE != 64
+ # include
+ # include
+ # include
+--
+2.32.0
+
+
diff --git a/cross_tools/prepare.sh b/cross_tools/prepare.sh
index 789b0025d2e117f586ef54f90f2c1dfa0f466b0c..5ae77a7f6bef1907186490595848743007246609 100755
--- a/cross_tools/prepare.sh
+++ b/cross_tools/prepare.sh
@@ -15,16 +15,30 @@ function do_patch() {
tar xf *.tar.*
else
PKG=$(echo *.tar.*)
+ echo "$1: do_unpack for of $PKG..."
tar xf *.tar.*
- cat *.spec | grep "Patch" | grep "\.patch" | awk -F ":" '{print $2}' > $1-patchlist
+ echo "make patchlist of $1..."
+ cat *.spec | grep "Patch" | grep -v "#" |grep "\.patch" | awk -F ":" '{print $2}' > $1-patchlist
+ if [ $1 = "gcc" ];then
+ # current patches can't apply, it cause --sysroot bugs
+ sed -i '/0041-Backport-Register-sysroot-in-the-driver-switches-tab.patch/d' $1-patchlist
+ fi
+ ls ${OE_PATCH_DIR}/ | grep "^$1" > $1-patchlist-oe || true
pushd ${PKG%%.tar.*}
for i in `cat ../$1-patchlist`
do
+ echo "----------------apply patch $i:"
patch -p1 < ../$i
done
+ for i in `cat ../$1-patchlist-oe`
+ do
+ echo "----------------apply patch ${OE_PATCH_DIR}/$i:"
+ patch -p1 < ${OE_PATCH_DIR}/$i
+ done
popd
fi
popd
+ echo "------------do_patch for $1 done!"
}
function download_and_patch() {
@@ -111,6 +125,7 @@ main()
fi
WORK_DIR="$(realpath ${WORK_DIR})"
source $SRC_DIR/configs/config.xml
+ OE_PATCH_DIR="$SRC_DIR/patches"
readonly LIB_PATH="$WORK_DIR/open_source"
do_prepare
@@ -121,7 +136,6 @@ main()
echo "Prepare done! Now you can run: (not in root please)"
echo "'cp config_arm32 .config && ct-ng build' for build arm"
echo "'cp config_aarch64 .config && ct-ng build' for build arm64"
- echo "'cp config_x86_64 .config && ct-ng build' for build x86_64"
}
main "$@"