summaryrefslogtreecommitdiff
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
parent19e113c67f1f54bee059ea2001c9088635b92c3c (diff)
downloadopenembedded-core-411cd0c6aeba3a8dd52ecd72d17291c020e59215.tar.gz
openembedded-core-411cd0c6aeba3a8dd52ecd72d17291c020e59215.tar.bz2
openembedded-core-411cd0c6aeba3a8dd52ecd72d17291c020e59215.tar.xz
openembedded-core-411cd0c6aeba3a8dd52ecd72d17291c020e59215.zip
base.bbclass: Further tweaks from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2629 311d38ba-8fff-0310-9ca6-ca027cbcb966
-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 67aee5e06..3edef13d5 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -784,20 +784,24 @@ python read_subpackage_metadata () {
def base_after_parse(d):
import bb, os, exceptions
-
- need_host = bb.data.getVar('COMPATIBLE_HOST', d, 1)
- if need_host:
- import re
- this_host = bb.data.getVar('HOST_SYS', d, 1)
- if not re.match(need_host, this_host):
- raise bb.parse.SkipPackage("incompatible with host %s" % this_host)
-
- need_machine = bb.data.getVar('COMPATIBLE_MACHINE', d, 1)
- if need_machine:
- import re
- this_machine = bb.data.getVar('MACHINE', d, 1)
- if this_machine and not re.match(need_machine, this_machine):
- raise bb.parse.SkipPackage("incompatible with machine %s" % this_machine)
+
+ source_mirror_fetch = bb.data.getVar('SOURCE_MIRROR_FETCH', d, 0)
+ if not source_mirror_fetch:
+ need_host = bb.data.getVar('COMPATIBLE_HOST', d, 1)
+ if need_host:
+ import re
+ this_host = bb.data.getVar('HOST_SYS', d, 1)
+ if not re.match(need_host, this_host):
+ raise bb.parse.SkipPackage("incompatible with host %s" % this_host)
+
+ need_machine = bb.data.getVar('COMPATIBLE_MACHINE', d, 1)
+ if need_machine:
+ import re
+ this_machine = bb.data.getVar('MACHINE', d, 1)
+ if this_machine and not re.match(need_machine, this_machine):
+ raise bb.parse.SkipPackage("incompatible with machine %s" % this_machine)
+
+
pn = bb.data.getVar('PN', d, 1)
@@ -840,11 +844,11 @@ def base_after_parse(d):
override = bb.data.getVar('SRC_URI_OVERRIDES_PACKAGE_ARCH', d, 1)
if override == '0':
return
-
+
paths = []
for p in [ "${PF}", "${P}", "${PN}", "files", "" ]:
path = bb.data.expand(os.path.join("${FILE_DIRNAME}", p, "${MACHINE}"), d)
- if os.path.isdir(path):
+ if os.path.isdir(path):
paths.append(path)
if len(paths) == 0:
return