[PATCH 5/9] chipsec: correct location of installation

[Ricardo Neri <ricardo.neri-calderon@linux.intel.com>]

[-- Attachment #1: Type: text/plain, Size: 1991 bytes --]

Now chipsec relies on setuptools to install chipsec. This leads to a
bizarre issue in which the chipsec artifacts are buried under a
directory structure ${D}/${PYTHON_SITEPACKAGES_DIR}${D}/
${PYTHON_SITEPACKAGES_DIR}. Relocate the chipsec binaries to the
expected location.

Also, we use the --root option in setup.py to get rid of the CPU
architecture and the operating system sufix to the package name.

Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
---
 meta-luv/recipes-core/chipsec/chipsec_git.bb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/meta-luv/recipes-core/chipsec/chipsec_git.bb b/meta-luv/recipes-core/chipsec/chipsec_git.bb
index da0f970..2f7bcb6 100644
--- a/meta-luv/recipes-core/chipsec/chipsec_git.bb
+++ b/meta-luv/recipes-core/chipsec/chipsec_git.bb
@@ -46,6 +46,9 @@ def get_target_arch(d):
 
 EXTRA_OEMAKE += "ARCH="${@get_target_arch(d)}""
 
+DISTUTILS_INSTALL_ARGS = "--root=${D}${PYTHON_SITEPACKAGES_DIR} \
+    --install-data=${D}/${datadir}"
+
 fix_mod_path() {
     sed -i -e "s:^INSTALL_MOD_PATH_PREFIX = .*:INSTALL_MOD_PATH_PREFIX = \"${PYTHON_SITEPACKAGES_DIR}\":" ${S}/source/tool/chipsec_main.py
     sed -i -e "s:PYTHONPATH:${PYTHON_SITEPACKAGES_DIR}:" ${WORKDIR}/chipsec
@@ -63,6 +66,19 @@ do_patch_append() {
 do_install_append() {
     install -d ${D}${bindir}
     install -m 0755 ${WORKDIR}/chipsec ${D}${bindir}
+
+    #
+    # FIXME: for some reason chipsec ends up installed in a repeated
+    # directory structure. Thus, we need to move it to its proper location
+    # under PYTHON_SITEPACKAGES_DIR
+    #
+
+    install -d ${D}${PYTHON_SITEPACKAGES_DIR}/${PN}
+    mv ${D}${PYTHON_SITEPACKAGES_DIR}${D}${PYTHON_SITEPACKAGES_DIR}/* ${D}${PYTHON_SITEPACKAGES_DIR}/${PN}
+    # remove old files
+    cd ${D}${PYTHON_SITEPACKAGES_DIR}
+    ls | grep -v chipsec | xargs rm -fr
+    cd $OLDPWD
 }
 
 LUV_TEST_LOG_PARSER="luv-parser-chipsec"
-- 
2.7.4