From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
To: chipsec@lists.01.org
Subject: [PATCH 4/4] chipsec: Ship 64-bit binary files only in 64-bit packages
Date: Wed, 15 Mar 2017 12:42:03 -0700 [thread overview]
Message-ID: <20170315194203.118564-5-ricardo.neri-calderon@linux.intel.com> (raw)
In-Reply-To: <20170315194203.118564-1-ricardo.neri-calderon@linux.intel.com>
[-- Attachment #1: Type: text/plain, Size: 3302 bytes --]
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 <megha.dey@intel.com>
Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
---
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/recipes-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}" = "x86_64" ]; then
+ rm ${D}${PYTHON_SITEPACKAGES_DIR}/${PN}/chipsec_tools/linux/LzmaCompress.bin
+ rm ${D}${PYTHON_SITEPACKAGES_DIR}/${PN}/chipsec_tools/linux/TianoCompress.bin
+ fi
}
LUV_TEST_LOG_PARSER="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 = tempfile.NamedTemporaryFile(delete = False).name
try:
- sh_cmd = "oe-gnome-terminal-phonehome " + pidfile + " " + sh_cmd
+ #sh_cmd = "oe-gnome-terminal-phonehome " + pidfile + " " + sh_cmd
+ sh_cmd = bb.utils.which(os.getenv('PATH'), "oe-gnome-terminal-phonehome") + " " + pidfile + " " + sh_cmd
XTerminal.__init__(self, sh_cmd, title, env, d)
while os.stat(pidfile).st_size <= 0:
continue
--
2.9.3
prev parent reply other threads:[~2017-03-15 19:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-15 19:41 [PATCH 0/4] Fix 32-bit builds of CHIPSEC Ricardo Neri
2017-03-15 19:42 ` [PATCH 1/4] chipsec: make chipsec recipe depend on make_scripts Ricardo Neri
2017-03-15 19:42 ` [PATCH 2/4] chipsec: Provide CHIPSEC's driver with the build architecture Ricardo Neri
2017-03-15 19:42 ` [PATCH 3/4] chipsec: distutils' build arguments Ricardo Neri
2017-03-15 19:42 ` Ricardo Neri [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170315194203.118564-5-ricardo.neri-calderon@linux.intel.com \
--to=ricardo.neri-calderon@linux.intel.com \
--cc=chipsec@lists.01.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).