diff --git a/cross_tools/configs/config.xml b/cross_tools/configs/config.xml index a5b71f473b769fe7a9200719fd69dc26c43fc90d..50ffb887ad898192e6a014e160b6feea7d32b347 100644 --- a/cross_tools/configs/config.xml +++ b/cross_tools/configs/config.xml @@ -1,8 +1,8 @@ COMPILER_INFO="gcc 10.3.1" KERNEL="kernel" -KERNEL_BRANCH="5.10.0-136.20.0" +KERNEL_BRANCH="5.10.0-153.1.0" MUSLC_BRANCH="master" -COMMON_BRANCH="openEuler-23.03" +COMMON_BRANCH="openEuler-22.03-LTS-SP2" GCC="gcc" GCC_DIR="gcc-10.3.0" BINUTILS="binutils" @@ -12,22 +12,22 @@ MPFR_DIR="mpfr-4.1.0" GMP="gmp" GMP_DIR="gmp-6.2.1" MPC="libmpc" -MPC_DIR="mpc-1.3.1" +MPC_DIR="mpc-1.2.0" ISL="isl" -ISL_DIR="isl-0.24" +ISL_DIR="isl-0.16.1" GLIBC="glibc" -GLIBC_DIR="glibc-2.36" +GLIBC_DIR="glibc-2.34" MUSLC="musl" MUSLC_DIR="musl-1.2.3" EXPAT="expat" -EXPAT_DIR="expat-2.5.0" +EXPAT_DIR="expat-2.4.1" GETTEXT="gettext" GETTEXT_DIR="gettext-0.21" LIBICONV="libiconv" LIBICONV_DIR="libiconv-1.16" NCURSES="ncurses" -NCURSES_DIR="ncurses-6.4" +NCURSES_DIR="ncurses-6.3" ZLIB="zlib" -ZLIB_DIR="zlib-1.2.13" +ZLIB_DIR="zlib-1.2.11" GDB="gdb" -GDB_DIR="gdb-12.1" +GDB_DIR="gdb-11.1" diff --git a/cross_tools/prepare.sh b/cross_tools/prepare.sh index 8c374b52e80300dc5aa954b65f48fa39e801e098..0da35215ddf00ef03a1f9fa296274eba35e92ab8 100755 --- a/cross_tools/prepare.sh +++ b/cross_tools/prepare.sh @@ -8,7 +8,9 @@ function delete_dir() { function do_patch() { pushd $1 if [ $1 = "isl" ];then - tar xf $1-0.24.tar.gz + tar xf $1-0.14.tar.xz + tar xf $1-0.16.1.tar.xz + patch -p1 < *.patch elif [ $1 = "zlib" ];then tar xf *.tar.* else @@ -16,11 +18,7 @@ function do_patch() { echo "$1: do_unpack for of $PKG..." tar xf *.tar.* 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 + cat *.spec | grep ".*atch.*:" | grep -v "#" |grep "\.patch" | awk -F ":" '{print $2}' > $1-patchlist ls ${OE_PATCH_DIR}/ | grep "^$1" > $1-patchlist-oe || true pushd ${PKG%%.tar.*} for i in `cat ../$1-patchlist`