From 64677f85ef14e1de671c3475a0b6cba94ea3675d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 19 Feb 2016 14:09:07 +0000 Subject: Add navigation stratum Change-Id: Id307694528fb7eb70dc5eff8e7cea33ad3442e41 --- strata/genivi-demo-platform.morph | 5 ----- strata/genivi-demo-platform/navit.morph | 5 ----- strata/navigation.morph | 11 +++++++++++ strata/navigation/navit.morph | 5 +++++ systems/genivi-demo-platform-armv7lhf-jetson.morph | 2 ++ systems/genivi-demo-platform-x86_64-generic.morph | 2 ++ 6 files changed, 20 insertions(+), 10 deletions(-) delete mode 100644 strata/genivi-demo-platform/navit.morph create mode 100644 strata/navigation.morph create mode 100644 strata/navigation/navit.morph diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph index b314877c..9e0ad9d4 100644 --- a/strata/genivi-demo-platform.morph +++ b/strata/genivi-demo-platform.morph @@ -25,11 +25,6 @@ chunks: repo: upstream:audiomanager ref: bb65a4d0a18667baa64e5ba40104dc2cda06b299 unpetrify-ref: baserock/genivi/genivi-demo-platform -- name: navit - morph: strata/genivi-demo-platform/navit.morph - repo: upstream:navit-svn - ref: 358812af2c27c4abe324beb205e6d156b96fb1ea - unpetrify-ref: master - name: audiomanager@gdp morph: strata/genivi-demo-platform/audiomanager@gdp.morph repo: upstream:audiomanager diff --git a/strata/genivi-demo-platform/navit.morph b/strata/genivi-demo-platform/navit.morph deleted file mode 100644 index 2bdb09d5..00000000 --- a/strata/genivi-demo-platform/navit.morph +++ /dev/null @@ -1,5 +0,0 @@ -name: navit -kind: chunk -build-system: cmake -configure-commands: -- cmake . -DSAMPLE_MAP=n diff --git a/strata/navigation.morph b/strata/navigation.morph new file mode 100644 index 00000000..669f4084 --- /dev/null +++ b/strata/navigation.morph @@ -0,0 +1,11 @@ +name: navigation +kind: stratum +description: Stratum that provides navigation libraries / services +build-depends: +- morph: strata/core.morph +chunks: +- name: navit + morph: strata/navigation/navit.morph + repo: upstream:navit-svn + ref: 358812af2c27c4abe324beb205e6d156b96fb1ea + unpetrify-ref: master diff --git a/strata/navigation/navit.morph b/strata/navigation/navit.morph new file mode 100644 index 00000000..2bdb09d5 --- /dev/null +++ b/strata/navigation/navit.morph @@ -0,0 +1,5 @@ +name: navit +kind: chunk +build-system: cmake +configure-commands: +- cmake . -DSAMPLE_MAP=n diff --git a/systems/genivi-demo-platform-armv7lhf-jetson.morph b/systems/genivi-demo-platform-armv7lhf-jetson.morph index d683a33e..f6bded35 100644 --- a/systems/genivi-demo-platform-armv7lhf-jetson.morph +++ b/systems/genivi-demo-platform-armv7lhf-jetson.morph @@ -27,6 +27,8 @@ strata: morph: strata/multimedia-common.morph - name: multimedia-gstreamer morph: strata/multimedia-gstreamer.morph +- name: navigation + morph: strata/navigation.morph - name: genivi morph: strata/genivi.morph - name: wayland-generic diff --git a/systems/genivi-demo-platform-x86_64-generic.morph b/systems/genivi-demo-platform-x86_64-generic.morph index 7b92faf1..724d3bf9 100644 --- a/systems/genivi-demo-platform-x86_64-generic.morph +++ b/systems/genivi-demo-platform-x86_64-generic.morph @@ -27,6 +27,8 @@ strata: morph: strata/multimedia-common.morph - name: multimedia-gstreamer morph: strata/multimedia-gstreamer.morph +- name: navigation + morph: strata/navigation.morph - name: genivi morph: strata/genivi.morph - name: wayland-generic -- cgit v1.2.1