summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 34d96f7)
raw | patch | inline | side by side (parent: 34d96f7)
author | Koen Kooi <koen@dominion.thruhere.net> | |
Fri, 2 Sep 2011 10:09:28 +0000 (12:09 +0200) | ||
committer | Koen Kooi <koen@dominion.thruhere.net> | |
Fri, 2 Sep 2011 10:12:40 +0000 (12:12 +0200) |
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>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
recipes-ti/gstreamer-ti/gstreamer-ti.inc | patch | blob | history | |
recipes-ti/gstreamer-ti/gstreamer-ti/gstti-init.service | [new file with mode: 0644] | patch | blob |
recipes-ti/gstreamer-ti/gstreamer-ti_svn.bb | patch | blob | history |
index 422d8c7e80f67f2dcc63d3c653f586838dbfe5ac..789ebb4c9423eb4fa529690c57acf04e7fd6ef6b 100644 (file)
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"
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
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"
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
--- /dev/null
@@ -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)
# 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