summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-27 12:23:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-29 18:14:58 +0000
commitb53038303374debf91ed73039cf79912f266acfe (patch)
tree9b4147d5e89b4ca72be5292297b9dc5fdecc13a5
parent6600190d7efb69dd5121b9ca082ad4c0dbc5e17e (diff)
downloadopenembedded-core-contrib-b53038303374debf91ed73039cf79912f266acfe.tar.gz
openembedded-core-contrib-b53038303374debf91ed73039cf79912f266acfe.tar.bz2
openembedded-core-contrib-b53038303374debf91ed73039cf79912f266acfe.zip
base: Move COMPATIBLE_MACHINE out the scope of SOURCE_MIRROR_FETCH
Recipes setting COMPATIBLE_MACHINE are likely to have SRC_URI entries which can heavily depend on the configured machine. Skipping them for SOURCE_MIRROR_FETCH is therefore not advised and leads to build errors whilst not particularly improving source mirrors. [YOCTO #8802] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/base.bbclass22
1 files changed, 11 insertions, 11 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 5fc92718a4..dad198f1d9 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -462,6 +462,17 @@ python () {
d.appendVarFlag('do_package_setscene', 'depends', ' virtual/fakeroot-native:do_populate_sysroot')
d.setVarFlag('do_devshell', 'fakeroot', '1')
d.appendVarFlag('do_devshell', 'depends', ' virtual/fakeroot-native:do_populate_sysroot')
+
+ need_machine = d.getVar('COMPATIBLE_MACHINE', True)
+ if need_machine:
+ import re
+ compat_machines = (d.getVar('MACHINEOVERRIDES', True) or "").split(":")
+ for m in compat_machines:
+ if re.match(need_machine, m):
+ break
+ else:
+ raise bb.parse.SkipPackage("incompatible with machine %s (not in COMPATIBLE_MACHINE)" % d.getVar('MACHINE', True))
+
source_mirror_fetch = d.getVar('SOURCE_MIRROR_FETCH', 0)
if not source_mirror_fetch:
need_host = d.getVar('COMPATIBLE_HOST', True)
@@ -471,17 +482,6 @@ python () {
if not re.match(need_host, this_host):
raise bb.parse.SkipPackage("incompatible with host %s (not in COMPATIBLE_HOST)" % this_host)
- need_machine = d.getVar('COMPATIBLE_MACHINE', True)
- if need_machine:
- import re
- compat_machines = (d.getVar('MACHINEOVERRIDES', True) or "").split(":")
- for m in compat_machines:
- if re.match(need_machine, m):
- break
- else:
- raise bb.parse.SkipPackage("incompatible with machine %s (not in COMPATIBLE_MACHINE)" % d.getVar('MACHINE', True))
-
-
bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE', True) or "").split()
check_license = False if pn.startswith("nativesdk-") else True