[all] Move GStreamer plugin path option from mused.conf to mmf.sh

- The GStreamer plugin path option should be applied for all process,
  but mused.conf is only for muse-server process.
  So, the option is moved to mmf.sh for all processes.

[Version] 0.1.179
[Issue Type] HAL path

Change-Id: I44a152dc9ab07799c53befdb5dcd5a685ddf2e4f
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/mmfw-sysconf-simulator/etc/multimedia/mused.conf b/mmfw-sysconf-simulator/etc/multimedia/mused.conf
index 76a73d9..38e07b8 100644 (file)
--- a/mmfw-sysconf-simulator/etc/multimedia/mused.conf
+++ b/mmfw-sysconf-simulator/etc/multimedia/mused.conf
@@ -15,7 +15,7 @@ enable_watch_external_storage=1
 ; DEFAULT SET (--gst-debug=*:2)
 gstparam1=--gst-debug=*:2
 gstparam2=--gst-disable-segtrap
-gstparam3=--gst-plugin-path=@HAL_LIBDIR@/gstreamer-1.0
+gstparam3=
 gstparam4=
 gstparam5=
 gstparam6=

diff --git a/mmfw-sysconf-simulator/etc/profile.d/mmf.sh b/mmfw-sysconf-simulator/etc/profile.d/mmf.sh
index 2020798..7dac276 100755 (executable)
--- a/mmfw-sysconf-simulator/etc/profile.d/mmf.sh
+++ b/mmfw-sysconf-simulator/etc/profile.d/mmf.sh
@@ -3,3 +3,4 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 export GST_DEBUG=2
 export ORC_CODE=debug
 export ORC_DEBUG=5
+export GST_PLUGIN_PATH=@HAL_LIBDIR@/gstreamer-1.0

diff --git a/mmfw-sysconf-target-artik10/etc/multimedia/mused.conf b/mmfw-sysconf-target-artik10/etc/multimedia/mused.conf
index 76a73d9..38e07b8 100644 (file)
--- a/mmfw-sysconf-target-artik10/etc/multimedia/mused.conf
+++ b/mmfw-sysconf-target-artik10/etc/multimedia/mused.conf
@@ -15,7 +15,7 @@ enable_watch_external_storage=1
 ; DEFAULT SET (--gst-debug=*:2)
 gstparam1=--gst-debug=*:2
 gstparam2=--gst-disable-segtrap
-gstparam3=--gst-plugin-path=@HAL_LIBDIR@/gstreamer-1.0
+gstparam3=
 gstparam4=
 gstparam5=
 gstparam6=

diff --git a/mmfw-sysconf-target-artik10/etc/profile.d/mmf.sh b/mmfw-sysconf-target-artik10/etc/profile.d/mmf.sh
index 2020798..7dac276 100644 (file)
--- a/mmfw-sysconf-target-artik10/etc/profile.d/mmf.sh
+++ b/mmfw-sysconf-target-artik10/etc/profile.d/mmf.sh
@@ -3,3 +3,4 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 export GST_DEBUG=2
 export ORC_CODE=debug
 export ORC_DEBUG=5
+export GST_PLUGIN_PATH=@HAL_LIBDIR@/gstreamer-1.0

diff --git a/mmfw-sysconf-target-hawkp/etc/multimedia/mused.conf b/mmfw-sysconf-target-hawkp/etc/multimedia/mused.conf
index 6e6c51d..dc27fec 100644 (file)
--- a/mmfw-sysconf-target-hawkp/etc/multimedia/mused.conf
+++ b/mmfw-sysconf-target-hawkp/etc/multimedia/mused.conf
@@ -15,7 +15,7 @@ enable_watch_external_storage=1
 ; DEFAULT SET (--gst-debug=*:2)
 gstparam1=--gst-debug=*:2
 gstparam2=--gst-disable-segtrap
-gstparam3=--gst-plugin-path=@HAL_LIBDIR@/gstreamer-1.0
+gstparam3=
 gstparam4=
 gstparam5=
 gstparam6=

diff --git a/mmfw-sysconf-target-hawkp/etc/profile.d/mmf.sh b/mmfw-sysconf-target-hawkp/etc/profile.d/mmf.sh
index 2020798..7dac276 100644 (file)
--- a/mmfw-sysconf-target-hawkp/etc/profile.d/mmf.sh
+++ b/mmfw-sysconf-target-hawkp/etc/profile.d/mmf.sh
@@ -3,3 +3,4 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 export GST_DEBUG=2
 export ORC_CODE=debug
 export ORC_DEBUG=5
+export GST_PLUGIN_PATH=@HAL_LIBDIR@/gstreamer-1.0

diff --git a/mmfw-sysconf-target-n4/etc/multimedia/mused.conf b/mmfw-sysconf-target-n4/etc/multimedia/mused.conf
index 76a73d9..38e07b8 100644 (file)
--- a/mmfw-sysconf-target-n4/etc/multimedia/mused.conf
+++ b/mmfw-sysconf-target-n4/etc/multimedia/mused.conf
@@ -15,7 +15,7 @@ enable_watch_external_storage=1
 ; DEFAULT SET (--gst-debug=*:2)
 gstparam1=--gst-debug=*:2
 gstparam2=--gst-disable-segtrap
-gstparam3=--gst-plugin-path=@HAL_LIBDIR@/gstreamer-1.0
+gstparam3=
 gstparam4=
 gstparam5=
 gstparam6=

diff --git a/mmfw-sysconf-target-n4/etc/profile.d/mmf.sh b/mmfw-sysconf-target-n4/etc/profile.d/mmf.sh
index 8e6a56c..9296ba2 100644 (file)
--- a/mmfw-sysconf-target-n4/etc/profile.d/mmf.sh
+++ b/mmfw-sysconf-target-n4/etc/profile.d/mmf.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 export GST_DEBUG=2
+export GST_PLUGIN_PATH=@HAL_LIBDIR@/gstreamer-1.0

diff --git a/mmfw-sysconf-target-rpi3-spk/etc/multimedia/mused.conf b/mmfw-sysconf-target-rpi3-spk/etc/multimedia/mused.conf
index 76a73d9..38e07b8 100644 (file)
--- a/mmfw-sysconf-target-rpi3-spk/etc/multimedia/mused.conf
+++ b/mmfw-sysconf-target-rpi3-spk/etc/multimedia/mused.conf
@@ -15,7 +15,7 @@ enable_watch_external_storage=1
 ; DEFAULT SET (--gst-debug=*:2)
 gstparam1=--gst-debug=*:2
 gstparam2=--gst-disable-segtrap
-gstparam3=--gst-plugin-path=@HAL_LIBDIR@/gstreamer-1.0
+gstparam3=
 gstparam4=
 gstparam5=
 gstparam6=

diff --git a/mmfw-sysconf-target-rpi3-spk/etc/profile.d/mmf.sh b/mmfw-sysconf-target-rpi3-spk/etc/profile.d/mmf.sh
index 2020798..7dac276 100644 (file)
--- a/mmfw-sysconf-target-rpi3-spk/etc/profile.d/mmf.sh
+++ b/mmfw-sysconf-target-rpi3-spk/etc/profile.d/mmf.sh
@@ -3,3 +3,4 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 export GST_DEBUG=2
 export ORC_CODE=debug
 export ORC_DEBUG=5
+export GST_PLUGIN_PATH=@HAL_LIBDIR@/gstreamer-1.0

diff --git a/mmfw-sysconf-target-rpi3/etc/multimedia/mused.conf b/mmfw-sysconf-target-rpi3/etc/multimedia/mused.conf
index 76a73d9..38e07b8 100644 (file)
--- a/mmfw-sysconf-target-rpi3/etc/multimedia/mused.conf
+++ b/mmfw-sysconf-target-rpi3/etc/multimedia/mused.conf
@@ -15,7 +15,7 @@ enable_watch_external_storage=1
 ; DEFAULT SET (--gst-debug=*:2)
 gstparam1=--gst-debug=*:2
 gstparam2=--gst-disable-segtrap
-gstparam3=--gst-plugin-path=@HAL_LIBDIR@/gstreamer-1.0
+gstparam3=
 gstparam4=
 gstparam5=
 gstparam6=

diff --git a/mmfw-sysconf-target-rpi3/etc/profile.d/mmf.sh b/mmfw-sysconf-target-rpi3/etc/profile.d/mmf.sh
index 2020798..7dac276 100644 (file)
--- a/mmfw-sysconf-target-rpi3/etc/profile.d/mmf.sh
+++ b/mmfw-sysconf-target-rpi3/etc/profile.d/mmf.sh
@@ -3,3 +3,4 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 export GST_DEBUG=2
 export ORC_CODE=debug
 export ORC_DEBUG=5
+export GST_PLUGIN_PATH=@HAL_LIBDIR@/gstreamer-1.0

diff --git a/mmfw-sysconf-target-tm1/etc/multimedia/mused.conf b/mmfw-sysconf-target-tm1/etc/multimedia/mused.conf
index 55d6c49..4c2d5cc 100644 (file)
--- a/mmfw-sysconf-target-tm1/etc/multimedia/mused.conf
+++ b/mmfw-sysconf-target-tm1/etc/multimedia/mused.conf
@@ -15,7 +15,7 @@ enable_watch_external_storage=1
 ; DEFAULT SET (--gst-debug=*:2)
 gstparam1=--gst-debug=*:2,*STATE*:4,*pulse*:4,*audiobasesink:4
 gstparam2=--gst-disable-segtrap
-gstparam3=--gst-plugin-path=@HAL_LIBDIR@/gstreamer-1.0
+gstparam3=
 gstparam4=
 gstparam5=
 gstparam6=

diff --git a/mmfw-sysconf-target-tm1/etc/profile.d/mmf.sh b/mmfw-sysconf-target-tm1/etc/profile.d/mmf.sh
index 2020798..7dac276 100644 (file)
--- a/mmfw-sysconf-target-tm1/etc/profile.d/mmf.sh
+++ b/mmfw-sysconf-target-tm1/etc/profile.d/mmf.sh
@@ -3,3 +3,4 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 export GST_DEBUG=2
 export ORC_CODE=debug
 export ORC_DEBUG=5
+export GST_PLUGIN_PATH=@HAL_LIBDIR@/gstreamer-1.0

diff --git a/mmfw-sysconf-target-tw1/etc/multimedia/mused.conf b/mmfw-sysconf-target-tw1/etc/multimedia/mused.conf
index 1a44ca1..3d51615 100644 (file)
--- a/mmfw-sysconf-target-tw1/etc/multimedia/mused.conf
+++ b/mmfw-sysconf-target-tw1/etc/multimedia/mused.conf
@@ -15,7 +15,7 @@ enable_watch_external_storage=0
 ; DEFAULT SET (--gst-debug=*:2)
 gstparam1=--gst-debug=*:2
 gstparam2=--gst-disable-segtrap
-gstparam3=--gst-plugin-path=@HAL_LIBDIR@/gstreamer-1.0
+gstparam3=
 gstparam4=
 gstparam5=
 gstparam6=

diff --git a/mmfw-sysconf-target-tw1/etc/profile.d/mmf.sh b/mmfw-sysconf-target-tw1/etc/profile.d/mmf.sh
index 2020798..7dac276 100644 (file)
--- a/mmfw-sysconf-target-tw1/etc/profile.d/mmf.sh
+++ b/mmfw-sysconf-target-tw1/etc/profile.d/mmf.sh
@@ -3,3 +3,4 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 export GST_DEBUG=2
 export ORC_CODE=debug
 export ORC_DEBUG=5
+export GST_PLUGIN_PATH=@HAL_LIBDIR@/gstreamer-1.0

diff --git a/mmfw-sysconf-target-tw2/etc/multimedia/mused.conf b/mmfw-sysconf-target-tw2/etc/multimedia/mused.conf
index 40a1ec5..d83cdf3 100644 (file)
--- a/mmfw-sysconf-target-tw2/etc/multimedia/mused.conf
+++ b/mmfw-sysconf-target-tw2/etc/multimedia/mused.conf
@@ -15,7 +15,7 @@ enable_watch_external_storage=0
 ; DEFAULT SET (--gst-debug=*:2)
 gstparam1=--gst-debug=*:2,*STATE*:4,*pulse*:4,*audiobasesink:4
 gstparam2=--gst-disable-segtrap
-gstparam3=--gst-plugin-path=@HAL_LIBDIR@/gstreamer-1.0
+gstparam3=
 gstparam4=
 gstparam5=
 gstparam6=

diff --git a/mmfw-sysconf-target-tw2/etc/profile.d/mmf.sh b/mmfw-sysconf-target-tw2/etc/profile.d/mmf.sh
index 2020798..7dac276 100644 (file)
--- a/mmfw-sysconf-target-tw2/etc/profile.d/mmf.sh
+++ b/mmfw-sysconf-target-tw2/etc/profile.d/mmf.sh
@@ -3,3 +3,4 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 export GST_DEBUG=2
 export ORC_CODE=debug
 export ORC_DEBUG=5
+export GST_PLUGIN_PATH=@HAL_LIBDIR@/gstreamer-1.0

diff --git a/mmfw-sysconf-target-tw3/etc/multimedia/mused.conf b/mmfw-sysconf-target-tw3/etc/multimedia/mused.conf
index 40a1ec5..d83cdf3 100644 (file)
--- a/mmfw-sysconf-target-tw3/etc/multimedia/mused.conf
+++ b/mmfw-sysconf-target-tw3/etc/multimedia/mused.conf
@@ -15,7 +15,7 @@ enable_watch_external_storage=0
 ; DEFAULT SET (--gst-debug=*:2)
 gstparam1=--gst-debug=*:2,*STATE*:4,*pulse*:4,*audiobasesink:4
 gstparam2=--gst-disable-segtrap
-gstparam3=--gst-plugin-path=@HAL_LIBDIR@/gstreamer-1.0
+gstparam3=
 gstparam4=
 gstparam5=
 gstparam6=

diff --git a/mmfw-sysconf-target-tw3/etc/profile.d/mmf.sh b/mmfw-sysconf-target-tw3/etc/profile.d/mmf.sh
index 2020798..7dac276 100644 (file)
--- a/mmfw-sysconf-target-tw3/etc/profile.d/mmf.sh
+++ b/mmfw-sysconf-target-tw3/etc/profile.d/mmf.sh
@@ -3,3 +3,4 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 export GST_DEBUG=2
 export ORC_CODE=debug
 export ORC_DEBUG=5
+export GST_PLUGIN_PATH=@HAL_LIBDIR@/gstreamer-1.0

diff --git a/mmfw-sysconf-target-u3/etc/multimedia/mused.conf b/mmfw-sysconf-target-u3/etc/multimedia/mused.conf
index adb0f8b..d417444 100644 (file)
--- a/mmfw-sysconf-target-u3/etc/multimedia/mused.conf
+++ b/mmfw-sysconf-target-u3/etc/multimedia/mused.conf
@@ -15,7 +15,7 @@ enable_watch_external_storage=1
 ; DEFAULT SET (--gst-debug=*:2)
 gstparam1=--gst-debug=*:2
 gstparam2=--gst-disable-segtrap
-gstparam3=--gst-plugin-path=@HAL_LIBDIR@/gstreamer-1.0
+gstparam3=
 gstparam4=
 gstparam5=
 gstparam6=

diff --git a/mmfw-sysconf-target-u3/etc/profile.d/mmf.sh b/mmfw-sysconf-target-u3/etc/profile.d/mmf.sh
index 2020798..7dac276 100644 (file)
--- a/mmfw-sysconf-target-u3/etc/profile.d/mmf.sh
+++ b/mmfw-sysconf-target-u3/etc/profile.d/mmf.sh
@@ -3,3 +3,4 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 export GST_DEBUG=2
 export ORC_CODE=debug
 export ORC_DEBUG=5
+export GST_PLUGIN_PATH=@HAL_LIBDIR@/gstreamer-1.0

diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec
index 906772c..25888ae 100644 (file)
--- a/packaging/mmfw-sysconf.spec
+++ b/packaging/mmfw-sysconf.spec
@@ -1,6 +1,6 @@
 Name:       mmfw-sysconf
 Summary:    Multimedia Framework system configuration package
-Version:    0.2.178
+Version:    0.2.179
 Release:    0
 Group:      Multimedia/Configuration
 License:    LGPL-2.1 and Apache-2.0
@@ -163,63 +163,63 @@ cp -arf %{name}-simulator/* %{buildroot}%{_datadir}/%{name}-simulator
 
 %post target-u3
 sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-u3%{_sysconfdir}/xdg/gstomx.conf
-sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-u3%{_sysconfdir}/multimedia/mused.conf
+sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-u3%{_sysconfdir}/profile.d/mmf.sh
 cp -arf %{_datadir}/mmfw-sysconf-target-u3/* /
 rm -rf %{_datadir}/mmfw-sysconf-target-u3
 
 %post target-n4
 sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-n4%{_sysconfdir}/xdg/gstomx.conf
-sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-n4%{_sysconfdir}/multimedia/mused.conf
+sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-n4%{_sysconfdir}/profile.d/mmf.sh
 cp -arf %{_datadir}/mmfw-sysconf-target-n4/* /
 rm -rf %{_datadir}/mmfw-sysconf-target-n4
 
 %post target-hawkp
-sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-hawkp%{_sysconfdir}/multimedia/mused.conf
+sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-hawkp%{_sysconfdir}/profile.d/mmf.sh
 cp -arf %{_datadir}/mmfw-sysconf-target-hawkp/* /
 rm -rf %{_datadir}/mmfw-sysconf-target-hawkp
 
 %post target-tm1
-sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-tm1%{_sysconfdir}/multimedia/mused.conf
+sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-tm1%{_sysconfdir}/profile.d/mmf.sh
 cp -arf %{_datadir}/mmfw-sysconf-target-tm1/* /
 rm -rf %{_datadir}/mmfw-sysconf-target-tm1
 
 %post target-tw1
 sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-tw1%{_sysconfdir}/xdg/gstomx.conf
-sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-tw1%{_sysconfdir}/multimedia/mused.conf
+sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-tw1%{_sysconfdir}/profile.d/mmf.sh
 cp -arf %{_datadir}/mmfw-sysconf-target-tw1/* /
 rm -rf %{_datadir}/mmfw-sysconf-target-tw1
 
 %post target-artik10
-sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-artik10%{_sysconfdir}/multimedia/mused.conf
+sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-artik10%{_sysconfdir}/profile.d/mmf.sh
 cp -arf %{_datadir}/mmfw-sysconf-target-artik10/* /
 rm -rf %{_datadir}/mmfw-sysconf-target-artik10
 
 %post target-tw2
 sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-tw2%{_sysconfdir}/xdg/gstomx.conf
-sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-tw2%{_sysconfdir}/multimedia/mused.conf
+sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-tw2%{_sysconfdir}/profile.d/mmf.sh
 cp -arf %{_datadir}/mmfw-sysconf-target-tw2/* /
 rm -rf %{_datadir}/mmfw-sysconf-target-tw2
 
 %post target-rpi3
-sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-rpi3%{_sysconfdir}/multimedia/mused.conf
+sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-rpi3%{_sysconfdir}/profile.d/mmf.sh
 cp -arf %{_datadir}/mmfw-sysconf-target-rpi3/* /
 rm -rf %{_datadir}/mmfw-sysconf-target-rpi3
 
 %post target-tw3
 sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-tw3%{_sysconfdir}/xdg/gstomx.conf
-sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-tw3%{_sysconfdir}/multimedia/mused.conf
+sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-tw3%{_sysconfdir}/profile.d/mmf.sh
 cp -arf %{_datadir}/mmfw-sysconf-target-tw3/* /
 rm -rf %{_datadir}/mmfw-sysconf-target-tw3
 
 %post target-rpi3-spk
-sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-rpi3-spk%{_sysconfdir}/multimedia/mused.conf
+sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-target-rpi3-spk%{_sysconfdir}/profile.d/mmf.sh
 cp -arf %{_datadir}/mmfw-sysconf-target-rpi3-spk/* /
 rm -rf %{_datadir}/mmfw-sysconf-target-rpi3-spk
 
 %else
 
 %post simulator
-sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-simulator%{_sysconfdir}/multimedia/mused.conf
+sed -i -e 's|@HAL_LIBDIR@|%{_hal_libdir}|g' %{_datadir}/mmfw-sysconf-simulator%{_sysconfdir}/profile.d/mmf.sh
 cp -arf %{_datadir}/mmfw-sysconf-simulator/* /
 rm -rf %{_datadir}/mmfw-sysconf-simulator