diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:06 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | 3c59b1bf93adb0b9f723bda1d8702c8720733677 (patch) | |
tree | d1939643e2d02f0ce2e9ef33e235cd23cd5000d3 /meta/classes/image.bbclass | |
parent | c0f2890c01882e9ea14e781c044f3a84f75bd0fc (diff) | |
download | poky-3c59b1bf93adb0b9f723bda1d8702c8720733677.tar.gz |
meta: remove True option to getVarFlag calls
getVarFlag() now defaults to expanding by default, thus remove the
True option from getVarFlag() calls with a regex search and
replace.
Search made with the following regex:
getVarFlag ?\(( ?[^,()]*, ?[^,()]*), True\)
(From OE-Core rev: 2dea9e490a98377010b3d4118d054814c317a735)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r-- | meta/classes/image.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 28bff9e75a..04fd5f9961 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -51,7 +51,7 @@ FEATURE_PACKAGES_splash = "${SPLASH}" | |||
51 | IMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("IMAGE_FEATURES", d)}' | 51 | IMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("IMAGE_FEATURES", d)}' |
52 | 52 | ||
53 | def check_image_features(d): | 53 | def check_image_features(d): |
54 | valid_features = (d.getVarFlag('IMAGE_FEATURES', 'validitems', True) or "").split() | 54 | valid_features = (d.getVarFlag('IMAGE_FEATURES', 'validitems') or "").split() |
55 | valid_features += d.getVarFlags('COMPLEMENTARY_GLOB').keys() | 55 | valid_features += d.getVarFlags('COMPLEMENTARY_GLOB').keys() |
56 | for var in d: | 56 | for var in d: |
57 | if var.startswith("PACKAGE_GROUP_"): | 57 | if var.startswith("PACKAGE_GROUP_"): |
@@ -595,7 +595,7 @@ python create_symlinks() { | |||
595 | manifest_name = d.getVar('IMAGE_MANIFEST') | 595 | manifest_name = d.getVar('IMAGE_MANIFEST') |
596 | taskname = d.getVar("BB_CURRENTTASK") | 596 | taskname = d.getVar("BB_CURRENTTASK") |
597 | subimages = (d.getVarFlag("do_" + taskname, 'subimages', False) or "").split() | 597 | subimages = (d.getVarFlag("do_" + taskname, 'subimages', False) or "").split() |
598 | imgsuffix = d.getVarFlag("do_" + taskname, 'imgsuffix', True) or d.expand("${IMAGE_NAME_SUFFIX}.") | 598 | imgsuffix = d.getVarFlag("do_" + taskname, 'imgsuffix') or d.expand("${IMAGE_NAME_SUFFIX}.") |
599 | 599 | ||
600 | if not link_name: | 600 | if not link_name: |
601 | return | 601 | return |