From a0c37049e4ec04a85051bff2857f5695890ca56a Mon Sep 17 00:00:00 2001
From: lisimin <lisimin@huawei.com>
Date: Sat, 19 Mar 2022 15:09:49 +0800
Subject: [PATCH] move files from compiler sysroot to openeuler sysroot

move files from compiler sysroot to openeuler sysroot to fix file missing bug
add link to compiler cross command used in meta-environment
change default sysroot path to target sysroot dir, not host sysroot dir in meta-environment

Signed-off-by: lisimin <lisimin@huawei.com>
---
 .../recipes-core/meta/meta-environment.bbappend      |  1 +
 .../gcc/gcc-bin-toolchain-cross-canadian.bb          | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 meta-openeuler/recipes-core/meta/meta-environment.bbappend

diff --git a/meta-openeuler/recipes-core/meta/meta-environment.bbappend b/meta-openeuler/recipes-core/meta/meta-environment.bbappend
new file mode 100644
index 00000000000..a1eccae7fd8
--- /dev/null
+++ b/meta-openeuler/recipes-core/meta/meta-environment.bbappend
@@ -0,0 +1 @@
+SDKPATHNATIVE = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}/"
diff --git a/meta-openeuler/recipes-devtools/gcc/gcc-bin-toolchain-cross-canadian.bb b/meta-openeuler/recipes-devtools/gcc/gcc-bin-toolchain-cross-canadian.bb
index 1467031e500..4ba0b04304a 100644
--- a/meta-openeuler/recipes-devtools/gcc/gcc-bin-toolchain-cross-canadian.bb
+++ b/meta-openeuler/recipes-devtools/gcc/gcc-bin-toolchain-cross-canadian.bb
@@ -16,12 +16,22 @@ SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"
 
 do_install() {
     install -m 0755 -d ${D}/${SDKTARGETSYSROOT}/
+    #some files are under sysroot in compiler, need to copy to new sysroot
+    cp -pPR ${B}/sysroot/* ${D}/${SDKTARGETSYSROOT}/
     cp -pPR ${B}/* ${D}/${SDKTARGETSYSROOT}/
+    if [ ${TOOLCHAIN_PREFIX}- == ${TARGET_PREFIX} ]; then
+        return 0
+    fi
+    for f in ${D}/${SDKTARGETSYSROOT}/bin/${TOOLCHAIN_PREFIX}-*; do
+        bin=$(basename ${f})
+        lnk=$(basename ${f} | sed "s/^${TOOLCHAIN_PREFIX}-/${TARGET_PREFIX}/g")
+        ln -svf ${bin} ${D}/${SDKTARGETSYSROOT}/bin/${lnk}
+    done
     chown -R root:root ${D}
 }
 
 SYSROOT_DIRS = ""
 
-INSANE_SKIP_${PN} += " already-stripped libdir staticdev dev-so"
+INSANE_SKIP_${PN} += " already-stripped libdir staticdev dev-so infodir"
 FILES_${PN} = "/"
 PACKAGES = "${PN}"
-- 
Gitee