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/classes/mime.bbclass | |
| 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/classes/mime.bbclass')
| -rw-r--r-- | meta/classes/mime.bbclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/mime.bbclass b/meta/classes/mime.bbclass index 721c73fcff..6cd59af391 100644 --- a/meta/classes/mime.bbclass +++ b/meta/classes/mime.bbclass | |||
| @@ -28,8 +28,8 @@ fi | |||
| 28 | 28 | ||
| 29 | python populate_packages_append () { | 29 | python populate_packages_append () { |
| 30 | import re | 30 | import re |
| 31 | packages = d.getVar('PACKAGES', True).split() | 31 | packages = d.getVar('PACKAGES').split() |
| 32 | pkgdest = d.getVar('PKGDEST', True) | 32 | pkgdest = d.getVar('PKGDEST') |
| 33 | 33 | ||
| 34 | for pkg in packages: | 34 | for pkg in packages: |
| 35 | mime_dir = '%s/%s/usr/share/mime/packages' % (pkgdest, pkg) | 35 | mime_dir = '%s/%s/usr/share/mime/packages' % (pkgdest, pkg) |
| @@ -41,15 +41,15 @@ python populate_packages_append () { | |||
| 41 | mimes.append(f) | 41 | mimes.append(f) |
| 42 | if mimes: | 42 | if mimes: |
| 43 | bb.note("adding mime postinst and postrm scripts to %s" % pkg) | 43 | bb.note("adding mime postinst and postrm scripts to %s" % pkg) |
| 44 | postinst = d.getVar('pkg_postinst_%s' % pkg, True) | 44 | postinst = d.getVar('pkg_postinst_%s' % pkg) |
| 45 | if not postinst: | 45 | if not postinst: |
| 46 | postinst = '#!/bin/sh\n' | 46 | postinst = '#!/bin/sh\n' |
| 47 | postinst += d.getVar('mime_postinst', True) | 47 | postinst += d.getVar('mime_postinst') |
| 48 | d.setVar('pkg_postinst_%s' % pkg, postinst) | 48 | d.setVar('pkg_postinst_%s' % pkg, postinst) |
| 49 | postrm = d.getVar('pkg_postrm_%s' % pkg, True) | 49 | postrm = d.getVar('pkg_postrm_%s' % pkg) |
| 50 | if not postrm: | 50 | if not postrm: |
| 51 | postrm = '#!/bin/sh\n' | 51 | postrm = '#!/bin/sh\n' |
| 52 | postrm += d.getVar('mime_postrm', True) | 52 | postrm += d.getVar('mime_postrm') |
| 53 | d.setVar('pkg_postrm_%s' % pkg, postrm) | 53 | d.setVar('pkg_postrm_%s' % pkg, postrm) |
| 54 | bb.note("adding shared-mime-info-data dependency to %s" % pkg) | 54 | bb.note("adding shared-mime-info-data dependency to %s" % pkg) |
| 55 | d.appendVar('RDEPENDS_' + pkg, " shared-mime-info-data") | 55 | d.appendVar('RDEPENDS_' + pkg, " shared-mime-info-data") |
