diff options
author | Javier Jardón <jjardon@gnome.org> | 2016-04-01 18:35:21 +0000 |
---|---|---|
committer | Javier Jardón <jjardon@gnome.org> | 2016-04-05 19:04:19 +0000 |
commit | aae6c313a831b8a5d876b89e351ef1fbe3b7741d (patch) | |
tree | 13bab98db1bd93c56d8b93fc42422adea4ec7635 | |
parent | 1caf6cf3ae4aba0fe0225ff131417920cd6c79e7 (diff) | |
download | definitions-aae6c313a831b8a5d876b89e351ef1fbe3b7741d.tar.gz |
Move automotive-message-broke to ivi-common
Currently this module is used by GENIVI and AGL
Change-Id: I3a867e64cd650088342256dcda3974f04d5ef110
-rw-r--r-- | strata/genivi-demo-platform.morph | 5 | ||||
-rw-r--r-- | strata/ivi-common.morph | 11 | ||||
-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 | ||||
-rw-r--r-- | systems/ivi-system-armv7lhf-jetson.morph | 2 | ||||
-rw-r--r-- | systems/ivi-system-x86_64.morph | 2 |
7 files changed, 22 insertions, 8 deletions
diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph index 50a2e04b..249afec3 100644 --- a/strata/genivi-demo-platform.morph +++ b/strata/genivi-demo-platform.morph @@ -18,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..a4c5403a --- /dev/null +++ b/strata/ivi-common.morph @@ -0,0 +1,11 @@ +name: ivi-common +kind: stratum +description: Components shared with different IVI systems +build-depends: +- morph: strata/core.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 b2eef775..cfaaee00 100644 --- a/systems/genivi-demo-platform-armv7lhf-jetson.morph +++ b/systems/genivi-demo-platform-armv7lhf-jetson.morph @@ -39,6 +39,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 17f077ad..9f2d81dd 100644 --- a/systems/genivi-demo-platform-x86_64-generic.morph +++ b/systems/genivi-demo-platform-x86_64-generic.morph @@ -39,6 +39,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 diff --git a/systems/ivi-system-armv7lhf-jetson.morph b/systems/ivi-system-armv7lhf-jetson.morph index a8383fbf..2b0c6e1d 100644 --- a/systems/ivi-system-armv7lhf-jetson.morph +++ b/systems/ivi-system-armv7lhf-jetson.morph @@ -29,6 +29,8 @@ strata: morph: strata/icu-common.morph - name: input-common morph: strata/input-common.morph +- name: ivi-common + morph: strata/ivi-common.morph - name: libdrm-common morph: strata/libdrm-common.morph - name: libsoup-common diff --git a/systems/ivi-system-x86_64.morph b/systems/ivi-system-x86_64.morph index 63355a48..a0c0b566 100644 --- a/systems/ivi-system-x86_64.morph +++ b/systems/ivi-system-x86_64.morph @@ -29,6 +29,8 @@ strata: morph: strata/icu-common.morph - name: input-common morph: strata/input-common.morph +- name: ivi-common + morph: strata/ivi-common.morph - name: libdrm-common morph: strata/libdrm-common.morph - name: libsoup-common |