mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-05-07 03:49:20 +00:00
Code Issues Projects Releases Wiki Activity

ti-eula-unpack: fix the check for 32bit glibc, make it a warning

Browse Source 
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>
This commit is contained in:
Denys Dmytriyenko
2012-03-22 18:09:43 -04:00
parent 62ad4edfca
commit 997bf8f58a
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
recipes-ti/includes/ti-eula-unpack.inc
View File

@@ -21,11 +21,10 @@ python ti_bin_do_unpack() {
# InstallJammer requires 32bit version of glibc
lib32path = '/lib'
if os.path.exists('/lib64') and ( os.path.islink('/lib64') or os.path.islink('/lib') ):
lib32path = '/lib32'
if os.path.exists('/lib64') and (os.path.islink('/lib64') or os.path.islink('/lib') or os.path.exists('/lib32')):
lib32path = '/lib32'
if not os.path.exists('%s/libc.so.6' % lib32path):
raise bb.build.FuncFailed, \
"\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"
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")
localdata = bb.data.createCopy(d)
bb.data.update_data(localdata)