diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch) | |
tree | a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/recipes-core/psplash/psplash_git.bb | |
parent | d5e67725ac11e3296cad104470931ffa16824b90 (diff) | |
download | poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz |
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
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/recipes-core/psplash/psplash_git.bb')
-rw-r--r-- | meta/recipes-core/psplash/psplash_git.bb | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 0537426513..b0d6bb4070 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb | |||
@@ -16,8 +16,8 @@ SRC_URI = "git://git.yoctoproject.org/${BPN} \ | |||
16 | SPLASH_IMAGES = "file://psplash-poky-img.h;outsuffix=default" | 16 | SPLASH_IMAGES = "file://psplash-poky-img.h;outsuffix=default" |
17 | 17 | ||
18 | python __anonymous() { | 18 | python __anonymous() { |
19 | oldpkgs = d.getVar("PACKAGES", True).split() | 19 | oldpkgs = d.getVar("PACKAGES").split() |
20 | splashfiles = d.getVar('SPLASH_IMAGES', True).split() | 20 | splashfiles = d.getVar('SPLASH_IMAGES').split() |
21 | pkgs = [] | 21 | pkgs = [] |
22 | localpaths = [] | 22 | localpaths = [] |
23 | haspng = False | 23 | haspng = False |
@@ -50,8 +50,8 @@ python __anonymous() { | |||
50 | d.appendVar("DEPENDS", " gdk-pixbuf-native") | 50 | d.appendVar("DEPENDS", " gdk-pixbuf-native") |
51 | 51 | ||
52 | d.prependVar("PACKAGES", "%s " % (" ".join(pkgs))) | 52 | d.prependVar("PACKAGES", "%s " % (" ".join(pkgs))) |
53 | mlprefix = d.getVar('MLPREFIX', True) or '' | 53 | mlprefix = d.getVar('MLPREFIX') or '' |
54 | pn = d.getVar('PN', True) or '' | 54 | pn = d.getVar('PN') or '' |
55 | for p in pkgs: | 55 | for p in pkgs: |
56 | ep = '%s%s' % (mlprefix, p) | 56 | ep = '%s%s' % (mlprefix, p) |
57 | epsplash = '%s%s' % (mlprefix, 'psplash') | 57 | epsplash = '%s%s' % (mlprefix, 'psplash') |
@@ -74,11 +74,11 @@ python do_compile () { | |||
74 | import shutil | 74 | import shutil |
75 | 75 | ||
76 | # Build a separate executable for each splash image | 76 | # Build a separate executable for each splash image |
77 | workdir = d.getVar('WORKDIR', True) | 77 | workdir = d.getVar('WORKDIR') |
78 | convertscript = "%s/make-image-header.sh" % d.getVar('S', True) | 78 | convertscript = "%s/make-image-header.sh" % d.getVar('S') |
79 | destfile = "%s/psplash-poky-img.h" % d.getVar('S', True) | 79 | destfile = "%s/psplash-poky-img.h" % d.getVar('S') |
80 | localfiles = d.getVar('SPLASH_LOCALPATHS', True).split() | 80 | localfiles = d.getVar('SPLASH_LOCALPATHS').split() |
81 | outputfiles = d.getVar('SPLASH_INSTALL', True).split() | 81 | outputfiles = d.getVar('SPLASH_INSTALL').split() |
82 | for localfile, outputfile in zip(localfiles, outputfiles): | 82 | for localfile, outputfile in zip(localfiles, outputfiles): |
83 | if localfile.endswith(".png"): | 83 | if localfile.endswith(".png"): |
84 | outp = oe.utils.getstatusoutput('%s %s POKY' % (convertscript, os.path.join(workdir, localfile))) | 84 | outp = oe.utils.getstatusoutput('%s %s POKY' % (convertscript, os.path.join(workdir, localfile))) |
@@ -89,7 +89,7 @@ python do_compile () { | |||
89 | shutil.copyfile(os.path.join(workdir, localfile), destfile) | 89 | shutil.copyfile(os.path.join(workdir, localfile), destfile) |
90 | # For some reason just updating the header is not enough, we have to touch the .c | 90 | # For some reason just updating the header is not enough, we have to touch the .c |
91 | # file in order to get it to rebuild | 91 | # file in order to get it to rebuild |
92 | os.utime("%s/psplash.c" % d.getVar('S', True), None) | 92 | os.utime("%s/psplash.c" % d.getVar('S'), None) |
93 | bb.build.exec_func("oe_runmake", d) | 93 | bb.build.exec_func("oe_runmake", d) |
94 | shutil.copyfile("psplash", outputfile) | 94 | shutil.copyfile("psplash", outputfile) |
95 | } | 95 | } |