diff options
author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2014-10-01 14:06:56 +0000 |
---|---|---|
committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2014-10-01 14:06:56 +0000 |
commit | 040709e3bc8d7cb6c304e6aa1db25a2809204143 (patch) | |
tree | 679d0cd932ad866414f3efb4cdeb970dd3965c2f | |
parent | 72c82353d5a93cd1b53116cd025b5d6f3c2e71a6 (diff) | |
download | definitions-baserock/ps/kinnison-smartdevicelink.tar.gz |
More updates for SDL HMIbaserock/ps/kinnison-smartdevicelink
4 files changed, 9 insertions, 5 deletions
diff --git a/strata/genivi-smartdevicelink.morph b/strata/genivi-smartdevicelink.morph index 455149bc..475c1fd8 100644 --- a/strata/genivi-smartdevicelink.morph +++ b/strata/genivi-smartdevicelink.morph @@ -5,6 +5,7 @@ build-depends: - morph: strata/genivi-foundation.morph - morph: strata/genivi.morph - morph: strata/audio-bluetooth.morph +- morph: strata/multimedia.morph - morph: strata/qt5-tools-new.morph chunks: - name: libapr-tarball diff --git a/strata/genivi-smartdevicelink/smartdevicelink-qt.morph b/strata/genivi-smartdevicelink/smartdevicelink-qt.morph index 9a7169ea..0247be5d 100644 --- a/strata/genivi-smartdevicelink/smartdevicelink-qt.morph +++ b/strata/genivi-smartdevicelink/smartdevicelink-qt.morph @@ -1,8 +1,8 @@ -name: smartdevicelink +name: smartdevicelink-qt kind: chunk configure-commands: - - cmake -D HMI2=ON -DCMAKE_INSTALL_PREFIX="$PREFIX/smartdevicelink-qt" . + - cmake -D HMI2=ON -DCMAKE_INSTALL_PREFIX="$PREFIX/smartdevicelink-qt" -DEXTENDED_MEDIA_MODE=ON --debug-output . build-commands: - make install-commands: diff --git a/strata/genivi-smartdevicelink/smartdevicelink-web.morph b/strata/genivi-smartdevicelink/smartdevicelink-web.morph index 736f9ffc..99f0cadb 100644 --- a/strata/genivi-smartdevicelink/smartdevicelink-web.morph +++ b/strata/genivi-smartdevicelink/smartdevicelink-web.morph @@ -1,10 +1,11 @@ -name: smartdevicelink +name: smartdevicelink-web kind: chunk configure-commands: - - cmake -DCMAKE_INSTALL_PREFIX="$PREFIX/smartdevicelink-web" . + - cmake -DCMAKE_INSTALL_PREFIX="$PREFIX/smartdevicelink-web" -DEXTENDED_MEDIA_MODE=ON . build-commands: - make install-commands: - make install DESTDIR="$DESTDIR" - rm -rf "$DESTDIR/$(pwd)" + - cp -a src/components/HMI "$DESTDIR/$PREFIX/smartdevicelink-web/" diff --git a/systems/genivi-plusplus-system-x86_64-generic.morph b/systems/genivi-plusplus-system-x86_64-generic.morph index 561ecb47..2768febd 100644 --- a/systems/genivi-plusplus-system-x86_64-generic.morph +++ b/systems/genivi-plusplus-system-x86_64-generic.morph @@ -19,8 +19,10 @@ strata: morph: strata/audio-bluetooth.morph - name: x-common morph: strata/x-common.morph -- name: multimedia-gstreamer-0.10 +- name: multimedia morph: strata/multimedia.morph +- name: multimedia-gstreamer-0.10 + morph: strata/multimedia-gstreamer-0.10.morph - name: genivi morph: strata/genivi.morph - name: wayland-generic |