diff options
Diffstat (limited to 'recipes-demo-hmi/navigation/mapviewer-demo')
6 files changed, 30 insertions, 27 deletions
diff --git a/recipes-demo-hmi/navigation/mapviewer-demo/mapviewer-demo-network-conf.service b/recipes-demo-hmi/navigation/mapviewer-demo/mapviewer-demo-network-conf.service new file mode 100644 index 000000000..1a6e2d8b7 --- /dev/null +++ b/recipes-demo-hmi/navigation/mapviewer-demo/mapviewer-demo-network-conf.service @@ -0,0 +1,15 @@ +[Unit] +Description=Configure dedicated link for cluster demo network +After=sys-subsystem-net-devices-eth1.device +Requires=sys-subsystem-net-devices-eth1.device +Before=network.target + +[Service] +# Note that this is done as opposed to using connman as configuring an +# interface on a second network separate from the rest of the interfaces +# is non-trivial in connman and needs further investigation. +ExecStart=/sbin/ifconfig eth1 192.168.20.93 +Type=oneshot + +[Install] +WantedBy=network.target diff --git a/recipes-demo-hmi/navigation/mapviewer-demo/switch_off_mapviewer-demo.sh b/recipes-demo-hmi/navigation/mapviewer-demo/switch_off_mapviewer-demo.sh deleted file mode 100755 index 22fa16c7c..000000000 --- a/recipes-demo-hmi/navigation/mapviewer-demo/switch_off_mapviewer-demo.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -/bin/systemctl disable weston-mapviewer-demo.service -/bin/systemctl enable weston.service -/bin/systemctl disable mapviewer.service diff --git a/recipes-demo-hmi/navigation/mapviewer-demo/switch_on_mapviewer-demo.sh b/recipes-demo-hmi/navigation/mapviewer-demo/switch_on_mapviewer-demo.sh deleted file mode 100755 index f61cdc700..000000000 --- a/recipes-demo-hmi/navigation/mapviewer-demo/switch_on_mapviewer-demo.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -/bin/systemctl disable weston.service -/bin/systemctl enable weston-mapviewer-demo.service -/bin/systemctl enable mapviewer.service - diff --git a/recipes-demo-hmi/navigation/mapviewer-demo/weston-mapviewer-demo.conf b/recipes-demo-hmi/navigation/mapviewer-demo/weston-mapviewer-demo.conf new file mode 100644 index 000000000..8bccffd29 --- /dev/null +++ b/recipes-demo-hmi/navigation/mapviewer-demo/weston-mapviewer-demo.conf @@ -0,0 +1,11 @@ +[Unit] +# Add dependency on network, since the recorder feature requires it +After=network.target +Requires=network.target + +[Service] +# GSM? +ExecStartPre=/bin/sleep 2 +# Replace default ExecStart line with one that uses the cluster demo specific ini +ExecStart= +ExecStart=/usr/bin/weston --idle-time=0 --tty=1 --gst-record --config=weston-mapviewer-demo.ini --log=/run/platform/display/weston.log diff --git a/recipes-demo-hmi/navigation/mapviewer-demo/weston-mapviewer-demo.service b/recipes-demo-hmi/navigation/mapviewer-demo/weston-mapviewer-demo.service deleted file mode 100644 index 65275cc03..000000000 --- a/recipes-demo-hmi/navigation/mapviewer-demo/weston-mapviewer-demo.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Weston reference Wayland compositor -Conflicts=getty@tty1.service -After=dbus.service rc.pvr.service - -[Service] -ExecStartPre=/sbin/ifconfig eth0 192.168.20.93 -ExecStartPre=/bin/rm -rf /home/root/.cache/gstreamer-1.0 -#ExecStartPre=/bin/sleep 10 -ExecStart=/usr/bin/weston-launch -u root -- --idle-time=4294967 --gst-record --config=weston-mapviewer-demo.ini -ExecStop=/usr/bin/killall -s KILL weston -Type=simple - -[Install] -WantedBy=multi-user.target -Alias=weston.service diff --git a/recipes-demo-hmi/navigation/mapviewer-demo/weston-ready.conf b/recipes-demo-hmi/navigation/mapviewer-demo/weston-ready.conf new file mode 100644 index 000000000..e90eed5f8 --- /dev/null +++ b/recipes-demo-hmi/navigation/mapviewer-demo/weston-ready.conf @@ -0,0 +1,4 @@ +[Unit] +Requires=weston-ready.service +After=weston-ready.service + |