summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <daniel.silverstone@codethink.co.uk>2014-09-30 09:49:02 (GMT)
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2014-09-30 09:49:02 (GMT)
commit72c82353d5a93cd1b53116cd025b5d6f3c2e71a6 (patch)
tree21ef83636753d0cd375e7f2c651de2ce5a0d52da
parent4f6f1df1ddab346af6eda019559149c7d2c4c2b0 (diff)
downloaddefinitions-72c82353d5a93cd1b53116cd025b5d6f3c2e71a6.tar.gz
Web and Qt HMI
-rw-r--r--strata/genivi-smartdevicelink.morph11
-rw-r--r--strata/genivi-smartdevicelink/smartdevicelink-qt.morph (renamed from strata/genivi-smartdevicelink/smartdevicelink.morph)2
-rw-r--r--strata/genivi-smartdevicelink/smartdevicelink-web.morph10
3 files changed, 20 insertions, 3 deletions
diff --git a/strata/genivi-smartdevicelink.morph b/strata/genivi-smartdevicelink.morph
index 477cee2..455149b 100644
--- a/strata/genivi-smartdevicelink.morph
+++ b/strata/genivi-smartdevicelink.morph
@@ -25,8 +25,15 @@ chunks:
build-depends:
- libapr-tarball
- libapr-util-tarball
-- name: smartdevicelink
- morph: strata/genivi-smartdevicelink/smartdevicelink.morph
+- name: smartdevicelink-qt
+ morph: strata/genivi-smartdevicelink/smartdevicelink-qt.morph
+ repo: upstream:smartdevicelink
+ ref: ct-mcr-1/danielsilverstone/smartdevicelink
+ unpetrify-ref: ct-mcr-1/danielsilverstone/jetson-genivi
+ build-depends:
+ - log4cxx
+- name: smartdevicelink-web
+ morph: strata/genivi-smartdevicelink/smartdevicelink-web.morph
repo: upstream:smartdevicelink
ref: ct-mcr-1/danielsilverstone/smartdevicelink
unpetrify-ref: ct-mcr-1/danielsilverstone/jetson-genivi
diff --git a/strata/genivi-smartdevicelink/smartdevicelink.morph b/strata/genivi-smartdevicelink/smartdevicelink-qt.morph
index 06dc032..9a7169e 100644
--- a/strata/genivi-smartdevicelink/smartdevicelink.morph
+++ b/strata/genivi-smartdevicelink/smartdevicelink-qt.morph
@@ -2,7 +2,7 @@ name: smartdevicelink
kind: chunk
configure-commands:
- - cmake -D HMI2=ON -DCMAKE_INSTALL_PREFIX="$PREFIX/smartdevicelink" .
+ - cmake -D HMI2=ON -DCMAKE_INSTALL_PREFIX="$PREFIX/smartdevicelink-qt" .
build-commands:
- make
install-commands:
diff --git a/strata/genivi-smartdevicelink/smartdevicelink-web.morph b/strata/genivi-smartdevicelink/smartdevicelink-web.morph
new file mode 100644
index 0000000..736f9ff
--- /dev/null
+++ b/strata/genivi-smartdevicelink/smartdevicelink-web.morph
@@ -0,0 +1,10 @@
+name: smartdevicelink
+kind: chunk
+
+configure-commands:
+ - cmake -DCMAKE_INSTALL_PREFIX="$PREFIX/smartdevicelink-web" .
+build-commands:
+ - make
+install-commands:
+ - make install DESTDIR="$DESTDIR"
+ - rm -rf "$DESTDIR/$(pwd)"