* Move all installation to do_install and install relative to ${D}.
* Add proper packaging.

Signed-off-by: Jacob Stiffler <[email protected]>
---
 .../recipes-ti/includes/arago-paths.inc            |  2 +-
 .../recipes-ti/llvm-rtos/llvm-rtos_git.bb          | 23 +++++++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/meta-arago-extras/recipes-ti/includes/arago-paths.inc 
b/meta-arago-extras/recipes-ti/includes/arago-paths.inc
index d617af3..a652df0 100644
--- a/meta-arago-extras/recipes-ti/includes/arago-paths.inc
+++ b/meta-arago-extras/recipes-ti/includes/arago-paths.inc
@@ -7,5 +7,5 @@ export OCL_RTOS_INSTALL_DIR_RECIPE   = 
"${installdir}/ti-opencl-rtos-tree"
 
 export LIBARCH_INSTALL_DIR    = 
"${STAGING_DIR_TARGET}${LIBARCH_INSTALL_DIR_RECIPE}"
 export LINALG_INSTALL_DIR     = 
"${STAGING_DIR_TARGET}${LINALG_INSTALL_DIR_RECIPE}"
-export LLVM_RTOS_INSTALL_DIR  = 
"${STAGING_DIR_NATIVE}${LLVM_RTOS_INSTALL_DIR_RECIPE}"
+export LLVM_RTOS_INSTALL_DIR  = 
"${STAGING_DIR_TARGET}${LLVM_RTOS_INSTALL_DIR_RECIPE}"
 export OCL_RTOS_INSTALL_DIR   = 
"${STAGING_DIR_TARGET}${OCL_RTOS_INSTALL_DIR_RECIPE}"
diff --git a/meta-arago-extras/recipes-ti/llvm-rtos/llvm-rtos_git.bb 
b/meta-arago-extras/recipes-ti/llvm-rtos/llvm-rtos_git.bb
index fac9d6b..ee4d7f2 100644
--- a/meta-arago-extras/recipes-ti/llvm-rtos/llvm-rtos_git.bb
+++ b/meta-arago-extras/recipes-ti/llvm-rtos/llvm-rtos_git.bb
@@ -24,7 +24,7 @@ RELEASE_TARGET_omap-a15 = "am57xx"
 CLEANBROKEN = "1"
 
 export LLVM_SRC_DIR="${S}"
-export LLVM_INSTALL_DIR="${LLVM_RTOS_INSTALL_DIR}"
+export LLVM_INSTALL_DIR="${D}${LLVM_RTOS_INSTALL_DIR_RECIPE}"
 
 do_compile() {
     unset LDFLAGS
@@ -41,16 +41,25 @@ do_compile() {
 
     make -C build.sysbios LLVMSupport LLVMCore LLVMBitReader ${PARALLEL_MAKE}
 
-    cd build.sysbios; make -f include/llvm/Makefile install/local; cd ..
-
 }
 
 do_install() {
-    install -d ${LLVM_RTOS_INSTALL_DIR}/bin
-    install -m 755 ${S}/build.sysbios/build.native/bin/llvm-config 
${LLVM_RTOS_INSTALL_DIR}/bin/llvm-config-host
+    cd build.sysbios; make -f include/llvm/Makefile install/local; cd ..
+
+    install -d ${D}${LLVM_RTOS_INSTALL_DIR_RECIPE}/bin
+    install -m 755 ${S}/build.sysbios/build.native/bin/llvm-config 
${D}${LLVM_RTOS_INSTALL_DIR_RECIPE}/bin/llvm-config-host
 
-    install -d ${LLVM_RTOS_INSTALL_DIR}/lib
+    install -d ${D}${LLVM_RTOS_INSTALL_DIR_RECIPE}/lib
     for libfile in ${S}/build.sysbios/lib/*.a; do
-        install -m 644 ${libfile} ${LLVM_RTOS_INSTALL_DIR}/lib
+        install -m 644 ${libfile} ${D}${LLVM_RTOS_INSTALL_DIR_RECIPE}/lib
     done
 }
+
+FILES_${PN} += "${LLVM_RTOS_INSTALL_DIR_RECIPE}"
+
+# This package contains one x86-64 executable and a few static libraries
+INSANE_SKIP_${PN} = "arch file-rdeps staticdev"
+
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_SYSROOT_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-- 
2.7.4

_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Reply via email to