[PATCH 4/4] chipsec: Ship 64-bit binary files only in 64-bit packages

--===============4732241186261128467==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

The files TianoCompress.bin and LzmaCompress.bin are distributed
in binary form. It's format is ELF64. Thus, only ship them for 64-bit
builds. They could not be used in 32-bit builds anyway. We also avoid this
package quality error:

ERROR: chipsec-1.2.5+-r0 do_package_qa: QA Issue: Architecture did not match
(x86-64, expected x86) on /work/qemux86-oe-linux/chipsec/1.2.5+-r0/packages-
split/chipsec/usr/lib/python2.7/site-packages/chipsec/chipsec_tools/linux/
TianoCompress.bin
Architecture did not match (x86-64, expected x86) on /work/qemux86-oe-linux/
chipsec/1.2.5+-r0/packages-split/chipsec/usr/lib/python2.7/site-packages/
chipsec/chipsec_tools/linux/LzmaCompress.bin [arch]
ERROR: chipsec-1.2.5+-r0 do_package_qa: QA Issue: Architecture did not match
(x86-64, expected x86) on /work/qemux86-oe-linux/chipsec/1.2.5+-r0/packages-
split/chipsec-dbg/usr/lib/python2.7/site-packages/chipsec/chipsec_tools/
linux/.debug/TianoCompress.bin
Architecture did not match (x86-64, expected x86) on /work/qemux86-oe-linux
/chipsec/1.2.5+-r0/packages-split/chipsec-dbg/usr/lib/python2.7/site-
packages/chipsec/chipsec_tools/linux/.debug/LzmaCompress.bin [arch]
ERROR: chipsec-1.2.5+-r0 do_package_qa: QA run found fatal errors.
Please consider fixing them.
ERROR: chipsec-1.2.5+-r0 do_package_qa: Function failed: do_package_qa
ERROR: Logfile of failure stored in: /data/code/luv-yocto-32/build/tmp/
work/qemux86-oe-linux/chipsec/1.2.5+-r0/temp/log.do_package_qa.108703
ERROR: Task (/data/code/luv-yocto-32/meta-luv/recipes-core/chipsec/
chipsec_git.bb:do_package_qa) failed with exit code '1'

Cc: Megha Dey <[email protected]>
Signed-off-by: Ricardo Neri <[email protected]>
---
 meta-luv/recipes-core/chipsec/chipsec_git.bb | 5 +++++
 meta/lib/oe/terminal.py                      | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/meta-luv/recipes-core/chipsec/chipsec_git.bb b/meta-luv/recipe=
s-core/chipsec/chipsec_git.bb
index 4778a03..a21c8bd 100644
--- a/meta-luv/recipes-core/chipsec/chipsec_git.bb
+++ b/meta-luv/recipes-core/chipsec/chipsec_git.bb
@@ -86,6 +86,11 @@ do_install_append() {
     cd ${D}${PYTHON_SITEPACKAGES_DIR}
     ls | grep -v chipsec | xargs rm -fr
     cd $OLDPWD
+
+    if [ ! "${TARGET_ARCH}" =3D "x86_64" ]; then
+        rm ${D}${PYTHON_SITEPACKAGES_DIR}/${PN}/chipsec_tools/linux/LzmaCo=
mpress.bin
+        rm ${D}${PYTHON_SITEPACKAGES_DIR}/${PN}/chipsec_tools/linux/TianoC=
ompress.bin
+    fi
 }
 =

 LUV_TEST_LOG_PARSER=3D"luv-parser-chipsec"
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index 3901ad3..22cb5d7 100644
--- a/meta/lib/oe/terminal.py
+++ b/meta/lib/oe/terminal.py
@@ -67,7 +67,8 @@ class Gnome(XTerminal):
         import tempfile
         pidfile =3D tempfile.NamedTemporaryFile(delete =3D False).name
         try:
-            sh_cmd =3D "oe-gnome-terminal-phonehome " + pidfile + " " + sh=
_cmd
+            #sh_cmd =3D "oe-gnome-terminal-phonehome " + pidfile + " " + s=
h_cmd
+            sh_cmd =3D bb.utils.which(os.getenv('PATH'), "oe-gnome-termina=
l-phonehome") + " " + pidfile + " " + sh_cmd
             XTerminal.__init__(self, sh_cmd, title, env, d)
             while os.stat(pidfile).st_size <=3D 0:
                 continue
-- =

2.9.3


--===============4732241186261128467==--