summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/base.bbclass10
-rw-r--r--meta/classes/blacklist.bbclass2
-rw-r--r--meta/classes/distro_features_check.bbclass6
-rw-r--r--meta/classes/goarch.bbclass2
-rw-r--r--meta/classes/multilib.bbclass8
-rw-r--r--meta/classes/uboot-config.bbclass8
-rw-r--r--meta/classes/useradd-staticids.bbclass2
-rw-r--r--meta/recipes-bsp/grub/grub-efi_2.02.bb2
-rw-r--r--meta/recipes-devtools/gcc/libgfortran.inc2
-rw-r--r--meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb2
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.5.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto.inc2
-rw-r--r--meta/recipes-rt/images/core-image-rt-sdk.bb2
-rw-r--r--meta/recipes-rt/images/core-image-rt.bb2
18 files changed, 30 insertions, 30 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")
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 () {
16 blacklist = d.getVarFlag('PNBLACKLIST', d.getVar('PN')) 16 blacklist = d.getVarFlag('PNBLACKLIST', d.getVar('PN'))
17 17
18 if blacklist: 18 if blacklist:
19 raise bb.parse.SkipPackage("Recipe is blacklisted: %s" % (blacklist)) 19 raise bb.parse.SkipRecipe("Recipe is blacklisted: %s" % (blacklist))
20} 20}
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 () {
17 if any_of_distro_features: 17 if any_of_distro_features:
18 any_of_distro_features = any_of_distro_features.split() 18 any_of_distro_features = any_of_distro_features.split()
19 if set.isdisjoint(set(any_of_distro_features),set(distro_features)): 19 if set.isdisjoint(set(any_of_distro_features),set(distro_features)):
20 raise bb.parse.SkipPackage("one of '%s' needs to be in DISTRO_FEATURES" % any_of_distro_features) 20 raise bb.parse.SkipRecipe("one of '%s' needs to be in DISTRO_FEATURES" % any_of_distro_features)
21 21
22 required_distro_features = d.getVar('REQUIRED_DISTRO_FEATURES') 22 required_distro_features = d.getVar('REQUIRED_DISTRO_FEATURES')
23 if required_distro_features: 23 if required_distro_features:
@@ -26,12 +26,12 @@ python () {
26 if f in distro_features: 26 if f in distro_features:
27 continue 27 continue
28 else: 28 else:
29 raise bb.parse.SkipPackage("missing required distro feature '%s' (not in DISTRO_FEATURES)" % f) 29 raise bb.parse.SkipRecipe("missing required distro feature '%s' (not in DISTRO_FEATURES)" % f)
30 30
31 conflict_distro_features = d.getVar('CONFLICT_DISTRO_FEATURES') 31 conflict_distro_features = d.getVar('CONFLICT_DISTRO_FEATURES')
32 if conflict_distro_features: 32 if conflict_distro_features:
33 conflict_distro_features = conflict_distro_features.split() 33 conflict_distro_features = conflict_distro_features.split()
34 for f in conflict_distro_features: 34 for f in conflict_distro_features:
35 if f in distro_features: 35 if f in distro_features:
36 raise bb.parse.SkipPackage("conflicting distro feature '%s' (in DISTRO_FEATURES)" % f) 36 raise bb.parse.SkipRecipe("conflicting distro feature '%s' (in DISTRO_FEATURES)" % f)
37} 37}
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):
56 elif re.match('p(pc|owerpc)(64el)', a): 56 elif re.match('p(pc|owerpc)(64el)', a):
57 return 'ppc64le' 57 return 'ppc64le'
58 else: 58 else:
59 raise bb.parse.SkipPackage("Unsupported CPU architecture: %s" % a) 59 raise bb.parse.SkipRecipe("Unsupported CPU architecture: %s" % a)
60 60
61def go_map_arm(a, f, d): 61def go_map_arm(a, f, d):
62 import re 62 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 () {
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
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]:
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() {
307 update_useradd_static_config(d) 307 update_useradd_static_config(d)
308 except NotImplementedError as f: 308 except NotImplementedError as f:
309 bb.debug(1, "Skipping recipe %s: %s" % (d.getVar('PN'), f)) 309 bb.debug(1, "Skipping recipe %s: %s" % (d.getVar('PN'), f))
310 raise bb.parse.SkipPackage(f) 310 raise bb.parse.SkipRecipe(f)
311} 311}
diff --git a/meta/recipes-bsp/grub/grub-efi_2.02.bb b/meta/recipes-bsp/grub/grub-efi_2.02.bb
index 112a99dcfb..a72b189bc3 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.02.bb
+++ b/meta/recipes-bsp/grub/grub-efi_2.02.bb
@@ -22,7 +22,7 @@ python __anonymous () {
22 grubtarget = 'i386' 22 grubtarget = 'i386'
23 grubimage = "grub-efi-bootia32.efi" 23 grubimage = "grub-efi-bootia32.efi"
24 else: 24 else:
25 raise bb.parse.SkipPackage("grub-efi is incompatible with target %s" % target) 25 raise bb.parse.SkipRecipe("grub-efi is incompatible with target %s" % target)
26 d.setVar("GRUB_TARGET", grubtarget) 26 d.setVar("GRUB_TARGET", grubtarget)
27 d.setVar("GRUB_IMAGE", grubimage) 27 d.setVar("GRUB_IMAGE", grubimage)
28} 28}
diff --git a/meta/recipes-devtools/gcc/libgfortran.inc b/meta/recipes-devtools/gcc/libgfortran.inc
index 99c192ac30..05237647df 100644
--- a/meta/recipes-devtools/gcc/libgfortran.inc
+++ b/meta/recipes-devtools/gcc/libgfortran.inc
@@ -73,5 +73,5 @@ do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
73python __anonymous () { 73python __anonymous () {
74 f = d.getVar("FORTRAN") 74 f = d.getVar("FORTRAN")
75 if "fortran" not in f: 75 if "fortran" not in f:
76 raise bb.parse.SkipPackage("libgfortran needs fortran support to be enabled in the compiler") 76 raise bb.parse.SkipRecipe("libgfortran needs fortran support to be enabled in the compiler")
77} 77}
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index e1f34d5af1..8ba02e6283 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -19,7 +19,7 @@ REQUIRED_DISTRO_FEATURES += "opengl"
19# 19#
20python __anonymous () { 20python __anonymous () {
21 if d.getVar('TCLIBC') != "glibc": 21 if d.getVar('TCLIBC') != "glibc":
22 raise bb.parse.SkipPackage("incompatible with %s C library" % 22 raise bb.parse.SkipRecipe("incompatible with %s C library" %
23 d.getVar('TCLIBC')) 23 d.getVar('TCLIBC'))
24} 24}
25 25
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.5.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.5.bb
index e652394517..bef3636092 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.5.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.5.bb
@@ -36,6 +36,6 @@ do_compile_prepend_armv7a () {
36 36
37python () { 37python () {
38 if not bb.utils.contains ('DISTRO_FEATURES', 'opengl', True, False, d): 38 if not bb.utils.contains ('DISTRO_FEATURES', 'opengl', True, False, d):
39 raise bb.parse.SkipPackage("'opengl' not in DISTRO_FEATURES") 39 raise bb.parse.SkipRecipe("'opengl' not in DISTRO_FEATURES")
40} 40}
41 41
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb
index 8938ab85b3..8b98885497 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc
8# core-image-rt-sdk, core-image-rt. 8# core-image-rt-sdk, core-image-rt.
9python () { 9python () {
10 if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": 10 if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt":
11 raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
12} 12}
13 13
14SRCREV_machine ?= "c1d8c4408b8aedd88eeb6ccc89ce834dd41b3f09" 14SRCREV_machine ?= "c1d8c4408b8aedd88eeb6ccc89ce834dd41b3f09"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb
index a89c08d29d..7c2cfd23e6 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc
8# core-image-rt-sdk, core-image-rt. 8# core-image-rt-sdk, core-image-rt.
9python () { 9python () {
10 if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": 10 if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt":
11 raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
12} 12}
13 13
14SRCREV_machine ?= "8dd0b4d434394e5293702c729164b424f2da6b57" 14SRCREV_machine ?= "8dd0b4d434394e5293702c729164b424f2da6b57"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
index 949d477fd8..f28eedbee3 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc
8# core-image-rt-sdk, core-image-rt. 8# core-image-rt-sdk, core-image-rt.
9python () { 9python () {
10 if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": 10 if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt":
11 raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
12} 12}
13 13
14SRCREV_machine ?= "2c13d27d73b9fddd38fd407326e82240a494d803" 14SRCREV_machine ?= "2c13d27d73b9fddd38fd407326e82240a494d803"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
index 99931b333d..59affccbe9 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc
8# core-image-rt-sdk, core-image-rt. 8# core-image-rt-sdk, core-image-rt.
9python () { 9python () {
10 if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": 10 if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt":
11 raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
12} 12}
13 13
14SRCREV_machine ?= "fef0184c3c1bcac27fe579bf2643c50bf861e40d" 14SRCREV_machine ?= "fef0184c3c1bcac27fe579bf2643c50bf861e40d"
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc
index 87c06745cc..3bb872a32a 100644
--- a/meta/recipes-kernel/linux/linux-yocto.inc
+++ b/meta/recipes-kernel/linux/linux-yocto.inc
@@ -14,7 +14,7 @@ INC_PR = "r4"
14python () { 14python () {
15 if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != d.getVar("PN"): 15 if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != d.getVar("PN"):
16 d.delVar("BB_DONT_CACHE") 16 d.delVar("BB_DONT_CACHE")
17 raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to %s to enable it" % (d.getVar("PN"))) 17 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to %s to enable it" % (d.getVar("PN")))
18} 18}
19 19
20DEPENDS += "xz-native bc-native" 20DEPENDS += "xz-native bc-native"
diff --git a/meta/recipes-rt/images/core-image-rt-sdk.bb b/meta/recipes-rt/images/core-image-rt-sdk.bb
index 7c1e5bf261..0f7f091687 100644
--- a/meta/recipes-rt/images/core-image-rt-sdk.bb
+++ b/meta/recipes-rt/images/core-image-rt-sdk.bb
@@ -5,7 +5,7 @@ require recipes-core/images/core-image-minimal.bb
5# to build multiple virtual/kernel providers. 5# to build multiple virtual/kernel providers.
6python () { 6python () {
7 if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": 7 if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt":
8 raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 8 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
9} 9}
10 10
11DESCRIPTION = "Small image capable of booting a device with a test suite and \ 11DESCRIPTION = "Small image capable of booting a device with a test suite and \
diff --git a/meta/recipes-rt/images/core-image-rt.bb b/meta/recipes-rt/images/core-image-rt.bb
index d8bb04aa1e..9cb93b3de5 100644
--- a/meta/recipes-rt/images/core-image-rt.bb
+++ b/meta/recipes-rt/images/core-image-rt.bb
@@ -5,7 +5,7 @@ require recipes-core/images/core-image-minimal.bb
5# to build multiple virtual/kernel providers. 5# to build multiple virtual/kernel providers.
6python () { 6python () {
7 if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": 7 if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt":
8 raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 8 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
9} 9}
10 10
11DESCRIPTION = "A small image just capable of allowing a device to boot plus a \ 11DESCRIPTION = "A small image just capable of allowing a device to boot plus a \