diff options
| author | Joshua Lock <joshua.g.lock@intel.com> | 2016-11-25 15:28:52 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-12-02 09:16:17 +0100 |
| commit | efd3696e70a6603f1a45faa4a172433514f0a487 (patch) | |
| tree | b72751ba93b050391db05a8e1be7506836b6d515 /meta-oe/recipes-support/opencv/opencv_3.1.bb | |
| parent | 761639b9d7681c81dd69eaf3a37c32791d6e97fd (diff) | |
| download | meta-openembedded-efd3696e70a6603f1a45faa4a172433514f0a487.tar.gz | |
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\)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Diffstat (limited to 'meta-oe/recipes-support/opencv/opencv_3.1.bb')
| -rw-r--r-- | meta-oe/recipes-support/opencv/opencv_3.1.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb index 74e30e417..a0dd98131 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb | |||
| @@ -89,12 +89,12 @@ python populate_packages_prepend () { | |||
| 89 | do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') | 89 | do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') |
| 90 | do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) | 90 | do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) |
| 91 | 91 | ||
| 92 | pn = d.getVar('PN', 1) | 92 | pn = d.getVar('PN') |
| 93 | metapkg = pn + '-dev' | 93 | metapkg = pn + '-dev' |
| 94 | d.setVar('ALLOW_EMPTY_' + metapkg, "1") | 94 | d.setVar('ALLOW_EMPTY_' + metapkg, "1") |
| 95 | blacklist = [ metapkg ] | 95 | blacklist = [ metapkg ] |
| 96 | metapkg_rdepends = [ ] | 96 | metapkg_rdepends = [ ] |
| 97 | packages = d.getVar('PACKAGES', 1).split() | 97 | packages = d.getVar('PACKAGES').split() |
| 98 | for pkg in packages[1:]: | 98 | for pkg in packages[1:]: |
| 99 | if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): | 99 | if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): |
| 100 | metapkg_rdepends.append(pkg) | 100 | metapkg_rdepends.append(pkg) |