From 189b9a916b845c90db5e51f62496a13f60936d36 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 9 May 2006 16:10:46 +0000 Subject: Sync bbclass files with OE git-svn-id: https://svn.o-hand.com/repos/poky/trunk@374 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- openembedded/classes/base.bbclass | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'openembedded/classes/base.bbclass') diff --git a/openembedded/classes/base.bbclass b/openembedded/classes/base.bbclass index 21feaab6e..1728b6570 100644 --- a/openembedded/classes/base.bbclass +++ b/openembedded/classes/base.bbclass @@ -27,7 +27,7 @@ def base_read_file(filename): try: f = file( filename, "r" ) except IOError, reason: - raise bb.build.FuncFailed("can't read from file '%s' (%s)", (filename,reason)) + return "" # WARNING: can't raise an error now because of the new RDEPENDS handling. This is a bit ugly. :M: else: return f.read().strip() return None @@ -196,7 +196,7 @@ oe_libinstall() { # stop libtool using the final directory name for libraries # in staging: __runcmd rm -f $destpath/$libname.la - __runcmd sed -e 's/^installed=yes$/installed=no/' $dotlai >$destpath/$libname.la + __runcmd sed -e 's/^installed=yes$/installed=no/' -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,' $dotlai >$destpath/$libname.la else __runcmd install -m 0644 $dotlai $destpath/$libname.la fi @@ -723,7 +723,14 @@ python __anonymous () { this_host = bb.data.getVar('HOST_SYS', d, 1) if not re.match(need_host, this_host): raise bb.parse.SkipPackage("incompatible with host %s" % this_host) - + + need_machine = bb.data.getVar('COMPATIBLE_MACHINE', d, 1) + if need_machine: + import re + this_machine = bb.data.getVar('MACHINE', d, 1) + if not re.match(need_machine, this_machine): + raise bb.parse.SkipPackage("incompatible with machine %s" % this_machine) + pn = bb.data.getVar('PN', d, 1) srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1) -- cgit v1.2.3