summaryrefslogtreecommitdiffstats
path: root/meta/classes/base.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-08-27 16:01:33 +0000
committerRichard Purdie <richard@openedhand.com>2006-08-27 16:01:33 +0000
commit93a8d0662ed361c76defe75a5cd84f203fdb1af1 (patch)
tree3481256915c4474980290e53c086af8f8389a10e /meta/classes/base.bbclass
parent37d03b1b00610716b27259a42c8718c8628b2ad3 (diff)
downloadpoky-93a8d0662ed361c76defe75a5cd84f203fdb1af1.tar.gz
classes: Sync with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@651 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes/base.bbclass')
-rw-r--r--meta/classes/base.bbclass20
1 files changed, 14 insertions, 6 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 0081a52d53..546992e71f 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -64,7 +64,7 @@ def base_set_filespath(path, d):
64 overrides = overrides + ":" 64 overrides = overrides + ":"
65 for o in overrides.split(":"): 65 for o in overrides.split(":"):
66 filespath.append(os.path.join(p, o)) 66 filespath.append(os.path.join(p, o))
67 bb.data.setVar("FILESPATH", ":".join(filespath), d) 67 return ":".join(filespath)
68 68
69FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ], d)}" 69FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ], d)}"
70 70
@@ -187,7 +187,7 @@ oe_libinstall() {
187 dir=`pwd` 187 dir=`pwd`
188 fi 188 fi
189 dotlai=$libname.lai 189 dotlai=$libname.lai
190 dir=$dir`(cd $dir; find -name "$dotlai") | sed "s/^\.//;s/\/$dotlai\$//;q"` 190 dir=$dir`(cd $dir;find . -name "$dotlai") | sed "s/^\.//;s/\/$dotlai\$//;q"`
191 olddir=`pwd` 191 olddir=`pwd`
192 __runcmd cd $dir 192 __runcmd cd $dir
193 193
@@ -413,10 +413,10 @@ def oe_unpack_file(file, data, url = None):
413 destdir = "." 413 destdir = "."
414 bb.mkdirhier("%s/%s" % (os.getcwd(), destdir)) 414 bb.mkdirhier("%s/%s" % (os.getcwd(), destdir))
415 cmd = 'cp %s %s/%s/' % (file, os.getcwd(), destdir) 415 cmd = 'cp %s %s/%s/' % (file, os.getcwd(), destdir)
416
416 if not cmd: 417 if not cmd:
417 return True 418 return True
418 419
419
420 dest = os.path.join(os.getcwd(), os.path.basename(file)) 420 dest = os.path.join(os.getcwd(), os.path.basename(file))
421 if os.path.exists(dest): 421 if os.path.exists(dest):
422 if os.path.samefile(file, dest): 422 if os.path.samefile(file, dest):
@@ -478,7 +478,8 @@ python base_eventhandler() {
478 msg += messages.get(name[5:]) or name[5:] 478 msg += messages.get(name[5:]) or name[5:]
479 elif name == "UnsatisfiedDep": 479 elif name == "UnsatisfiedDep":
480 msg += "package %s: dependency %s %s" % (e.pkg, e.dep, name[:-3].lower()) 480 msg += "package %s: dependency %s %s" % (e.pkg, e.dep, name[:-3].lower())
481 note(msg) 481 if msg:
482 note(msg)
482 483
483 if name.startswith("BuildStarted"): 484 if name.startswith("BuildStarted"):
484 bb.data.setVar( 'BB_VERSION', bb.__version__, e.data ) 485 bb.data.setVar( 'BB_VERSION', bb.__version__, e.data )
@@ -486,7 +487,7 @@ python base_eventhandler() {
486 path_to_packages = path_to_bbfiles[:path_to_bbfiles.rindex( "packages" )] 487 path_to_packages = path_to_bbfiles[:path_to_bbfiles.rindex( "packages" )]
487 monotone_revision = "<unknown>" 488 monotone_revision = "<unknown>"
488 try: 489 try:
489 monotone_revision = file( "%s/MT/revision" % path_to_packages ).read().strip() 490 monotone_revision = file( "%s/_MTN/revision" % path_to_packages ).read().strip()
490 except IOError: 491 except IOError:
491 pass 492 pass
492 bb.data.setVar( 'OE_REVISION', monotone_revision, e.data ) 493 bb.data.setVar( 'OE_REVISION', monotone_revision, e.data )
@@ -519,6 +520,7 @@ python base_eventhandler() {
519addtask configure after do_unpack do_patch 520addtask configure after do_unpack do_patch
520do_configure[dirs] = "${S} ${B}" 521do_configure[dirs] = "${S} ${B}"
521do_configure[bbdepcmd] = "do_populate_staging" 522do_configure[bbdepcmd] = "do_populate_staging"
523do_configure[deptask] = "do_populate_staging"
522base_do_configure() { 524base_do_configure() {
523 : 525 :
524} 526}
@@ -645,7 +647,7 @@ python __anonymous () {
645 if need_machine: 647 if need_machine:
646 import re 648 import re
647 this_machine = bb.data.getVar('MACHINE', d, 1) 649 this_machine = bb.data.getVar('MACHINE', d, 1)
648 if not re.match(need_machine, this_machine): 650 if this_machine and not re.match(need_machine, this_machine):
649 raise bb.parse.SkipPackage("incompatible with machine %s" % this_machine) 651 raise bb.parse.SkipPackage("incompatible with machine %s" % this_machine)
650 652
651 pn = bb.data.getVar('PN', d, 1) 653 pn = bb.data.getVar('PN', d, 1)
@@ -719,12 +721,18 @@ ftp://ftp.kernel.org/pub ftp://ftp.jp.kernel.org/pub
719ftp://ftp.gnupg.org/gcrypt/ ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/ 721ftp://ftp.gnupg.org/gcrypt/ ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/
720ftp://ftp.gnupg.org/gcrypt/ ftp://ftp.surfnet.nl/pub/security/gnupg/ 722ftp://ftp.gnupg.org/gcrypt/ ftp://ftp.surfnet.nl/pub/security/gnupg/
721ftp://ftp.gnupg.org/gcrypt/ http://gulus.USherbrooke.ca/pub/appl/GnuPG/ 723ftp://ftp.gnupg.org/gcrypt/ http://gulus.USherbrooke.ca/pub/appl/GnuPG/
724ftp://dante.ctan.org/tex-archive ftp://ftp.fu-berlin.de/tex/CTAN
725ftp://dante.ctan.org/tex-archive http://sunsite.sut.ac.jp/pub/archives/ctan/
726ftp://dante.ctan.org/tex-archive http://ctan.unsw.edu.au/
722ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnutls.org/pub/gnutls/ 727ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnutls.org/pub/gnutls/
723ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnupg.org/gcrypt/gnutls/ 728ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnupg.org/gcrypt/gnutls/
724ftp://ftp.gnutls.org/pub/gnutls http://www.mirrors.wiretapped.net/security/network-security/gnutls/ 729ftp://ftp.gnutls.org/pub/gnutls http://www.mirrors.wiretapped.net/security/network-security/gnutls/
725ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/ 730ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/
726ftp://ftp.gnutls.org/pub/gnutls http://josefsson.org/gnutls/releases/ 731ftp://ftp.gnutls.org/pub/gnutls http://josefsson.org/gnutls/releases/
727 732
733
734
728ftp://.*/.*/ http://www.oesources.org/source/current/ 735ftp://.*/.*/ http://www.oesources.org/source/current/
729http://.*/.*/ http://www.oesources.org/source/current/ 736http://.*/.*/ http://www.oesources.org/source/current/
730} 737}
738