diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-02-10 11:38:23 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-02-10 11:38:23 +0000 |
| commit | 31116d6c7e368c42bcfdf2dba2000b2203f08e85 (patch) | |
| tree | 9737ea7c974da46ca2a9ee4acad8aabb9cbb2bac /openembedded/classes/base.bbclass | |
| parent | 9df0203e2b27ef3ae28b60447df6b91be7be81dc (diff) | |
| download | openembedded-core-31116d6c7e368c42bcfdf2dba2000b2203f08e85.tar.gz openembedded-core-31116d6c7e368c42bcfdf2dba2000b2203f08e85.tar.bz2 openembedded-core-31116d6c7e368c42bcfdf2dba2000b2203f08e85.zip | |
Update bbclasses from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@266 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/classes/base.bbclass')
| -rw-r--r-- | openembedded/classes/base.bbclass | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/openembedded/classes/base.bbclass b/openembedded/classes/base.bbclass index c5359b20f8..9b87828594 100644 --- a/openembedded/classes/base.bbclass +++ b/openembedded/classes/base.bbclass @@ -171,9 +171,8 @@ oe_libinstall() { if [ -z "$dir" ]; then dir=`pwd` fi - if [ -d "$dir/.libs" ]; then - dir=$dir/.libs - fi + dotlai=$libname.lai + dir=$dir`(cd $dir; find -name "$dotlai") | sed "s/^\.//;s/\/$dotlai\$//;q"` olddir=`pwd` __runcmd cd $dir @@ -191,7 +190,6 @@ oe_libinstall() { if [ -f "$dota" -o -n "$require_static" ]; then __runcmd install -m 0644 $dota $destpath/ fi - dotlai=$libname.lai if [ -f "$dotlai" -a -n "$libtool" ]; then if test -n "$staging_install" then @@ -724,9 +722,9 @@ python __anonymous () { pn = bb.data.getVar('PN', d, 1) - cvsdate = bb.data.getVar('CVSDATE_%s' % pn, d, 1) - if cvsdate != None: - bb.data.setVar('CVSDATE', cvsdate, d) + srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1) + if srcdate != None: + bb.data.setVar('SRCDATE', srcdate, d) use_nls = bb.data.getVar('USE_NLS_%s' % pn, d, 1) if use_nls != None: |