diff options
| author | Francisco Redondo <francisco.marchena@codethink.co.uk> | 2016-04-06 10:16:34 +0000 |
|---|---|---|
| committer | Francisco Redondo <francisco.marchena@codethink.co.uk> | 2016-04-06 10:16:34 +0000 |
| commit | 72f4c0f1d371b3169bd89262ca9c6c877e4a05df (patch) | |
| tree | 227edd39b574801a3bf1559f5177400967c871c0 | |
| parent | aae6c313a831b8a5d876b89e351ef1fbe3b7741d (diff) | |
| download | infrastructure-72f4c0f1d371b3169bd89262ca9c6c877e4a05df.tar.gz | |
Revert "Move automotive-message-broke to ivi-common"
This reverts commit aae6c313a831b8a5d876b89e351ef1fbe3b7741d.
Change-Id: I09bb426f2d8199d3edc45a4d707ff718b602e945
| -rw-r--r-- | strata/genivi-demo-platform.morph | 5 | ||||
| -rw-r--r-- | strata/genivi-demo-platform/automotive-message-broker.morph (renamed from strata/ivi-common/automotive-message-broker.morph) | 6 | ||||
| -rw-r--r-- | strata/ivi-common.morph | 11 | ||||
| -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, 8 insertions, 22 deletions
diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph index 249afec3..50a2e04b 100644 --- a/strata/genivi-demo-platform.morph +++ b/strata/genivi-demo-platform.morph @@ -18,6 +18,11 @@ 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/automotive-message-broker.morph b/strata/genivi-demo-platform/automotive-message-broker.morph index 50428735..2516cf29 100644 --- a/strata/ivi-common/automotive-message-broker.morph +++ b/strata/genivi-demo-platform/automotive-message-broker.morph @@ -1,6 +1,6 @@ name: automotive-message-broker kind: chunk -description: Automotive Message Broker framework +description: The GENIVI Automotive Message Broker 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/strata/ivi-common.morph b/strata/ivi-common.morph deleted file mode 100644 index a4c5403a..00000000 --- a/strata/ivi-common.morph +++ /dev/null @@ -1,11 +0,0 @@ -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/systems/genivi-demo-platform-armv7lhf-jetson.morph b/systems/genivi-demo-platform-armv7lhf-jetson.morph index cfaaee00..b2eef775 100644 --- a/systems/genivi-demo-platform-armv7lhf-jetson.morph +++ b/systems/genivi-demo-platform-armv7lhf-jetson.morph @@ -39,8 +39,6 @@ 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 9f2d81dd..17f077ad 100644 --- a/systems/genivi-demo-platform-x86_64-generic.morph +++ b/systems/genivi-demo-platform-x86_64-generic.morph @@ -39,8 +39,6 @@ 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 2b0c6e1d..a8383fbf 100644 --- a/systems/ivi-system-armv7lhf-jetson.morph +++ b/systems/ivi-system-armv7lhf-jetson.morph @@ -29,8 +29,6 @@ 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 a0c0b566..63355a48 100644 --- a/systems/ivi-system-x86_64.morph +++ b/systems/ivi-system-x86_64.morph @@ -29,8 +29,6 @@ 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 |