diff options
4 files changed, 9 insertions, 5 deletions
diff --git a/strata/genivi-smartdevicelink.morph b/strata/genivi-smartdevicelink.morph index ea477f34..e20f574f 100644 --- a/strata/genivi-smartdevicelink.morph +++ b/strata/genivi-smartdevicelink.morph @@ -5,7 +5,8 @@ build-depends: - morph: strata/genivi-foundation.morph - morph: strata/genivi.morph - morph: strata/audio-bluetooth.morph -- morph: strata/qt5-tools-jetson.morph +- morph: strata/multimedia.morph +- morph: strata/qt5-tools-new.morph chunks: - name: libapr-tarball repo: upstream:libapr-tarball diff --git a/strata/genivi-smartdevicelink/smartdevicelink-qt.morph b/strata/genivi-smartdevicelink/smartdevicelink-qt.morph index 65de97e3..c9d0552c 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-armv7lhf-jetson.morph b/systems/genivi-plusplus-system-armv7lhf-jetson.morph index c5164830..00b30514 100644 --- a/systems/genivi-plusplus-system-armv7lhf-jetson.morph +++ b/systems/genivi-plusplus-system-armv7lhf-jetson.morph @@ -19,6 +19,8 @@ strata: morph: strata/audio-bluetooth.morph - name: x-common morph: strata/x-common.morph +- name: multimedia + morph: strata/multimedia.morph - name: multimedia-gstreamer-0.10 morph: strata/multimedia-gstreamer-0.10.morph - name: genivi |