summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-09-01 15:06:04 +0000
committerRichard Purdie <richard@openedhand.com>2007-09-01 15:06:04 +0000
commit411cd0c6aeba3a8dd52ecd72d17291c020e59215 (patch)
tree7e6d0253c36d94fcc0aca3d1931fe0a37627c954 /meta/classes
parent19e113c67f1f54bee059ea2001c9088635b92c3c (diff)
downloadpoky-411cd0c6aeba3a8dd52ecd72d17291c020e59215.tar.gz
base.bbclass: Further tweaks from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2629 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/base.bbclass36
1 files changed, 20 insertions, 16 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 67aee5e064..3edef13d58 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -784,20 +784,24 @@ python read_subpackage_metadata () {
784 784
785def base_after_parse(d): 785def base_after_parse(d):
786 import bb, os, exceptions 786 import bb, os, exceptions
787 787
788 need_host = bb.data.getVar('COMPATIBLE_HOST', d, 1) 788 source_mirror_fetch = bb.data.getVar('SOURCE_MIRROR_FETCH', d, 0)
789 if need_host: 789 if not source_mirror_fetch:
790 import re 790 need_host = bb.data.getVar('COMPATIBLE_HOST', d, 1)
791 this_host = bb.data.getVar('HOST_SYS', d, 1) 791 if need_host:
792 if not re.match(need_host, this_host): 792 import re
793 raise bb.parse.SkipPackage("incompatible with host %s" % this_host) 793 this_host = bb.data.getVar('HOST_SYS', d, 1)
794 794 if not re.match(need_host, this_host):
795 need_machine = bb.data.getVar('COMPATIBLE_MACHINE', d, 1) 795 raise bb.parse.SkipPackage("incompatible with host %s" % this_host)
796 if need_machine: 796
797 import re 797 need_machine = bb.data.getVar('COMPATIBLE_MACHINE', d, 1)
798 this_machine = bb.data.getVar('MACHINE', d, 1) 798 if need_machine:
799 if this_machine and not re.match(need_machine, this_machine): 799 import re
800 raise bb.parse.SkipPackage("incompatible with machine %s" % this_machine) 800 this_machine = bb.data.getVar('MACHINE', d, 1)
801 if this_machine and not re.match(need_machine, this_machine):
802 raise bb.parse.SkipPackage("incompatible with machine %s" % this_machine)
803
804
801 805
802 pn = bb.data.getVar('PN', d, 1) 806 pn = bb.data.getVar('PN', d, 1)
803 807
@@ -840,11 +844,11 @@ def base_after_parse(d):
840 override = bb.data.getVar('SRC_URI_OVERRIDES_PACKAGE_ARCH', d, 1) 844 override = bb.data.getVar('SRC_URI_OVERRIDES_PACKAGE_ARCH', d, 1)
841 if override == '0': 845 if override == '0':
842 return 846 return
843 847
844 paths = [] 848 paths = []
845 for p in [ "${PF}", "${P}", "${PN}", "files", "" ]: 849 for p in [ "${PF}", "${P}", "${PN}", "files", "" ]:
846 path = bb.data.expand(os.path.join("${FILE_DIRNAME}", p, "${MACHINE}"), d) 850 path = bb.data.expand(os.path.join("${FILE_DIRNAME}", p, "${MACHINE}"), d)
847 if os.path.isdir(path): 851 if os.path.isdir(path):
848 paths.append(path) 852 paths.append(path)
849 if len(paths) == 0: 853 if len(paths) == 0:
850 return 854 return