From 3cc80df78623edf03f7b203ff47828f77e5cf4cd Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Fri, 30 Aug 2019 14:18:23 -0400 Subject: Update demo features for switch to ondemandnavi 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 --- .../files/cluster-demo-network-conf.service | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 recipes-config/cluster-demo-network-config/files/cluster-demo-network-conf.service (limited to 'recipes-config/cluster-demo-network-config/files') diff --git a/recipes-config/cluster-demo-network-config/files/cluster-demo-network-conf.service b/recipes-config/cluster-demo-network-config/files/cluster-demo-network-conf.service new file mode 100644 index 00000000..1a6e2d8b --- /dev/null +++ b/recipes-config/cluster-demo-network-config/files/cluster-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 -- cgit 1.2.3-korg