mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 13:09:50 +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
@@ -42,8 +42,8 @@ done
|
||||
|
||||
python populate_packages_append () {
|
||||
import re
|
||||
packages = d.getVar('PACKAGES', True).split()
|
||||
pkgdest = d.getVar('PKGDEST', True)
|
||||
packages = d.getVar('PACKAGES').split()
|
||||
pkgdest = d.getVar('PKGDEST')
|
||||
|
||||
for pkg in packages:
|
||||
schema_dir = '%s/%s/etc/gconf/schemas' % (pkgdest, pkg)
|
||||
@@ -56,15 +56,15 @@ python populate_packages_append () {
|
||||
if schemas != []:
|
||||
bb.note("adding gconf postinst and prerm scripts to %s" % pkg)
|
||||
d.setVar('SCHEMA_FILES', " ".join(schemas))
|
||||
postinst = d.getVar('pkg_postinst_%s' % pkg, True)
|
||||
postinst = d.getVar('pkg_postinst_%s' % pkg)
|
||||
if not postinst:
|
||||
postinst = '#!/bin/sh\n'
|
||||
postinst += d.getVar('gconf_postinst', True)
|
||||
postinst += d.getVar('gconf_postinst')
|
||||
d.setVar('pkg_postinst_%s' % pkg, postinst)
|
||||
prerm = d.getVar('pkg_prerm_%s' % pkg, True)
|
||||
prerm = d.getVar('pkg_prerm_%s' % pkg)
|
||||
if not prerm:
|
||||
prerm = '#!/bin/sh\n'
|
||||
prerm += d.getVar('gconf_prerm', True)
|
||||
prerm += d.getVar('gconf_prerm')
|
||||
d.setVar('pkg_prerm_%s' % pkg, prerm)
|
||||
d.appendVar("RDEPENDS_%s" % pkg, ' ' + d.getVar('MLPREFIX', False) + 'gconf')
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user