From 7fa931d11359eea01060455c877a2cb55cb1b028 Mon Sep 17 00:00:00 2001
From: fanglinxu <fanglinxu@huawei.com>
Date: Thu, 18 Aug 2022 16:52:32 +0800
Subject: [PATCH] ct-ng: update ct-ng config to build compiler using openeuler
 22.09

* update README.md of
* fixup patch bugs of awk
* update config.xml to openeuler 22.09

Signed-off-by: fanglinxu <fanglinxu@huawei.com>
---
 cross_tools/README.md          | 2 +-
 cross_tools/configs/config.xml | 8 ++++----
 cross_tools/prepare.sh         | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cross_tools/README.md b/cross_tools/README.md
index e606ccec..08cd6367 100644
--- a/cross_tools/README.md
+++ b/cross_tools/README.md
@@ -40,7 +40,7 @@ gcc version 10.3.1 (crosstool-NG 1.25.0)
 2.  下载本仓库的代码，并通过脚本一键准备构建所需的代码和配置:
 
 ````
-    cd /usr1 && git clone -b openEuler-22.03-LTS https://gitee.com/openeuler/yocto-embedded-tools.git
+    cd /usr1 && git clone -b master https://gitee.com/openeuler/yocto-embedded-tools.git
     cd yocto-embedded-tools/cross_tools
     ./prepare.sh
 ````
diff --git a/cross_tools/configs/config.xml b/cross_tools/configs/config.xml
index 3ca01a41..bf4152a0 100644
--- a/cross_tools/configs/config.xml
+++ b/cross_tools/configs/config.xml
@@ -1,7 +1,7 @@
 COMPILER_INFO="gcc 10.3.1"
 KERNEL="kernel"
-KERNEL_BRANCH="5.10.0-60.18.0"
-COMMON_BRANCH="openEuler-22.03-LTS"
+KERNEL_BRANCH="5.10.0-106.6.0"
+COMMON_BRANCH="openEuler-22.09"
 GCC="gcc"
 GCC_DIR="gcc-10.3.0"
 BINUTILS="binutils"
@@ -15,9 +15,9 @@ MPC_DIR="mpc-1.2.0"
 ISL="isl"
 ISL_DIR="isl-0.16.1"
 GLIBC="glibc"
-GLIBC_DIR="glibc-2.34"
+GLIBC_DIR="glibc-2.35"
 EXPAT="expat"
-EXPAT_DIR="expat-2.4.1"
+EXPAT_DIR="expat-2.4.8"
 GETTEXT="gettext"
 GETTEXT_DIR="gettext-0.21"
 LIBICONV="libiconv"
diff --git a/cross_tools/prepare.sh b/cross_tools/prepare.sh
index c3d84838..789b0025 100755
--- a/cross_tools/prepare.sh
+++ b/cross_tools/prepare.sh
@@ -16,7 +16,7 @@ function do_patch() {
 	else
 		PKG=$(echo *.tar.*)
 		tar xf *.tar.*
-		cat *.spec | grep "Patch" | grep "\.patch" | awk '{print $2}' > $1-patchlist
+		cat *.spec | grep "Patch" | grep "\.patch" | awk -F ":" '{print $2}' > $1-patchlist
 		pushd ${PKG%%.tar.*}
 		for i in `cat ../$1-patchlist`
 		do
@@ -29,7 +29,7 @@ function do_patch() {
 
 function download_and_patch() {
 	while [ $# != 0 ] ; do
-		[ -n "$1" ] && echo "Download $1" && git clone -b $COMMON_BRANCH https://gitee.com/src-openeuler/$1.git && do_patch $1; shift;
+		[ -n "$1" ] && echo "Download $1" && git clone -b $COMMON_BRANCH https://gitee.com/src-openeuler/$1.git --depth 1 && do_patch $1; shift;
 	done
 }
 
@@ -121,6 +121,7 @@ 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 "$@"
-- 
Gitee