diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2018-01-15 19:30:38 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-19 12:37:13 +0000 |
commit | f2d7b5b2eea864daceaf68c0f6a1527f267064a2 (patch) | |
tree | 41b5d160fc4d298952eda69f2b943473f510c9c0 /meta/recipes-kernel | |
parent | 1b96585b92c6c772565e6695dcb4f4e4155c3a9a (diff) | |
download | poky-f2d7b5b2eea864daceaf68c0f6a1527f267064a2.tar.gz |
kernel: drop unnecessary True options from calls to getVar
The older style calls (plus a bashism in kernel.bbclass, fixed
separately) were introduced via the recent change to add support for
multiple kernel packages:
http://git.openembedded.org/openembedded-core/commit/?id=6c8c899849d101fd1b86aad0b8eed05c7c785924
(From OE-Core rev: e660ef68de3b3891a26ed6e10d96dc4efaf03ffc)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto.inc | 2 |
5 files changed, 5 insertions, 5 deletions
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 40d6e4ac23..8938ab85b3 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb | |||
@@ -7,7 +7,7 @@ require recipes-kernel/linux/linux-yocto.inc | |||
7 | # to build multiple virtual/kernel providers, e.g. as dependency of | 7 | # to build multiple virtual/kernel providers, e.g. as dependency of |
8 | # core-image-rt-sdk, core-image-rt. | 8 | # core-image-rt-sdk, core-image-rt. |
9 | python () { | 9 | python () { |
10 | if d.getVar("KERNEL_PACKAGE_NAME", True) == "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.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
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 ed65f77a91..a89c08d29d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb | |||
@@ -7,7 +7,7 @@ require recipes-kernel/linux/linux-yocto.inc | |||
7 | # to build multiple virtual/kernel providers, e.g. as dependency of | 7 | # to build multiple virtual/kernel providers, e.g. as dependency of |
8 | # core-image-rt-sdk, core-image-rt. | 8 | # core-image-rt-sdk, core-image-rt. |
9 | python () { | 9 | python () { |
10 | if d.getVar("KERNEL_PACKAGE_NAME", True) == "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.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
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 e1547e9960..949d477fd8 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb | |||
@@ -7,7 +7,7 @@ require recipes-kernel/linux/linux-yocto.inc | |||
7 | # to build multiple virtual/kernel providers, e.g. as dependency of | 7 | # to build multiple virtual/kernel providers, e.g. as dependency of |
8 | # core-image-rt-sdk, core-image-rt. | 8 | # core-image-rt-sdk, core-image-rt. |
9 | python () { | 9 | python () { |
10 | if d.getVar("KERNEL_PACKAGE_NAME", True) == "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.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
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 fa25629861..99931b333d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb | |||
@@ -7,7 +7,7 @@ require recipes-kernel/linux/linux-yocto.inc | |||
7 | # to build multiple virtual/kernel providers, e.g. as dependency of | 7 | # to build multiple virtual/kernel providers, e.g. as dependency of |
8 | # core-image-rt-sdk, core-image-rt. | 8 | # core-image-rt-sdk, core-image-rt. |
9 | python () { | 9 | python () { |
10 | if d.getVar("KERNEL_PACKAGE_NAME", True) == "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.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 8a70eb5018..87c06745cc 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc | |||
@@ -12,7 +12,7 @@ INC_PR = "r4" | |||
12 | # PREFERRED_PROVIDER for virtual/kernel. This avoids network access required | 12 | # PREFERRED_PROVIDER for virtual/kernel. This avoids network access required |
13 | # by the use of AUTOREV SRCREVs, which are the default for this recipe. | 13 | # by the use of AUTOREV SRCREVs, which are the default for this recipe. |
14 | python () { | 14 | python () { |
15 | if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel", True) != d.getVar("PN", True): | 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.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to %s to enable it" % (d.getVar("PN"))) |
18 | } | 18 | } |