diff options
| author | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-10-14 13:46:52 +0200 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2015-01-09 09:23:16 -0800 |
| commit | eb05abc89b2ddb69c3ff330740b40a2a0b7a5db7 (patch) | |
| tree | 1806841156ffae26e505ed1c22e4e5dd9023e543 | |
| parent | e7ad47ac80465d91446169ca07b75aecce2e3e75 (diff) | |
| download | tizen-distro-eb05abc89b2ddb69c3ff330740b40a2a0b7a5db7.tar.gz tizen-distro-eb05abc89b2ddb69c3ff330740b40a2a0b7a5db7.tar.bz2 tizen-distro-eb05abc89b2ddb69c3ff330740b40a2a0b7a5db7.zip | |
meta-tizen: pulseaudio-module-murphy-ivi: tmp solve conflict
Tmp fix:
Remove modules combine-sink and augment-properties from
pulseaudio-module-murphy-ivi since they conflict with modules with the
same name provided by pulseaudio. Modules provided by
pulseaudio-module-murphy-ivi are based on the ones provided by
pulseaudio but incorpoate muprhy/IVI specific changes. The muprhy team
plans on renaming those modules in order to prevent this conflict and
allows both pulseaudio-module-murphy-ivi and pulseaudio modules to be
installed alongside. This issue is tracked as: Bug-Tizen: PTREL-825.
Change-Id: I91f67b7a9e9929b1b28812eca6f182e31e6de34b
(From meta-tizen rev: 5657c0b72ca9fd210ed5095472caf6339cb4eadf)
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
| -rw-r--r-- | meta-tizen/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi-extraconf.inc | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/meta-tizen/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi-extraconf.inc b/meta-tizen/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi-extraconf.inc index d645ccb132..60e0f36426 100644 --- a/meta-tizen/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi-extraconf.inc +++ b/meta-tizen/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi-extraconf.inc @@ -1 +1,16 @@ -FILES_${PN}-dbg += "${prefix}/lib/pulse-5.0/modules/.debug"
\ No newline at end of file +do_install_append() { + # Tmp fix: + # Remove modules combine-sink and augment-properties from + #pulseaudio-module-murphy-ivi since they conflict with modules with + # the same name provided by pulseaudio. Modules provided by + # pulseaudio-module-murphy-ivi are based on the ones provided by + # pulseaudio but incorpoate muprhy/IVI specific changes. The muprhy + # team plans on renaming those modules in order to prevent this + # conflict and allows both pulseaudio-module-murphy-ivi and + # pulseaudio modules to be installed alongside. + # Bug-Tizen: PTREL-825 + rm -f ${D}${prefix}/lib/pulse-5.0/modules/module-combine-sink.so + rm -f ${D}${prefix}/lib/pulse-5.0/modules/module-augment-properties.so +} + +FILES_${PN}-dbg += "${prefix}/lib/pulse-5.0/modules/.debug" |