gstreamer-ti: add native system unit file

systemd will only run the platform script if the right bootargs are passed, so no more cmem suprises!

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

diff --git a/recipes-ti/gstreamer-ti/gstreamer-ti.inc b/recipes-ti/gstreamer-ti/gstreamer-ti.inc
index 422d8c7e80f67f2dcc63d3c653f586838dbfe5ac..789ebb4c9423eb4fa529690c57acf04e7fd6ef6b 100644 (file)
--- a/recipes-ti/gstreamer-ti/gstreamer-ti.inc
+++ b/recipes-ti/gstreamer-ti/gstreamer-ti.inc
@@ -15,7 +15,7 @@ require recipes-ti/includes/ti-paths.inc
 require recipes-ti/includes/ti-staging.inc
 
 # Rebuild on kernel change since it links statically to ti-dmai, ti-codec-engine, etc
-PR = "r84+${MACHINE_KERNEL_PR}"
+PR = "r85+${MACHINE_KERNEL_PR}"
 
 DEPENDS = "ti-dmai gstreamer gst-plugins-base"
 
@@ -52,6 +52,10 @@ XDC_PLATFORM_omapl137  = "ti.platforms.evmOMAPL137"
 XDC_PLATFORM_omapl138  = "ti.platforms.evmOMAPL138"
 XDC_PLATFORM          ?= "UNDEFINED_XDC_PLATFORM"
 
+MEMARGS_omap3         = "99M@0x80000000"
+MEMARGS              ?= "UNDEFINED_MEM_ARGS"
+
+export MEMARGS
 export PLATFORM
 export GST_TI_PLATFORM
 export XDC_PLATFORM
@@ -121,8 +125,11 @@ do_install_prepend () {
 
     install -d ${D}${sysconfdir}/init.d/
     install -m 0755  ${WORKDIR}/gstreamer-ti-rc.sh ${D}${sysconfdir}/init.d/gstti-init
-
     sed -i -e 's|<platform>|${PLATFORM}|g' ${D}${sysconfdir}/init.d/gstti-init
+
+       install -d ${D}${base_libdir}/systemd/system
+       install -m 0644 ${WORKDIR}/gstti-init.service ${D}${base_libdir}/systemd/system/
+       sed -i -e 's|<platform>|${PLATFORM}|g' -e 's|MEMARGS|99M@0x80000000|' ${D}${base_libdir}/systemd/system/gstti-init.service
 }
 
 RRECOMMENDS_${PN}_append_dm6446    += "ti-codecs-dm6446-server   ti-cmem-module ti-dsplink-module"
@@ -133,11 +140,19 @@ RRECOMMENDS_${PN}_append_dm365     += "ti-codecs-dm365           ti-cmem-module
 RRECOMMENDS_${PN}_append_omapl137  += "ti-codecs-omapl137-server ti-cmem-module ti-dsplink-module"
 RRECOMMENDS_${PN}_append_omapl138  += "ti-codecs-omapl138-server ti-cmem-module ti-dsplink-module"
 
-FILES_${PN}     += "${libdir}/gstreamer-0.10/*.so ${sysconfdir} ${installdir}"
+FILES_${PN}     += "${libdir}/gstreamer-0.10/*.so ${sysconfdir} ${installdir} ${base_libdir}/systemd"
 FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.a ${libdir}/gstreamer-0.10/*.la"
 FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
 
 pkg_postinst_${PN} () {
+if test "x$D" != "x"; then
+       echo "Can't run gstreamer-ti postinst offline"
+    exit 1
+fi
+       if [ -e ${base_bindir}/systemctl ] ; then
+               systemctl enable gstti-init.service
+       fi
+
        if [ -d ${installdir}/ti-codecs-server/ ]; then
         ln -sf ${installdir}/ti-codecs-server/* ${installdir}/gst/${PLATFORM}/
        fi

diff --git a/recipes-ti/gstreamer-ti/gstreamer-ti/gstti-init.service b/recipes-ti/gstreamer-ti/gstreamer-ti/gstti-init.service
new file mode 100644 (file)
index 0000000..cccf534
--- /dev/null
+++ b/recipes-ti/gstreamer-ti/gstreamer-ti/gstti-init.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=TI Gstreamer plugins init
+ConditionKernelCommandLine=mem=MEMARGS
+
+[Service]
+ExecStart=/usr/share/ti/gst/<platform>/loadmodules.sh
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target

diff --git a/recipes-ti/gstreamer-ti/gstreamer-ti_svn.bb b/recipes-ti/gstreamer-ti/gstreamer-ti_svn.bb
index 9284eab6d938a138f98e280fd5fda9b2a9c981f5..3d260ed5fd2581a0e5fdcf87d452d6ebacd942ce 100644 (file)
--- a/recipes-ti/gstreamer-ti/gstreamer-ti_svn.bb
+++ b/recipes-ti/gstreamer-ti/gstreamer-ti_svn.bb
@@ -12,8 +12,9 @@ SRCREV = "962"
 # https://gstreamer.ti.com/gf/project/gstreamer_ti/tracker/?action=TrackerItemEdit&tracker_item_id=1208&start=175
 
 SRC_URI = "svn://gforge.ti.com/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto=https;user=anonymous;pswd='' \
-file://gstreamer-ti-rc.sh \
-file://r962-remove-include-videodev.diff \
+           file://gstreamer-ti-rc.sh \
+           file://r962-remove-include-videodev.diff \
+           file://gstti-init.service \
 "
 
 # use local loadmodules.sh for these platform