summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2017-08-23 15:45:29 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2017-08-24 12:45:36 (GMT)
commit54e447a9f1a9e94d68e6f5f616617ce49682192a (patch)
tree5af50958257dd4fdfaca3e6ef9ef8903e8eb7ada
parentaf7ceac058dd42fb04405b112c27968d4c17cb93 (diff)
downloaddefinitions-sam/fixes-for-buildstream.tar.gz
genivi: Fix build issues in Audiomanagersam/fixes-for-buildstream
If USE_BUILD_LIBS is enabled, the build fails under BuildStream. This seems to be because files get installed to $DESTDIR/buildstream/build which are then included in the artifacts. (This breaks subsequent builds as the /buildstream/build/ dir is expected to be empty until source is checked out.) https://gitlab.com/BuildStream/buildstream/issues/74 is the relevant BuildStream issue.
-rw-r--r--genivi/strata/genivi-demo-platform/audiomanager@gdp.morph5
1 files changed, 4 insertions, 1 deletions
diff --git a/genivi/strata/genivi-demo-platform/audiomanager@gdp.morph b/genivi/strata/genivi-demo-platform/audiomanager@gdp.morph
index 1522f3e..d5e4684 100644
--- a/genivi/strata/genivi-demo-platform/audiomanager@gdp.morph
+++ b/genivi/strata/genivi-demo-platform/audiomanager@gdp.morph
@@ -2,7 +2,8 @@ name: audiomanager@gdp
kind: chunk
configure-commands:
- |
- cmake -DWITH_PULSE_ROUTING_PLUGIN=ON \
+ cmake -DUSE_BUILD_LIBS=OFF \
+ -DWITH_PULSE_ROUTING_PLUGIN=ON \
-DWITH_PULSE_CONTROL_PLUGIN=ON \
-DWITH_ENABLED_IPC=DBUS \
-DWITH_DATABASE_STORAGE=OFF \
@@ -12,4 +13,6 @@ build-commands:
- make
install-commands:
- make DESTDIR="$DESTDIR" install
+# BuildStream builds break if files are installed to /tmp -- the element
+# itself builds fine, but subsequent builds do not.
- rm -R "$DESTDIR"/tmp/*