From af9612f5d6b848fceea22d10ee964437299be776 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 25 Jan 2018 11:31:14 +0000 Subject: 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. Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 10 +++++----- meta/classes/blacklist.bbclass | 2 +- meta/classes/distro_features_check.bbclass | 6 +++--- meta/classes/goarch.bbclass | 2 +- meta/classes/multilib.bbclass | 8 ++++---- meta/classes/uboot-config.bbclass | 8 ++++---- meta/classes/useradd-staticids.bbclass | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) (limited to 'meta/classes') 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() { if p.startswith("virtual/") and p not in multiwhitelist: profprov = d.getVar("PREFERRED_PROVIDER_" + p) if profprov and pn != profprov: - raise bb.parse.SkipPackage("PREFERRED_PROVIDER_%s set to %s, not %s" % (p, profprov, pn)) + raise bb.parse.SkipRecipe("PREFERRED_PROVIDER_%s set to %s, not %s" % (p, profprov, pn)) } CONFIGURESTAMPFILE = "${WORKDIR}/configure.sstate" @@ -465,7 +465,7 @@ python () { if unmatched_license_flag: bb.debug(1, "Skipping %s because it has a restricted license not" " whitelisted in LICENSE_FLAGS_WHITELIST" % pn) - raise bb.parse.SkipPackage("because it has a restricted license not" + raise bb.parse.SkipRecipe("because it has a restricted license not" " whitelisted in LICENSE_FLAGS_WHITELIST") # If we're building a target package we need to use fakeroot (pseudo) @@ -493,7 +493,7 @@ python () { if re.match(need_machine, m): break else: - raise bb.parse.SkipPackage("incompatible with machine %s (not in COMPATIBLE_MACHINE)" % d.getVar('MACHINE')) + raise bb.parse.SkipRecipe("incompatible with machine %s (not in COMPATIBLE_MACHINE)" % d.getVar('MACHINE')) source_mirror_fetch = d.getVar('SOURCE_MIRROR_FETCH', False) if not source_mirror_fetch: @@ -502,7 +502,7 @@ python () { import re this_host = d.getVar('HOST_SYS') if not re.match(need_host, this_host): - raise bb.parse.SkipPackage("incompatible with host %s (not in COMPATIBLE_HOST)" % this_host) + raise bb.parse.SkipRecipe("incompatible with host %s (not in COMPATIBLE_HOST)" % this_host) bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE') or "").split() @@ -555,7 +555,7 @@ python () { bb.debug(1, "INCLUDING the package " + pkg) elif all_skipped or incompatible_license(d, bad_licenses): bb.debug(1, "SKIPPING recipe %s because it's %s" % (pn, license)) - raise bb.parse.SkipPackage("it has an incompatible license: %s" % license) + raise bb.parse.SkipRecipe("it has an incompatible license: %s" % license) elif pn in whitelist: if pn in incompatwl: bb.note("INCLUDING " + pn + " as buildable despite INCOMPATIBLE_LICENSE because it has been whitelisted") diff --git a/meta/classes/blacklist.bbclass b/meta/classes/blacklist.bbclass index e58564c34e..dc794228ff 100644 --- a/meta/classes/blacklist.bbclass +++ b/meta/classes/blacklist.bbclass @@ -16,5 +16,5 @@ python () { blacklist = d.getVarFlag('PNBLACKLIST', d.getVar('PN')) if blacklist: - raise bb.parse.SkipPackage("Recipe is blacklisted: %s" % (blacklist)) + raise bb.parse.SkipRecipe("Recipe is blacklisted: %s" % (blacklist)) } diff --git a/meta/classes/distro_features_check.bbclass b/meta/classes/distro_features_check.bbclass index e74d3c04ba..9b78b03ef6 100644 --- a/meta/classes/distro_features_check.bbclass +++ b/meta/classes/distro_features_check.bbclass @@ -17,7 +17,7 @@ python () { if any_of_distro_features: any_of_distro_features = any_of_distro_features.split() if set.isdisjoint(set(any_of_distro_features),set(distro_features)): - raise bb.parse.SkipPackage("one of '%s' needs to be in DISTRO_FEATURES" % any_of_distro_features) + raise bb.parse.SkipRecipe("one of '%s' needs to be in DISTRO_FEATURES" % any_of_distro_features) required_distro_features = d.getVar('REQUIRED_DISTRO_FEATURES') if required_distro_features: @@ -26,12 +26,12 @@ python () { if f in distro_features: continue else: - raise bb.parse.SkipPackage("missing required distro feature '%s' (not in DISTRO_FEATURES)" % f) + raise bb.parse.SkipRecipe("missing required distro feature '%s' (not in DISTRO_FEATURES)" % f) conflict_distro_features = d.getVar('CONFLICT_DISTRO_FEATURES') if conflict_distro_features: conflict_distro_features = conflict_distro_features.split() for f in conflict_distro_features: if f in distro_features: - raise bb.parse.SkipPackage("conflicting distro feature '%s' (in DISTRO_FEATURES)" % f) + raise bb.parse.SkipRecipe("conflicting distro feature '%s' (in DISTRO_FEATURES)" % f) } diff --git a/meta/classes/goarch.bbclass b/meta/classes/goarch.bbclass index 663c9ffc3d..922c0cc8f3 100644 --- a/meta/classes/goarch.bbclass +++ b/meta/classes/goarch.bbclass @@ -56,7 +56,7 @@ def go_map_arch(a, d): elif re.match('p(pc|owerpc)(64el)', a): return 'ppc64le' else: - raise bb.parse.SkipPackage("Unsupported CPU architecture: %s" % a) + raise bb.parse.SkipRecipe("Unsupported CPU architecture: %s" % a) def go_map_arm(a, f, d): import re diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 6dca2e84cd..fbb69807d4 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -12,7 +12,7 @@ python multilib_virtclass_handler () { # We also skip multilib setup for module packages. provides = (e.data.getVar("PROVIDES") or "").split() if "virtual/kernel" in provides or bb.data.inherits_class('module-base', e.data): - raise bb.parse.SkipPackage("We shouldn't have multilib variants for the kernel") + raise bb.parse.SkipRecipe("We shouldn't have multilib variants for the kernel") save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME") or "" for name in save_var_name.split(): @@ -41,13 +41,13 @@ python multilib_virtclass_handler () { return if bb.data.inherits_class('native', e.data): - raise bb.parse.SkipPackage("We can't extend native recipes") + raise bb.parse.SkipRecipe("We can't extend native recipes") if bb.data.inherits_class('nativesdk', e.data) or bb.data.inherits_class('crosssdk', e.data): - raise bb.parse.SkipPackage("We can't extend nativesdk recipes") + raise bb.parse.SkipRecipe("We can't extend nativesdk recipes") if bb.data.inherits_class('allarch', e.data) and not bb.data.inherits_class('packagegroup', e.data): - raise bb.parse.SkipPackage("Don't extend allarch recipes which are not packagegroups") + raise bb.parse.SkipRecipe("Don't extend allarch recipes which are not packagegroups") # Expand this since this won't work correctly once we set a multilib into place diff --git a/meta/classes/uboot-config.bbclass b/meta/classes/uboot-config.bbclass index 533e175a3c..89ff970fcc 100644 --- a/meta/classes/uboot-config.bbclass +++ b/meta/classes/uboot-config.bbclass @@ -27,13 +27,13 @@ python () { FILE = os.path.basename(d.getVar("FILE")) bb.debug(1, "To build %s, see %s for instructions on \ setting up your machine config" % (PN, FILE)) - raise bb.parse.SkipPackage("Either UBOOT_MACHINE or UBOOT_CONFIG must be set in the %s machine configuration." % d.getVar("MACHINE")) + raise bb.parse.SkipRecipe("Either UBOOT_MACHINE or UBOOT_CONFIG must be set in the %s machine configuration." % d.getVar("MACHINE")) if ubootmachine and ubootconfig: - raise bb.parse.SkipPackage("You cannot use UBOOT_MACHINE and UBOOT_CONFIG at the same time.") + raise bb.parse.SkipRecipe("You cannot use UBOOT_MACHINE and UBOOT_CONFIG at the same time.") if ubootconfigflags and ubootbinaries: - raise bb.parse.SkipPackage("You cannot use UBOOT_BINARIES as it is internal to uboot_config.bbclass.") + raise bb.parse.SkipRecipe("You cannot use UBOOT_BINARIES as it is internal to uboot_config.bbclass.") if len(ubootconfig) > 0: for config in ubootconfig: @@ -41,7 +41,7 @@ python () { if config == f: items = v.split(',') if items[0] and len(items) > 3: - raise bb.parse.SkipPackage('Only config,images,binary can be specified!') + raise bb.parse.SkipRecipe('Only config,images,binary can be specified!') d.appendVar('UBOOT_MACHINE', ' ' + items[0]) # IMAGE_FSTYPES appending if len(items) > 1 and items[1]: diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass index 589a99ff45..64bf6dc823 100644 --- a/meta/classes/useradd-staticids.bbclass +++ b/meta/classes/useradd-staticids.bbclass @@ -307,5 +307,5 @@ python __anonymous() { update_useradd_static_config(d) except NotImplementedError as f: bb.debug(1, "Skipping recipe %s: %s" % (d.getVar('PN'), f)) - raise bb.parse.SkipPackage(f) + raise bb.parse.SkipRecipe(f) } -- cgit 1.2.3-korg