mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 00:59:48 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
d5e67725ac
commit
c4e2c59088
@@ -16,8 +16,8 @@ SRC_URI = "git://git.yoctoproject.org/${BPN} \
|
||||
SPLASH_IMAGES = "file://psplash-poky-img.h;outsuffix=default"
|
||||
|
||||
python __anonymous() {
|
||||
oldpkgs = d.getVar("PACKAGES", True).split()
|
||||
splashfiles = d.getVar('SPLASH_IMAGES', True).split()
|
||||
oldpkgs = d.getVar("PACKAGES").split()
|
||||
splashfiles = d.getVar('SPLASH_IMAGES').split()
|
||||
pkgs = []
|
||||
localpaths = []
|
||||
haspng = False
|
||||
@@ -50,8 +50,8 @@ python __anonymous() {
|
||||
d.appendVar("DEPENDS", " gdk-pixbuf-native")
|
||||
|
||||
d.prependVar("PACKAGES", "%s " % (" ".join(pkgs)))
|
||||
mlprefix = d.getVar('MLPREFIX', True) or ''
|
||||
pn = d.getVar('PN', True) or ''
|
||||
mlprefix = d.getVar('MLPREFIX') or ''
|
||||
pn = d.getVar('PN') or ''
|
||||
for p in pkgs:
|
||||
ep = '%s%s' % (mlprefix, p)
|
||||
epsplash = '%s%s' % (mlprefix, 'psplash')
|
||||
@@ -74,11 +74,11 @@ python do_compile () {
|
||||
import shutil
|
||||
|
||||
# Build a separate executable for each splash image
|
||||
workdir = d.getVar('WORKDIR', True)
|
||||
convertscript = "%s/make-image-header.sh" % d.getVar('S', True)
|
||||
destfile = "%s/psplash-poky-img.h" % d.getVar('S', True)
|
||||
localfiles = d.getVar('SPLASH_LOCALPATHS', True).split()
|
||||
outputfiles = d.getVar('SPLASH_INSTALL', True).split()
|
||||
workdir = d.getVar('WORKDIR')
|
||||
convertscript = "%s/make-image-header.sh" % d.getVar('S')
|
||||
destfile = "%s/psplash-poky-img.h" % d.getVar('S')
|
||||
localfiles = d.getVar('SPLASH_LOCALPATHS').split()
|
||||
outputfiles = d.getVar('SPLASH_INSTALL').split()
|
||||
for localfile, outputfile in zip(localfiles, outputfiles):
|
||||
if localfile.endswith(".png"):
|
||||
outp = oe.utils.getstatusoutput('%s %s POKY' % (convertscript, os.path.join(workdir, localfile)))
|
||||
@@ -89,7 +89,7 @@ python do_compile () {
|
||||
shutil.copyfile(os.path.join(workdir, localfile), destfile)
|
||||
# For some reason just updating the header is not enough, we have to touch the .c
|
||||
# file in order to get it to rebuild
|
||||
os.utime("%s/psplash.c" % d.getVar('S', True), None)
|
||||
os.utime("%s/psplash.c" % d.getVar('S'), None)
|
||||
bb.build.exec_func("oe_runmake", d)
|
||||
shutil.copyfile("psplash", outputfile)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user