Skip to contentSkip to conversation

neo-ai-dlr: fix dlr runtime problem

PATCH Superseded Jianzhong Xu 1 participant 1 message Nov 26, 2019

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 neo-ai-dlr: fix dlr runtime problem

* move dlr shared library to python site-packages dlr folder
* add neo-ai-dlr-tests to target file system
* change testing scripts' path to be the same as in source code

---
 .../packagegroup-arago-tisdk-addons.bbappend          |  2 +-
 recipes-support/neo-ai/neo-ai-dlr_git.bb              | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)
recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bbappend +1 -1
index 2a298e0..aa0a182 100644
@@ -17,7 +17,7 @@ EXTRA_PACKAGES_append_k3 = " watchdog"
 
 EXTRA_PACKAGES_append_omapl138 = " ccief-basic"
 
-NEO_AI_PACKAGES = "neo-ai-dlr"
+NEO_AI_PACKAGES = "neo-ai-dlr neo-ai-dlr-tests"
 NEO_AI_PACKAGES_armv5 = ""
 
 EXTRA_PACKAGES_append = " hidapi \
recipes-support/neo-ai/neo-ai-dlr_git.bb +6 -5
index cbf4447..a895d21 100644
@@ -55,16 +55,17 @@ do_install() {
     distutils3_do_install
     cd ${B}
 
-    # setup.py install some libs under datadir, but we don't need them, so remove.
-    rm ${D}${datadir}/dlr/*.so
+    # move shared library to Python search path
+    mv ${D}${libdir}/libdlr.so ${D}${PYTHON_SITEPACKAGES_DIR}/dlr
 
     # Now install python test scripts
-    install -d ${D}${datadir}/dlr/tests
-    install -m 0644 ${S}/tests/python/integration/*.py ${D}${datadir}/dlr/tests/
+    install -d ${D}${datadir}/neo-ai-dlr/tests/python/integration
+    install -m 0644 ${S}/tests/python/integration/*.py ${D}${datadir}/neo-ai-dlr/tests/python/integration
+    install -m 0644 ${S}/tests/python/integration/*.npy ${D}${datadir}/neo-ai-dlr/tests/python/integration
 }
 
 PACKAGES =+ "${PN}-tests"
-FILES_${PN}-tests = "${datadir}/dlr/tests"
+FILES_${PN}-tests = "${datadir}/neo-ai-dlr/tests"
 RDEPENDS_${PN}-tests += "${PN}"
 
 # Versioned libs are not produced
Signature · 1 line
2.17.1