cross-canadian: Move binaries into a subdirectory of bin to allow multimachine installs and update users accordingly

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

2 files changed, 2 insertions, 8 deletions

diff --git a/meta/packages/binutils/binutils-cross-canadian.inc b/meta/packages/binutils/binutils-cross-canadian.inc
index 04fa6e2de0..4953bc2c3b 100644
--- a/meta/packages/binutils/binutils-cross-canadian.inc
+++ b/meta/packages/binutils/binutils-cross-canadian.inc
@@ -6,15 +6,9 @@ EXTRA_OECONF = "--with-sysroot=${SDKPATH}/sysroots/${TARGET_SYS} \
 do_install () {
         autotools_do_install
 
-        # Fix the ${prefix}/${TARGET_SYS}/bin/* files to be symlinks
-        rm ${D}${prefix}/${TARGET_SYS}/bin/.debug -Rf
-        rm ${D}${prefix}/${TARGET_SYS}/bin/*
-        for l in ${D}${bindir}/*; do
-                ln -sf "${bindir}/`basename $l`" "${D}${prefix}/${TARGET_SYS}/bin/`basename $l | sed -e 's,${TARGET_PREFIX},,'`"
-        done
-
         # We're not interested in the libs or headers, these would come from the 
         # nativesdk or target version of the binutils recipe
+        rm -rf ${D}${prefix}/${TARGET_SYS}
         rm -f ${D}${libdir}/libbfd*
         rm -f ${D}${libdir}/libiberty*
         rm -f ${D}${libdir}/libopcodes*
diff --git a/meta/packages/binutils/binutils-cross-canadian_2.20.1.bb b/meta/packages/binutils/binutils-cross-canadian_2.20.1.bb
index 13fc22aa64..f4a7a0e619 100644
--- a/meta/packages/binutils/binutils-cross-canadian_2.20.1.bb
+++ b/meta/packages/binutils/binutils-cross-canadian_2.20.1.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-canadian.inc
-PR = "r3"
+PR = "r4"