From b465038b2895715514bddc866c97b9b09ebf7740 Mon Sep 17 00:00:00 2001
From: adnan-ali1 <m_adnanali_1@hotmail.com>
Date: Wed, 3 Jun 2015 20:33:02 +0500
Subject: [PATCH] Architecture link in ADE Target Sysroot

This link is required by linker to link libraries and crt* files. The
'rm -f' command is changed to 'rm -rf' because in cedar release
external-
toolchain.bbclass copies all the stuff required by PACKAGES to image
folder (in do_install stage). In doing so it copies the architecture
folder (as it is required by FILES_glibc-multilib-link ) from sorcery
folder to image folder in work directory. Afterwords when we try to
remove the directory with 'rm -f' it prompts an error as directories
cannot be deleted with this command.

Signed-off-by: adnan-ali1 <m_adnanali_1@hotmail.com>
---
 recipes-external/glibc/core-image-base.bbappend | 1 +
 recipes-external/glibc/core-image-sato.bbappend | 1 +
 recipes-external/glibc/glibc-external.bb        | 5 +++++
 recipes-external/glibc/glibc-sysroot-setup.inc  | 2 +-
 4 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 recipes-external/glibc/core-image-base.bbappend
 create mode 100644 recipes-external/glibc/core-image-sato.bbappend

diff --git a/recipes-external/glibc/core-image-base.bbappend b/recipes-external/glibc/core-image-base.bbappend
new file mode 100644
index 0000000..32904e3
--- /dev/null
+++ b/recipes-external/glibc/core-image-base.bbappend
@@ -0,0 +1 @@
+TOOLCHAIN_HOST_TASK += "${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-mel', 'glibc-multilib-link', '', d)}"
diff --git a/recipes-external/glibc/core-image-sato.bbappend b/recipes-external/glibc/core-image-sato.bbappend
new file mode 100644
index 0000000..32904e3
--- /dev/null
+++ b/recipes-external/glibc/core-image-sato.bbappend
@@ -0,0 +1 @@
+TOOLCHAIN_HOST_TASK += "${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-mel', 'glibc-multilib-link', '', d)}"
diff --git a/recipes-external/glibc/glibc-external.bb b/recipes-external/glibc/glibc-external.bb
index 4c76bc9..1235339 100644
--- a/recipes-external/glibc/glibc-external.bb
+++ b/recipes-external/glibc/glibc-external.bb
@@ -68,6 +68,7 @@ glibc_external_do_install_extra () {
                 "This may mean that your external toolchain uses a different" \
                 "multi-lib setup than your machine configuration"
     fi
+    create_multilib_link ${D}
 }
 
 EXTERNAL_EXTRA_FILES += "\
@@ -98,6 +99,10 @@ python () {
 }
 
 # Default pattern is too greedy
+
+PACKAGES += "glibc-multilib-link"
+FILES_glibc-multilib-link += "${@sysroot_multilib_suffix(d)}"
+
 FILES_${PN}-utils = "\
     ${bindir}/gencat \
     ${bindir}/getconf \
diff --git a/recipes-external/glibc/glibc-sysroot-setup.inc b/recipes-external/glibc/glibc-sysroot-setup.inc
index df02b73..d5c95c1 100644
--- a/recipes-external/glibc/glibc-sysroot-setup.inc
+++ b/recipes-external/glibc/glibc-sysroot-setup.inc
@@ -10,7 +10,7 @@ create_multilib_link () {
 	dest="$1"
 	multilib_suffix="${@sysroot_multilib_suffix(d)}"
 	if [ "$multilib_suffix" != "." ]; then
-		rm -f $dest/$multilib_suffix
+		rm -rf $dest/$multilib_suffix
 		ln -s . $dest/$multilib_suffix
 	fi
 }