Update sdefs to take advantage of #include feature

Use the #include feature introduced in Legato 17.05 to allow the mangOH Green and Red SDEFs to be based on the wifi SDEF. The advantage of this approach is that the mangOH SDEFs should no longer have to be modified to stay in sync with changes to the Legato SDEFs.

Update sdefs to take advantage of #include feature
a9f2cccc · David Frey · cf4de69c · a9f2cccc · a9f2cccc · a9f2cccc
Commit a9f2cccc authored May 18, 2017 by David Frey
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 110 deletions

Makefile Makefile +2 -6

mangOH_Green.sdef mangOH_Green.sdef +7 -59

mangOH_Red.sdef mangOH_Red.sdef +7 -45

No files found.
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,9 @@
 # inclusion of these files, make needs to be invoked with a --include-dir=$LEGATO_ROOT parameter.
 TARGET:=wp85

-# Load default PA definitions from main Legato Makefile
-$(shell grep 'export PA_DIR .*' $(LEGATO_ROOT)/Makefile > legatoDefs.mk)
-$(shell grep 'export .*_PA_.* .*' $(LEGATO_ROOT)/Makefile >> legatoDefs.mk)
-include legatoDefs.mk

 # Default targets definitions from Framework
-include targetDefs.$(TARGET)
+include targetDefs

 .PHONY: all $(TARGET)
 all: $(TARGET)
@@ -47,4 +43,4 @@ $(TARGET):
 	#mangOH_Red.sdef

 clean:
-	rm -rf /tmp/mkbuild_* _build_* *.update legatoDefs.mk
+	rm -rf /tmp/mkbuild_* _build_* *.update
--- a/mangOH_Green.sdef
+++ b/mangOH_Green.sdef
 //--------------------------------------------------------------------------------------------------
-// MangOH system definition that includes essential modem and positioning services
-// plus available MangOH apps
+// mangOH Green system definition that extends the wifi sdef from Legato.
 //
 // Copyright (C) Sierra Wireless Inc.  Use of this work is subject to license.
 //--------------------------------------------------------------------------------------------------

-buildVars:
-{
-	LEGATO_WIFI_ROOT = $LEGATO_ROOT/modules/WiFi
-	LEGATO_WIFI_PA = ti
-}
+#include "$LEGATO_ROOT/modules/WiFi/wifi.sdef"

 apps:
 {
-    // Platform services.
-    $LEGATO_ROOT/apps/platformServices/airVantage/avcService
-    $LEGATO_ROOT/apps/platformServices/audioService
-    $LEGATO_ROOT/apps/platformServices/cellNetService
-    $LEGATO_ROOT/apps/platformServices/dataConnectionService
-    $LEGATO_ROOT/apps/platformServices/fwupdateService
-    $LEGATO_ROOT/apps/platformServices/modemService
-    $LEGATO_ROOT/apps/platformServices/positioningService
-    $LEGATO_ROOT/apps/platformServices/powerMgr
-    $LEGATO_ROOT/apps/platformServices/secStore
-    $LEGATO_ROOT/apps/platformServices/smsInboxService
-    $LEGATO_ROOT/apps/platformServices/voiceCallService
-    $LEGATO_ROOT/apps/platformServices/gpioService
-    $LEGATO_ROOT/apps/platformServices/atClient
-    $LEGATO_ROOT/apps/platformServices/atServer
-    $LEGATO_ROOT/apps/platformServices/spiService
-    $LEGATO_ROOT/apps/platformServices/devMode
-
-    $LEGATO_WIFI_ROOT/service/wifiService
-    $LEGATO_WIFI_ROOT/apps/sample/wifiClientTest/wifiClientTest
-    $LEGATO_WIFI_ROOT/apps/sample/wifiApTest/wifiApTest
-    $LEGATO_WIFI_ROOT/apps/sample/wifiWebAp/wifiWebAp
-    $LEGATO_WIFI_ROOT/apps/tools/wifi/wifi
-
    $MANGOH_ROOT/apps/GpioExpander/gpioExpanderService/gpioExpanderServiceGreen

    $MANGOH_ROOT/apps/MuxControl/muxCtrlService/muxCtrlService
    $MANGOH_ROOT/apps/MuxControl/tools/muxCtrlTools

    $MANGOH_ROOT/apps/MqttClient/mqttClient
-    $MANGOH_ROOT/apps/DataRouter/dataRouter
-    $MANGOH_ROOT/apps/DataRouter/drTool/drTool
-    $MANGOH_ROOT/apps/ArduinoBridge/arduinoBridge
+    // Data Router disabled until it can be updated
+    // $MANGOH_ROOT/apps/DataRouter/dataRouter
+    // $MANGOH_ROOT/apps/DataRouter/drTool/drTool
+    // $MANGOH_ROOT/apps/ArduinoBridge/arduinoBridge
    $MANGOH_ROOT/apps/SocialService/socialService
-
-    // Command-line tools.
-    $LEGATO_ROOT/apps/tools/tools
 }

 commands:
 {
-    cm = tools:/bin/cm
-    fwupdate = tools:/bin/fwupdate
-    secstore = tools:/bin/secstore
-    pmtool = tools:/bin/pmtool
-    gnss = tools:/bin/gnss
-    uartMode = tools:/bin/uartMode
-
-    wifi = wifi:/bin/wifi
-
    mux = muxCtrlTools:/bin/mux
-
-    dr = drTool:/bin/dr
-
+    // dr = drTool:/bin/dr
    twitter = socialService:/bin/twitter
 }

-bindings:
-{
-    <root>.le_fwupdate -> fwupdateService.le_fwupdate
-}
-
-interfaceSearch:
-{
-    interfaces/modemServices
-    interfaces/positioning
-}
--- a/mangOH_Red.sdef
+++ b/mangOH_Red.sdef
 //--------------------------------------------------------------------------------------------------
-// MangOH system definition that includes essential modem and positioning services
-// plus available MangOH apps
+// mangOH Red system definition that extends the wifi sdef from Legato.
 //
 // Copyright (C) Sierra Wireless Inc.  Use of this work is subject to license.
 //--------------------------------------------------------------------------------------------------

+#include "$LEGATO_ROOT/modules/WiFi/wifi.sdef"
+
 apps:
 {
-    // Platform services.
-    $LEGATO_ROOT/apps/platformServices/airVantage/avcService
-    $LEGATO_ROOT/apps/platformServices/audioService
-    $LEGATO_ROOT/apps/platformServices/cellNetService
-    $LEGATO_ROOT/apps/platformServices/dataConnectionService
-    $LEGATO_ROOT/apps/platformServices/fwupdateService
-    $LEGATO_ROOT/apps/platformServices/modemService
-    $LEGATO_ROOT/apps/platformServices/positioningService
-    $LEGATO_ROOT/apps/platformServices/powerMgr
-    $LEGATO_ROOT/apps/platformServices/secStore
-    $LEGATO_ROOT/apps/platformServices/smsInboxService
-    $LEGATO_ROOT/apps/platformServices/voiceCallService
-    $LEGATO_ROOT/apps/platformServices/gpioService
-    $LEGATO_ROOT/apps/platformServices/atClient
-    $LEGATO_ROOT/apps/platformServices/atServer
-    $LEGATO_ROOT/apps/platformServices/spiService
-    $LEGATO_ROOT/apps/platformServices/devMode
-
    $MANGOH_ROOT/apps/GpioExpander/gpioExpanderService/gpioExpanderServiceRed

    // TODO: MuxControl was written specifically for mangOH Green.  Perhaps mangOH Red needs a
@@ -33,37 +16,16 @@ apps:
    // $MANGOH_ROOT/apps/MuxControl/tools/muxCtrlTools

    $MANGOH_ROOT/apps/MqttClient/mqttClient
-    $MANGOH_ROOT/apps/DataRouter/dataRouter
-    $MANGOH_ROOT/apps/DataRouter/drTool/drTool
+    // Data Router disabled until it can be updated
+    // $MANGOH_ROOT/apps/DataRouter/dataRouter
+    // $MANGOH_ROOT/apps/DataRouter/drTool/drTool
    $MANGOH_ROOT/apps/SocialService/socialService
-
-    // Command-line tools.
-    $LEGATO_ROOT/apps/tools/tools
 }

 commands:
 {
-    cm = tools:/bin/cm
-    fwupdate = tools:/bin/fwupdate
-    secstore = tools:/bin/secstore
-    pmtool = tools:/bin/pmtool
-    gnss = tools:/bin/gnss
-    uartMode = tools:/bin/uartMode
-
    // mux = muxCtrlTools:/bin/mux
-
-    dr = drTool:/bin/dr
-
+    // dr = drTool:/bin/dr
    twitter = socialService:/bin/twitter
 }

-bindings:
-{
-    <root>.le_fwupdate -> fwupdateService.le_fwupdate
-}
-
-interfaceSearch:
-{
-    interfaces/modemServices
-    interfaces/positioning
-}