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-multimedia | |
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-multimedia')
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-fpu.inc | 2 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-plugins-package.inc | 10 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-fpu.inc b/meta/recipes-multimedia/alsa/alsa-fpu.inc index 50402307c5..1ca31e7498 100644 --- a/meta/recipes-multimedia/alsa/alsa-fpu.inc +++ b/meta/recipes-multimedia/alsa/alsa-fpu.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | 1 | ||
2 | def get_alsa_fpu_setting(bb, d): | 2 | def get_alsa_fpu_setting(bb, d): |
3 | if d.getVar('TARGET_FPU', True) in [ 'soft' ]: | 3 | if d.getVar('TARGET_FPU') in [ 'soft' ]: |
4 | return "--with-softfloat" | 4 | return "--with-softfloat" |
5 | return "" | 5 | return "" |
6 | 6 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc index c24493e1e8..3fdb10e404 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc | |||
@@ -3,8 +3,8 @@ PACKAGESPLITFUNCS_append = " set_metapkg_rdepends " | |||
3 | 3 | ||
4 | python split_gstreamer10_packages () { | 4 | python split_gstreamer10_packages () { |
5 | gst_libdir = d.expand('${libdir}/gstreamer-${LIBV}') | 5 | gst_libdir = d.expand('${libdir}/gstreamer-${LIBV}') |
6 | postinst = d.getVar('plugin_postinst', True) | 6 | postinst = d.getVar('plugin_postinst') |
7 | glibdir = d.getVar('libdir', True) | 7 | glibdir = d.getVar('libdir') |
8 | 8 | ||
9 | do_split_packages(d, glibdir, '^lib(.*)\.so\.*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True) | 9 | do_split_packages(d, glibdir, '^lib(.*)\.so\.*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True) |
10 | do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', d.expand('${PN}-%s'), 'GStreamer plugin for %s', postinst=postinst, extra_depends='') | 10 | do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', d.expand('${PN}-%s'), 'GStreamer plugin for %s', postinst=postinst, extra_depends='') |
@@ -16,14 +16,14 @@ python split_gstreamer10_packages () { | |||
16 | python set_metapkg_rdepends () { | 16 | python set_metapkg_rdepends () { |
17 | import os | 17 | import os |
18 | 18 | ||
19 | pn = d.getVar('PN', True) | 19 | pn = d.getVar('PN') |
20 | metapkg = pn + '-meta' | 20 | metapkg = pn + '-meta' |
21 | d.setVar('ALLOW_EMPTY_' + metapkg, "1") | 21 | d.setVar('ALLOW_EMPTY_' + metapkg, "1") |
22 | d.setVar('FILES_' + metapkg, "") | 22 | d.setVar('FILES_' + metapkg, "") |
23 | blacklist = [ pn, pn + '-locale', pn + '-dev', pn + '-dbg', pn + '-doc', pn + '-meta' ] | 23 | blacklist = [ pn, pn + '-locale', pn + '-dev', pn + '-dbg', pn + '-doc', pn + '-meta' ] |
24 | metapkg_rdepends = [] | 24 | metapkg_rdepends = [] |
25 | packages = d.getVar('PACKAGES', True).split() | 25 | packages = d.getVar('PACKAGES').split() |
26 | pkgdest = d.getVar('PKGDEST', True) | 26 | pkgdest = d.getVar('PKGDEST') |
27 | for pkg in packages[1:]: | 27 | for pkg in packages[1:]: |
28 | if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.count('locale') and not pkg.count('-staticdev'): | 28 | if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.count('locale') and not pkg.count('-staticdev'): |
29 | # See if the package is empty by looking at the contents of its PKGDEST subdirectory. | 29 | # See if the package is empty by looking at the contents of its PKGDEST subdirectory. |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc index 07e5b7db5e..05562b11a7 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc | |||
@@ -18,7 +18,7 @@ GSTREAMER_1_0_OMX_CORE_NAME ?= "${libdir}/libomxil-bellagio.so.0" | |||
18 | EXTRA_OECONF += "--disable-valgrind --with-omx-target=${GSTREAMER_1_0_OMX_TARGET}" | 18 | EXTRA_OECONF += "--disable-valgrind --with-omx-target=${GSTREAMER_1_0_OMX_TARGET}" |
19 | 19 | ||
20 | python __anonymous () { | 20 | python __anonymous () { |
21 | omx_target = d.getVar("GSTREAMER_1_0_OMX_TARGET", True) | 21 | omx_target = d.getVar("GSTREAMER_1_0_OMX_TARGET") |
22 | if omx_target in ['generic', 'bellagio']: | 22 | if omx_target in ['generic', 'bellagio']: |
23 | # Bellagio headers are incomplete (they are missing the OMX_VERSION_MAJOR,# | 23 | # Bellagio headers are incomplete (they are missing the OMX_VERSION_MAJOR,# |
24 | # OMX_VERSION_MINOR, OMX_VERSION_REVISION, and OMX_VERSION_STEP macros); | 24 | # OMX_VERSION_MINOR, OMX_VERSION_REVISION, and OMX_VERSION_STEP macros); |
@@ -26,7 +26,7 @@ python __anonymous () { | |||
26 | d.appendVar("CFLAGS", " -I${S}/omx/openmax") | 26 | d.appendVar("CFLAGS", " -I${S}/omx/openmax") |
27 | elif omx_target == "rpi": | 27 | elif omx_target == "rpi": |
28 | # Dedicated Raspberry Pi OpenMAX IL support makes this package machine specific | 28 | # Dedicated Raspberry Pi OpenMAX IL support makes this package machine specific |
29 | d.setVar("PACKAGE_ARCH", d.getVar("MACHINE_ARCH", True)) | 29 | d.setVar("PACKAGE_ARCH", d.getVar("MACHINE_ARCH")) |
30 | } | 30 | } |
31 | 31 | ||
32 | set_omx_core_name() { | 32 | set_omx_core_name() { |