Patchwork [3/4] external-csl-toolchain: correct binary packaging

login
mail settings
Submitter Christopher Larson
Date Feb. 6, 2012, 9:20 p.m.
Message ID <3152866b7b0cdcda251f2b73c78016ace0118150.1328563142.git.chris_larson@mentor.com>
Download mbox | patch
Permalink /patch/20807/
State New
Headers show

Comments

Christopher Larson - Feb. 6, 2012, 9:20 p.m.
From: Christopher Larson <chris_larson@mentor.com>

CS puts optimized executables in usr/lib/bin, not usr/bin.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta/recipes-core/meta/external-csl-toolchain.bb |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

Patch

diff --git a/meta/recipes-core/meta/external-csl-toolchain.bb b/meta/recipes-core/meta/external-csl-toolchain.bb
index e81559a..5b4134e 100644
--- a/meta/recipes-core/meta/external-csl-toolchain.bb
+++ b/meta/recipes-core/meta/external-csl-toolchain.bb
@@ -58,7 +58,12 @@  do_install() {
 
 	rm ${D}${sysconfdir}/rpc
 	rm -r ${D}${datadir}/zoneinfo
-	rm -r ${D}${libdir}/bin
+
+	mv ${D}${libdir}/bin/* ${D}${bindir}/
+	if [ -e ${D}${libdir}/bin/.debug ]; then
+		install -d ${D}${bindir}/.debug
+		mv ${D}${libdir}/bin/.debug/* ${D}${bindir}/.debug/
+	fi
 
 	sed -i -e 's/__packed/__attribute__ ((packed))/' ${D}${includedir}/mtd/ubi-user.h
 	sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libc.so