diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-05-13 12:18:44 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-05-13 12:18:44 +0400 |
| commit | 7819d379e1e55db8cd9ee9f17d94e9b571c840bf (patch) | |
| tree | 2c3a397b3ce0bfb05375d0e66f87f5faa6e39196 /classes | |
| parent | 6cf180ff0c54193cf2dca1a222574c3501b9dad6 (diff) | |
| parent | 2dc37922414891d73e4d0033fd2dfb7c1d5154dd (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/patch.bbclass | 12 | ||||
| -rw-r--r-- | classes/siteinfo.bbclass | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/classes/patch.bbclass b/classes/patch.bbclass index 075e826523..8d2bde0c4f 100644 --- a/classes/patch.bbclass +++ b/classes/patch.bbclass @@ -13,14 +13,22 @@ def patch_init(d): return "Error: %s not found." % self.path def md5sum(fname): - import md5, sys + import sys + + # when we move to Python 2.5 as minimal supported + # we can kill that try/except as hashlib is 2.5+ + try: + import hashlib + m = hashlib.md5() + except ImportError: + import md5 + m = md5.new() try: f = file(fname, 'rb') except IOError: raise NotFoundError(fname) - m = md5.new() while True: d = f.read(8096) if not d: diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index 82a1616d05..0221b123f1 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -49,6 +49,7 @@ def get_siteinfo_list(d): "i486-mingw32": "endian-little bit-32 common-mingw ix86-common",\ "i586-mingw32": "endian-little bit-32 common-mingw ix86-common",\ "i686-mingw32": "endian-little bit-32 common-mingw ix86-common",\ + "ia64-linux": "endian-little bit-64 common-linux common-glibc",\ "mipsel-linux": "endian-little bit-32 common-linux common-glibc",\ "mipsel-linux-uclibc": "endian-little bit-32 common-linux common-uclibc",\ "mips-linux": "endian-big bit-32 common-linux common-glibc",\ |