diff options
-rw-r--r-- | strata/genivi-demo-platform.morph | 6 | ||||
-rw-r--r-- | strata/ivi-common.morph | 12 | ||||
-rw-r--r-- | strata/ivi-common/automotive-message-broker.morph (renamed from strata/genivi-demo-platform/automotive-message-broker.morph) | 6 | ||||
-rw-r--r-- | systems/genivi-demo-platform-armv7lhf-jetson.morph | 2 | ||||
-rw-r--r-- | systems/genivi-demo-platform-x86_64-generic.morph | 2 |
5 files changed, 19 insertions, 9 deletions
diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph index 81072628..249afec3 100644 --- a/strata/genivi-demo-platform.morph +++ b/strata/genivi-demo-platform.morph @@ -2,7 +2,6 @@ name: genivi-demo-platform kind: stratum description: Components which make up the GENIVI demo platform. build-depends: -- morph: strata/cpp-common-libs.morph - morph: strata/genivi-demo-platform-libs.morph - morph: strata/qt5-tools.morph - morph: strata/qt5-tools-qtmultimedia.morph @@ -19,11 +18,6 @@ chunks: submodules: documentation/designdocument/cls: url: http://github.com/Pelagicore/Pelagicore-LaTeX-Class.git -- name: automotive-message-broker - morph: strata/genivi-demo-platform/automotive-message-broker.morph - repo: upstream:automotive-message-broker - ref: 5cac4bd2958ea24ac6913be5baa0dfcda6466089 - unpetrify-ref: '0.14' - name: audiomanager-poc morph: strata/genivi-demo-platform/audiomanager-poc.morph repo: upstream:audiomanager diff --git a/strata/ivi-common.morph b/strata/ivi-common.morph new file mode 100644 index 00000000..80c519b1 --- /dev/null +++ b/strata/ivi-common.morph @@ -0,0 +1,12 @@ +name: ivi-common +kind: stratum +description: Components shared with different IVI systems +build-depends: +- morph: strata/cpp-common-libs.morph +- morph: strata/glib-common.morph +chunks: +- name: automotive-message-broker + morph: strata/ivi-common/automotive-message-broker.morph + repo: upstream:automotive-message-broker + ref: 5cac4bd2958ea24ac6913be5baa0dfcda6466089 + unpetrify-ref: '0.14' diff --git a/strata/genivi-demo-platform/automotive-message-broker.morph b/strata/ivi-common/automotive-message-broker.morph index 2516cf29..50428735 100644 --- a/strata/genivi-demo-platform/automotive-message-broker.morph +++ b/strata/ivi-common/automotive-message-broker.morph @@ -1,6 +1,6 @@ name: automotive-message-broker kind: chunk -description: The GENIVI Automotive Message Broker +description: Automotive Message Broker framework build-system: cmake post-install-commands: - mkdir -p "$DESTDIR/usr/lib/systemd/system" @@ -9,12 +9,12 @@ post-install-commands: [Unit] Description=Automotive Message Broker After=syslog.target - + [Service] Type=dbus BusName=org.automotive.message.broker ExecStart=/usr/bin/ambd - + [Install] WantedBy=multi-user.target EOF diff --git a/systems/genivi-demo-platform-armv7lhf-jetson.morph b/systems/genivi-demo-platform-armv7lhf-jetson.morph index f61b61c2..27fbf166 100644 --- a/systems/genivi-demo-platform-armv7lhf-jetson.morph +++ b/systems/genivi-demo-platform-armv7lhf-jetson.morph @@ -41,6 +41,8 @@ strata: morph: strata/graphics-common.morph - name: input-common morph: strata/input-common.morph +- name: ivi-common + morph: strata/ivi-common.morph - name: mesa-common morph: strata/mesa-common.morph - name: x-common diff --git a/systems/genivi-demo-platform-x86_64-generic.morph b/systems/genivi-demo-platform-x86_64-generic.morph index e5c8c6cd..29518bbb 100644 --- a/systems/genivi-demo-platform-x86_64-generic.morph +++ b/systems/genivi-demo-platform-x86_64-generic.morph @@ -41,6 +41,8 @@ strata: morph: strata/graphics-common.morph - name: input-common morph: strata/input-common.morph +- name: ivi-common + morph: strata/ivi-common.morph - name: llvm-common morph: strata/llvm-common.morph - name: mesa-common |