diff options
| author | Luca Ceresoli <luca@lucaceresoli.net> | 2019-07-23 16:05:13 +0000 |
|---|---|---|
| committer | Denys Dmytriyenko <denys@ti.com> | 2019-07-24 00:14:38 +0000 |
| commit | 834e7f606dcd637a0cf3bef47e15d8db02420b43 (patch) | |
| tree | d26f6fd96511b98d910013bc8250d3376d1e1251 /recipes-ti | |
| parent | 804f108d503d1b74f565766b19347e3104d81734 (diff) | |
| download | meta-ti-834e7f606dcd637a0cf3bef47e15d8db02420b43.tar.gz | |
ti-unpack.inc: abort if 32 bit libs are not installed
ti_bin_do_unpack() detects the absence of the required 32 bit libraries,
but only emits a warning. Later on the build will fail with a mysterious
error.
Fail immediately so the user can clearly read the error message and the
(always appreciated) instructions on how to fix the problem.
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-ti')
| -rw-r--r-- | recipes-ti/includes/ti-unpack.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-ti/includes/ti-unpack.inc b/recipes-ti/includes/ti-unpack.inc index dbc49491..81fcf6a6 100644 --- a/recipes-ti/includes/ti-unpack.inc +++ b/recipes-ti/includes/ti-unpack.inc | |||
| @@ -24,7 +24,7 @@ python ti_bin_do_unpack() { | |||
| 24 | if os.path.exists('/lib64') and (os.path.islink('/lib64') or os.path.islink('/lib') or os.path.exists('/lib32')): | 24 | if os.path.exists('/lib64') and (os.path.islink('/lib64') or os.path.islink('/lib') or os.path.exists('/lib32')): |
| 25 | lib32path = '/lib32' | 25 | lib32path = '/lib32' |
| 26 | if not os.path.exists('%s/libc.so.6' % lib32path) and not os.path.exists('%s/i386-linux-gnu/libc.so.6' % lib32path): | 26 | if not os.path.exists('%s/libc.so.6' % lib32path) and not os.path.exists('%s/i386-linux-gnu/libc.so.6' % lib32path): |
| 27 | bb.warn("TI installer requires 32bit glibc libraries for proper operation\nrun 'yum install glibc.i686' on Fedora or 'apt-get install libc6:i386' on Ubuntu/Debian") | 27 | bb.fatal("TI installer requires 32bit glibc libraries for proper operation\nrun 'yum install glibc.i686' on Fedora or 'apt-get install libc6:i386' on Ubuntu/Debian") |
| 28 | 28 | ||
| 29 | localdata = bb.data.createCopy(d) | 29 | localdata = bb.data.createCopy(d) |
| 30 | bb.data.update_data(localdata) | 30 | bb.data.update_data(localdata) |