summaryrefslogtreecommitdiffstats
path: root/meta/classes/multilib.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/multilib.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/multilib.bbclass')
-rw-r--r--meta/classes/multilib.bbclass8
1 files changed, 4 insertions, 4 deletions
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 () {
12 # We also skip multilib setup for module packages. 12 # We also skip multilib setup for module packages.
13 provides = (e.data.getVar("PROVIDES") or "").split() 13 provides = (e.data.getVar("PROVIDES") or "").split()
14 if "virtual/kernel" in provides or bb.data.inherits_class('module-base', e.data): 14 if "virtual/kernel" in provides or bb.data.inherits_class('module-base', e.data):
15 raise bb.parse.SkipPackage("We shouldn't have multilib variants for the kernel") 15 raise bb.parse.SkipRecipe("We shouldn't have multilib variants for the kernel")
16 16
17 save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME") or "" 17 save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME") or ""
18 for name in save_var_name.split(): 18 for name in save_var_name.split():
@@ -41,13 +41,13 @@ python multilib_virtclass_handler () {
41 return 41 return
42 42
43 if bb.data.inherits_class('native', e.data): 43 if bb.data.inherits_class('native', e.data):
44 raise bb.parse.SkipPackage("We can't extend native recipes") 44 raise bb.parse.SkipRecipe("We can't extend native recipes")
45 45
46 if bb.data.inherits_class('nativesdk', e.data) or bb.data.inherits_class('crosssdk', e.data): 46 if bb.data.inherits_class('nativesdk', e.data) or bb.data.inherits_class('crosssdk', e.data):
47 raise bb.parse.SkipPackage("We can't extend nativesdk recipes") 47 raise bb.parse.SkipRecipe("We can't extend nativesdk recipes")
48 48
49 if bb.data.inherits_class('allarch', e.data) and not bb.data.inherits_class('packagegroup', e.data): 49 if bb.data.inherits_class('allarch', e.data) and not bb.data.inherits_class('packagegroup', e.data):
50 raise bb.parse.SkipPackage("Don't extend allarch recipes which are not packagegroups") 50 raise bb.parse.SkipRecipe("Don't extend allarch recipes which are not packagegroups")
51 51
52 52
53 # Expand this since this won't work correctly once we set a multilib into place 53 # Expand this since this won't work correctly once we set a multilib into place