diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2019-08-30 14:18:23 -0400 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2019-09-02 15:00:55 +0000 |
| commit | f19f2f6572adf3825e60ceb5e18e3e35d1995bec (patch) | |
| tree | 780b84b6f18440838cadae532904374b8352ada5 /recipes-demo-hmi/navigation/mapviewer-demo | |
| parent | 80f21c014fc13dbd624e3ed6346b3d991615e28c (diff) | |
Update demo features for switch to ondemandnavihalibut_8.0.1halibut/8.0.18.0.1
The ondemandnavi navigation application does not work with the
mapviewer cluster demo application, so update the logic to handle
the agl-cluster-demo-support feature in packagegroup-agl-demo-platform
to not pull it in when using ondemandnavi as the virtual/navigation
provider. Since the plan is to replace mapviewer with an equivalent
QtLocation based map streamer for the cluster demo, the mapviewer-demo
recipe has also been replaced with a more generically named
cluster-demo-network-config recipe. Additionally, the agl-demo-preload
feature logic has been tweaked to not pull in the map package for the
old navigation application when using ondemandnavi.
Bug-AGL: SPEC-2576
Change-Id: I57b45ab152f9fab6cee97d570be1949136cd39eb
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'recipes-demo-hmi/navigation/mapviewer-demo')
| -rw-r--r-- | recipes-demo-hmi/navigation/mapviewer-demo/mapviewer-demo-network-conf.service | 15 | ||||
| -rw-r--r-- | recipes-demo-hmi/navigation/mapviewer-demo/weston-ready.conf | 4 |
2 files changed, 0 insertions, 19 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 deleted file mode 100644 index 1a6e2d8b7..000000000 --- a/recipes-demo-hmi/navigation/mapviewer-demo/mapviewer-demo-network-conf.service +++ /dev/null @@ -1,15 +0,0 @@ -[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/weston-ready.conf b/recipes-demo-hmi/navigation/mapviewer-demo/weston-ready.conf deleted file mode 100644 index e90eed5f8..000000000 --- a/recipes-demo-hmi/navigation/mapviewer-demo/weston-ready.conf +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Requires=weston-ready.service -After=weston-ready.service - |