diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-25 11:31:14 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-26 13:09:09 +0000 |
commit | 8146e929e2643afad18da09b4f1b16b894503674 (patch) | |
tree | 5be1352754f44c5b72fb0794dee21d9a295a6640 /meta/classes/uboot-config.bbclass | |
parent | be821416fe0f092c90feeda7e008452af46fc6c7 (diff) | |
download | poky-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/uboot-config.bbclass')
-rw-r--r-- | meta/classes/uboot-config.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
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 () { | |||
27 | FILE = os.path.basename(d.getVar("FILE")) | 27 | FILE = os.path.basename(d.getVar("FILE")) |
28 | bb.debug(1, "To build %s, see %s for instructions on \ | 28 | bb.debug(1, "To build %s, see %s for instructions on \ |
29 | setting up your machine config" % (PN, FILE)) | 29 | setting up your machine config" % (PN, FILE)) |
30 | raise bb.parse.SkipPackage("Either UBOOT_MACHINE or UBOOT_CONFIG must be set in the %s machine configuration." % d.getVar("MACHINE")) | 30 | raise bb.parse.SkipRecipe("Either UBOOT_MACHINE or UBOOT_CONFIG must be set in the %s machine configuration." % d.getVar("MACHINE")) |
31 | 31 | ||
32 | if ubootmachine and ubootconfig: | 32 | if ubootmachine and ubootconfig: |
33 | raise bb.parse.SkipPackage("You cannot use UBOOT_MACHINE and UBOOT_CONFIG at the same time.") | 33 | raise bb.parse.SkipRecipe("You cannot use UBOOT_MACHINE and UBOOT_CONFIG at the same time.") |
34 | 34 | ||
35 | if ubootconfigflags and ubootbinaries: | 35 | if ubootconfigflags and ubootbinaries: |
36 | raise bb.parse.SkipPackage("You cannot use UBOOT_BINARIES as it is internal to uboot_config.bbclass.") | 36 | raise bb.parse.SkipRecipe("You cannot use UBOOT_BINARIES as it is internal to uboot_config.bbclass.") |
37 | 37 | ||
38 | if len(ubootconfig) > 0: | 38 | if len(ubootconfig) > 0: |
39 | for config in ubootconfig: | 39 | for config in ubootconfig: |
@@ -41,7 +41,7 @@ python () { | |||
41 | if config == f: | 41 | if config == f: |
42 | items = v.split(',') | 42 | items = v.split(',') |
43 | if items[0] and len(items) > 3: | 43 | if items[0] and len(items) > 3: |
44 | raise bb.parse.SkipPackage('Only config,images,binary can be specified!') | 44 | raise bb.parse.SkipRecipe('Only config,images,binary can be specified!') |
45 | d.appendVar('UBOOT_MACHINE', ' ' + items[0]) | 45 | d.appendVar('UBOOT_MACHINE', ' ' + items[0]) |
46 | # IMAGE_FSTYPES appending | 46 | # IMAGE_FSTYPES appending |
47 | if len(items) > 1 and items[1]: | 47 | if len(items) > 1 and items[1]: |