diff options
author | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2014-10-05 07:16:31 +0000 |
---|---|---|
committer | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2014-10-05 11:08:36 +0000 |
commit | a18d755ef9eb0b321ce904657c8269fff3d16cf6 (patch) | |
tree | d50a8f75143efb01f88ce2d67df19d86ed69b3c9 /strata | |
parent | cb9966aa9206d2e4ffc6ace54da8502a91f3b0c2 (diff) | |
download | definitions-baserock/ps/jt-gdp.tar.gz |
Tweaks to make build on x86 - needs tidyupbaserock/ps/jt-gdp
Diffstat (limited to 'strata')
-rw-r--r-- | strata/genivi-demo-platform.morph | 4 | ||||
-rw-r--r-- | strata/genivi-smartdevicelink/smartdevicelink-qt.morph | 11 | ||||
-rw-r--r-- | strata/mesa-common/mesa.morph | 2 |
3 files changed, 4 insertions, 13 deletions
diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph index d0530622..1ef0932e 100644 --- a/strata/genivi-demo-platform.morph +++ b/strata/genivi-demo-platform.morph @@ -36,8 +36,8 @@ chunks: - name: dbus-c++ morph: strata/genivi-demo-platform/dbus-c++.morph repo: upstream:dbus-c++ - ref: master - unpetrify-ref: master + ref: 8d351eec25430651acbac014e44ec011fac32d57 + unpetrify-ref: baserock/genivi-demo-platform build-depends: [] - name: libxslt repo: upstream:libxslt diff --git a/strata/genivi-smartdevicelink/smartdevicelink-qt.morph b/strata/genivi-smartdevicelink/smartdevicelink-qt.morph index 91e1f1fe..f7967a9c 100644 --- a/strata/genivi-smartdevicelink/smartdevicelink-qt.morph +++ b/strata/genivi-smartdevicelink/smartdevicelink-qt.morph @@ -1,18 +1,9 @@ name: smartdevicelink-qt kind: chunk - +max-jobs: 1 configure-commands: - cmake -D HMI2=ON -DCMAKE_INSTALL_PREFIX="$PREFIX/smartdevicelink-qt" -DEXTENDED_MEDIA_MODE=ON --debug-output . build-commands: - make install-commands: - make install DESTDIR=$DESTDIR - - mkdir -p $DESTDIR/opt/smartlink/include - - mkdir -p $DESTDIR/opt/smartlink/bin - - mkdir -p $DESTDIR/opt/smartlink/lib - - mkdir -p $DESTDIR/opt/smartlink/HMI - - cp -r SDL_Core/bin/* $DESTDIR/opt/smartlink/bin - - cp -r SDL_Core/include/* $DESTDIR/opt/smartlink/include - - cp -r SDL_Core/lib/* $DESTDIR/opt/smartlink/lib - - cp -r SDL_Core/src/components/HMI/* $DESTDIR/opt/smartlink/HMI - - echo "/opt/smartlink/HMI/index.html" > $DESTDIR/opt/smartlink/bin/hmi_link diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph index 58e74f99..d31693f6 100644 --- a/strata/mesa-common/mesa.morph +++ b/strata/mesa-common/mesa.morph @@ -4,7 +4,7 @@ build-system: autotools configure-commands: - | cpu=$(echo $TARGET | cut -d '-' -f 1) - EXTRAARGS=--disable-gallium-egl + EXTRAARGS=--enable-gallium-egl case "$cpu" in x86_32|x64_64) DRIDRIVERS=intel,i915,i965,swrast |