diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-03 11:21:22 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-05 10:33:18 -0800 |
| commit | 065dab7480ea0fae66db4b5a01d09814b1f38e03 (patch) | |
| tree | 7918d9ebf20c38ccbffca4c79d7b8993e9d6f20d /meta/recipes-multimedia | |
| parent | 8144d51511956a6e046e3976bb4c4a08f1a29c79 (diff) | |
| download | openembedded-core-065dab7480ea0fae66db4b5a01d09814b1f38e03.tar.gz openembedded-core-065dab7480ea0fae66db4b5a01d09814b1f38e03.tar.bz2 openembedded-core-065dab7480ea0fae66db4b5a01d09814b1f38e03.tar.xz openembedded-core-065dab7480ea0fae66db4b5a01d09814b1f38e03.zip | |
meta: Replace bb.data.expand(xxx, d) -> d.expand(xxx)
sed \
-e 's:bb.data.\(expand([^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-i `grep -ril bb.data.expand *`
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-plugins-package.inc | 8 | ||||
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc index ccabe3c03..4572265ef 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc @@ -1,14 +1,14 @@ LIBV = "0.10" python populate_packages_prepend () { - gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d) + gst_libdir = d.expand('${libdir}/gstreamer-${LIBV}') postinst = d.getVar('plugin_postinst', True) glibdir = d.getVar('libdir', True) do_split_packages(d, glibdir, '^lib(.*)\.so\.*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True) - do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', bb.data.expand('${PN}-%s', d), 'GStreamer plugin for %s', postinst=postinst, extra_depends=bb.data.expand('${PN}',d)) - do_split_packages(d, gst_libdir, 'libgst(.*)\.la$', bb.data.expand('${PN}-%s-dev', d), 'GStreamer plugin for %s (development files)', extra_depends=bb.data.expand('${PN}-dev',d)) - do_split_packages(d, gst_libdir, 'libgst(.*)\.a$', bb.data.expand('${PN}-%s-staticdev', d), 'GStreamer plugin for %s (static development files)', extra_depends=bb.data.expand('${PN}-staticdev',d)) + do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', d.expand('${PN}-%s'), 'GStreamer plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}')) + do_split_packages(d, gst_libdir, 'libgst(.*)\.la$', d.expand('${PN}-%s-dev'), 'GStreamer plugin for %s (development files)', extra_depends=d.expand('${PN}-dev')) + do_split_packages(d, gst_libdir, 'libgst(.*)\.a$', d.expand('${PN}-%s-staticdev'), 'GStreamer plugin for %s (static development files)', extra_depends=d.expand('${PN}-staticdev')) pn = d.getVar('PN', True) metapkg = pn + '-meta' diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index ca3a28dc6..dda0352ae 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -106,7 +106,7 @@ pkg_postinst_${PN}-server() { python populate_packages_prepend() { #d.setVar('PKG_pulseaudio', 'pulseaudio') - plugindir = bb.data.expand('${libdir}/pulse-${PV}/modules/', d) + plugindir = d.expand('${libdir}/pulse-${PV}/modules/') do_split_packages(d, plugindir, '^module-(.*)\.so$', 'pulseaudio-module-%s', 'PulseAudio module for %s', extra_depends='' ) do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' ) } |