summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-20 12:51:14 +0000
committerRichard Purdie <richard@openedhand.com>2006-11-20 12:51:14 +0000
commit95febfd333810ae3e3ca02dd9abf076066dd54c0 (patch)
tree7558f4a341ed13f1e27b95e2c3d8dce1b958db34 /meta/classes
parent131c98c899a8d48b0049380346dff1c145ee620b (diff)
downloadpoky-95febfd333810ae3e3ca02dd9abf076066dd54c0.tar.gz
base.bbclass: Sync with OE (remove broken mirrors, fix fetchall task)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@880 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/base.bbclass29
1 files changed, 19 insertions, 10 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index d8853e5464..a7d025bf56 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -194,6 +194,13 @@ oe_libinstall() {
194 __runcmd cd $dir 194 __runcmd cd $dir
195 195
196 lafile=$libname.la 196 lafile=$libname.la
197
198 # If such file doesn't exist, try to cut version suffix
199 if [ ! -f "$lafile" ]; then
200 libname=`echo "$libname" | sed 's/-[0-9.]*$//'`
201 lafile=$libname.la
202 fi
203
197 if [ -f "$lafile" ]; then 204 if [ -f "$lafile" ]; then
198 # libtool archive 205 # libtool archive
199 eval `cat $lafile|grep "^library_names="` 206 eval `cat $lafile|grep "^library_names="`
@@ -376,10 +383,10 @@ python base_do_fetch() {
376 raise bb.build.FuncFailed("Fetch failed: %s" % value) 383 raise bb.build.FuncFailed("Fetch failed: %s" % value)
377} 384}
378 385
379addtask fetchall 386addtask fetchall after do_fetch
380do_fetchall[recrdeptask] = "do_fetch" 387do_fetchall[recrdeptask] = "do_fetch"
381python base_do_fetchall() { 388base_do_fetchall() {
382 bb.build.exec_task('do_fetch', d) 389 :
383} 390}
384 391
385def oe_unpack_file(file, data, url = None): 392def oe_unpack_file(file, data, url = None):
@@ -394,7 +401,7 @@ def oe_unpack_file(file, data, url = None):
394 cmd = None 401 cmd = None
395 if file.endswith('.tar'): 402 if file.endswith('.tar'):
396 cmd = 'tar x --no-same-owner -f %s' % file 403 cmd = 'tar x --no-same-owner -f %s' % file
397 elif file.endswith('.tgz') or file.endswith('.tar.gz'): 404 elif file.endswith('.tgz') or file.endswith('.tar.gz') or file.endswith('.tar.Z'):
398 cmd = 'tar xz --no-same-owner -f %s' % file 405 cmd = 'tar xz --no-same-owner -f %s' % file
399 elif file.endswith('.tbz') or file.endswith('.tar.bz2'): 406 elif file.endswith('.tbz') or file.endswith('.tar.bz2'):
400 cmd = 'bzip2 -dc %s | tar x --no-same-owner -f -' % file 407 cmd = 'bzip2 -dc %s | tar x --no-same-owner -f -' % file
@@ -505,6 +512,9 @@ python base_eventhandler() {
505 monotone_revision = "<unknown>" 512 monotone_revision = "<unknown>"
506 try: 513 try:
507 monotone_revision = file( "%s/_MTN/revision" % path_to_packages ).read().strip() 514 monotone_revision = file( "%s/_MTN/revision" % path_to_packages ).read().strip()
515 if monotone_revision.startswith( "format_version" ):
516 monotone_revision_words = monotone_revision.split()
517 monotone_revision = monotone_revision_words[ monotone_revision_words.index( "old_revision" )+1][1:-1]
508 except IOError: 518 except IOError:
509 pass 519 pass
510 bb.data.setVar( 'OE_REVISION', monotone_revision, e.data ) 520 bb.data.setVar( 'OE_REVISION', monotone_revision, e.data )
@@ -553,7 +563,6 @@ base_do_compile() {
553 fi 563 fi
554} 564}
555 565
556
557base_do_stage () { 566base_do_stage () {
558 : 567 :
559} 568}
@@ -685,6 +694,7 @@ def base_after_parse_two(d):
685 694
686 pn = bb.data.getVar('PN', d, 1) 695 pn = bb.data.getVar('PN', d, 1)
687 696
697 # OBSOLETE in bitbake 1.7.4
688 srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1) 698 srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1)
689 if srcdate != None: 699 if srcdate != None:
690 bb.data.setVar('SRCDATE', srcdate, d) 700 bb.data.setVar('SRCDATE', srcdate, d)
@@ -713,11 +723,13 @@ def base_after_parse(d):
713 bb.data.setVar('PACKAGE_ARCH', mach_arch, d) 723 bb.data.setVar('PACKAGE_ARCH', mach_arch, d)
714 return 724 return
715 725
726
716python () { 727python () {
717 base_after_parse_two(d) 728 base_after_parse_two(d)
718 base_after_parse(d) 729 base_after_parse(d)
719} 730}
720 731
732
721# Patch handling 733# Patch handling
722inherit patch 734inherit patch
723 735
@@ -765,10 +777,7 @@ ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnupg.org/gcrypt/gnutls/
765ftp://ftp.gnutls.org/pub/gnutls http://www.mirrors.wiretapped.net/security/network-security/gnutls/ 777ftp://ftp.gnutls.org/pub/gnutls http://www.mirrors.wiretapped.net/security/network-security/gnutls/
766ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/ 778ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/
767ftp://ftp.gnutls.org/pub/gnutls http://josefsson.org/gnutls/releases/ 779ftp://ftp.gnutls.org/pub/gnutls http://josefsson.org/gnutls/releases/
768 780http://ftp.info-zip.org/pub/infozip/src/ http://mirror.switch.ch/ftp/mirror/infozip/src/
769 781http://ftp.info-zip.org/pub/infozip/src/ ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/
770
771ftp://.*/.*/ http://www.oesources.org/source/current/
772http://.*/.*/ http://www.oesources.org/source/current/
773} 782}
774 783