summaryrefslogtreecommitdiff
path: root/openembedded/classes/base.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-05-09 17:41:09 +0000
committerRichard Purdie <richard@openedhand.com>2006-05-09 17:41:09 +0000
commitba7e2a07578dda8bc38dd9b1bc591859c39f33cc (patch)
tree76d70729005a110ced3a2d771584c2536fd7a07e /openembedded/classes/base.bbclass
parent572f07af31f16b04f83755ee4d7a245eaf38a9f9 (diff)
downloadopenembedded-core-ba7e2a07578dda8bc38dd9b1bc591859c39f33cc.tar.gz
openembedded-core-ba7e2a07578dda8bc38dd9b1bc591859c39f33cc.tar.bz2
openembedded-core-ba7e2a07578dda8bc38dd9b1bc591859c39f33cc.tar.xz
openembedded-core-ba7e2a07578dda8bc38dd9b1bc591859c39f33cc.zip
Further site and class updates from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@381 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/classes/base.bbclass')
-rw-r--r--openembedded/classes/base.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/openembedded/classes/base.bbclass b/openembedded/classes/base.bbclass
index 1728b6570..5f0e0d2fc 100644
--- a/openembedded/classes/base.bbclass
+++ b/openembedded/classes/base.bbclass
@@ -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/' -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,' $dotlai >$destpath/$libname.la
+ __runcmd sed -e 's/^installed=yes$/installed=no/' -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' $dotlai >$destpath/$libname.la
else
__runcmd install -m 0644 $dotlai $destpath/$libname.la
fi
@@ -513,15 +513,15 @@ python base_eventhandler() {
if name.startswith("BuildStarted"):
bb.data.setVar( 'BB_VERSION', bb.__version__, e.data )
path_to_bbfiles = bb.data.getVar( 'BBFILES', e.data, 1 )
- path_to_packages = path_to_bbfiles[:path_to_bbfiles.index( "packages" )]
+ path_to_packages = path_to_bbfiles[:path_to_bbfiles.rindex( "packages" )]
monotone_revision = "<unknown>"
try:
monotone_revision = file( "%s/MT/revision" % path_to_packages ).read().strip()
except IOError:
pass
bb.data.setVar( 'OE_REVISION', monotone_revision, e.data )
- statusvars = ['BB_VERSION', 'OE_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'TARGET_FPU']
- statuslines = ["%-13s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars]
+ statusvars = ['BB_VERSION', 'OE_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'DISTRO_VERSION','TARGET_FPU']
+ statuslines = ["%-14s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars]
statusmsg = "\nOE Build Configuration:\n%s\n" % '\n'.join(statuslines)
print statusmsg