summaryrefslogtreecommitdiffstats
path: root/recipes-ti/includes
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2012-03-22 18:09:43 -0400
committerDenys Dmytriyenko <denys@ti.com>2012-03-22 18:09:43 -0400
commit997bf8f58a718afaab57657d8e347bffa70d8b9f (patch)
tree869cb791d6d4d24d3d0c1682e0ece8917c7bddb8 /recipes-ti/includes
parent62ad4edfca78151a0f2327699bfb30f164e4d0a4 (diff)
downloadmeta-ti-997bf8f58a718afaab57657d8e347bffa70d8b9f.tar.gz
ti-eula-unpack: fix the check for 32bit glibc, make it a warning
This makes better checking for 32bit glibc on Ubuntu 11.10 In general, change to a WARNING instead of breaking the build with an ERROR, to accomodate other different implementations of 32/64bit system libraries, as well as multiarch setups. Will need to come up with more robust solution later. Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-ti/includes')
-rw-r--r--recipes-ti/includes/ti-eula-unpack.inc7
1 files changed, 3 insertions, 4 deletions
diff --git a/recipes-ti/includes/ti-eula-unpack.inc b/recipes-ti/includes/ti-eula-unpack.inc
index dcabe9d9..60f5558b 100644
--- a/recipes-ti/includes/ti-eula-unpack.inc
+++ b/recipes-ti/includes/ti-eula-unpack.inc
@@ -21,11 +21,10 @@ python ti_bin_do_unpack() {
21 21
22 # InstallJammer requires 32bit version of glibc 22 # InstallJammer requires 32bit version of glibc
23 lib32path = '/lib' 23 lib32path = '/lib'
24 if os.path.exists('/lib64') and ( os.path.islink('/lib64') or os.path.islink('/lib') ): 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): 26 if not os.path.exists('%s/libc.so.6' % lib32path):
27 raise bb.build.FuncFailed, \ 27 bb.warn("TI installer requires 32bit glibc libraries for proper operation\nrun 'yum install glibc.i686' on Fedora or 'apt-get install ia32-libs' on Ubuntu/Debian")
28 "\nTI installer requires 32bit glibc libraries for proper operation\n\trun 'yum install glibc.i686' on Fedora or 'apt-get install ia32-libs' on Ubuntu/Debian"
29 28
30 localdata = bb.data.createCopy(d) 29 localdata = bb.data.createCopy(d)
31 bb.data.update_data(localdata) 30 bb.data.update_data(localdata)