summaryrefslogtreecommitdiffstats
path: root/meta/classes/base.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-25 11:31:14 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-26 13:09:09 +0000
commit8146e929e2643afad18da09b4f1b16b894503674 (patch)
tree5be1352754f44c5b72fb0794dee21d9a295a6640 /meta/classes/base.bbclass
parentbe821416fe0f092c90feeda7e008452af46fc6c7 (diff)
downloadpoky-8146e929e2643afad18da09b4f1b16b894503674.tar.gz
classes/recipes: Convert SkipPackage -> SkipRecipe
The new name is much more consistent with what this actually means. We put the pieces in place to rename everything a while back but looks like we forgot to actually do it! Fix that now. (From OE-Core rev: af9612f5d6b848fceea22d10ee964437299be776) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/base.bbclass')
-rw-r--r--meta/classes/base.bbclass10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 912e81e002..21cacfb9a5 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -293,7 +293,7 @@ python base_eventhandler() {
293 if p.startswith("virtual/") and p not in multiwhitelist: 293 if p.startswith("virtual/") and p not in multiwhitelist:
294 profprov = d.getVar("PREFERRED_PROVIDER_" + p) 294 profprov = d.getVar("PREFERRED_PROVIDER_" + p)
295 if profprov and pn != profprov: 295 if profprov and pn != profprov:
296 raise bb.parse.SkipPackage("PREFERRED_PROVIDER_%s set to %s, not %s" % (p, profprov, pn)) 296 raise bb.parse.SkipRecipe("PREFERRED_PROVIDER_%s set to %s, not %s" % (p, profprov, pn))
297} 297}
298 298
299CONFIGURESTAMPFILE = "${WORKDIR}/configure.sstate" 299CONFIGURESTAMPFILE = "${WORKDIR}/configure.sstate"
@@ -465,7 +465,7 @@ python () {
465 if unmatched_license_flag: 465 if unmatched_license_flag:
466 bb.debug(1, "Skipping %s because it has a restricted license not" 466 bb.debug(1, "Skipping %s because it has a restricted license not"
467 " whitelisted in LICENSE_FLAGS_WHITELIST" % pn) 467 " whitelisted in LICENSE_FLAGS_WHITELIST" % pn)
468 raise bb.parse.SkipPackage("because it has a restricted license not" 468 raise bb.parse.SkipRecipe("because it has a restricted license not"
469 " whitelisted in LICENSE_FLAGS_WHITELIST") 469 " whitelisted in LICENSE_FLAGS_WHITELIST")
470 470
471 # If we're building a target package we need to use fakeroot (pseudo) 471 # If we're building a target package we need to use fakeroot (pseudo)
@@ -493,7 +493,7 @@ python () {
493 if re.match(need_machine, m): 493 if re.match(need_machine, m):
494 break 494 break
495 else: 495 else:
496 raise bb.parse.SkipPackage("incompatible with machine %s (not in COMPATIBLE_MACHINE)" % d.getVar('MACHINE')) 496 raise bb.parse.SkipRecipe("incompatible with machine %s (not in COMPATIBLE_MACHINE)" % d.getVar('MACHINE'))
497 497
498 source_mirror_fetch = d.getVar('SOURCE_MIRROR_FETCH', False) 498 source_mirror_fetch = d.getVar('SOURCE_MIRROR_FETCH', False)
499 if not source_mirror_fetch: 499 if not source_mirror_fetch:
@@ -502,7 +502,7 @@ python () {
502 import re 502 import re
503 this_host = d.getVar('HOST_SYS') 503 this_host = d.getVar('HOST_SYS')
504 if not re.match(need_host, this_host): 504 if not re.match(need_host, this_host):
505 raise bb.parse.SkipPackage("incompatible with host %s (not in COMPATIBLE_HOST)" % this_host) 505 raise bb.parse.SkipRecipe("incompatible with host %s (not in COMPATIBLE_HOST)" % this_host)
506 506
507 bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE') or "").split() 507 bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE') or "").split()
508 508
@@ -555,7 +555,7 @@ python () {
555 bb.debug(1, "INCLUDING the package " + pkg) 555 bb.debug(1, "INCLUDING the package " + pkg)
556 elif all_skipped or incompatible_license(d, bad_licenses): 556 elif all_skipped or incompatible_license(d, bad_licenses):
557 bb.debug(1, "SKIPPING recipe %s because it's %s" % (pn, license)) 557 bb.debug(1, "SKIPPING recipe %s because it's %s" % (pn, license))
558 raise bb.parse.SkipPackage("it has an incompatible license: %s" % license) 558 raise bb.parse.SkipRecipe("it has an incompatible license: %s" % license)
559 elif pn in whitelist: 559 elif pn in whitelist:
560 if pn in incompatwl: 560 if pn in incompatwl:
561 bb.note("INCLUDING " + pn + " as buildable despite INCOMPATIBLE_LICENSE because it has been whitelisted") 561 bb.note("INCLUDING " + pn + " as buildable despite INCOMPATIBLE_LICENSE because it has been whitelisted")