summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <daniel.silverstone@codethink.co.uk>2014-09-29 13:30:08 (GMT)
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2014-09-29 13:30:08 (GMT)
commit667390f06a5cb4842e6396b6fb06db5e75724880 (patch)
tree458f1af00d8d1afeec3028be99fd110b16f971c8
parentcb6ecb2e2fe9a3d63fd7fe11f9f7d4dc481b9307 (diff)
downloaddefinitions-667390f06a5cb4842e6396b6fb06db5e75724880.tar.gz
fixme: more bits
-rw-r--r--strata/core.morph4
-rw-r--r--strata/genivi-smartdevicelink.morph16
-rw-r--r--strata/genivi-smartdevicelink/smartdevicelink.morph14
-rw-r--r--strata/multimedia-gstreamer-0.10.morph4
-rw-r--r--systems/genivi-plusplus-system-x86_64-generic.morph4
5 files changed, 18 insertions, 24 deletions
diff --git a/strata/core.morph b/strata/core.morph
index 4c6a23b..14bdf71 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -13,8 +13,8 @@ chunks:
- name: cmake
morph: strata/core/cmake.morph
repo: upstream:cmake
- ref: 99c4f0a49237633372f218a44e3503e0a2bddae6
- unpetrify-ref: baserock/morph
+ ref: 0b3781e4c497566acaa504d4106d11c02a642501
+ unpetrify-ref: v2.8.12.2
build-depends: []
- name: gdbm
morph: strata/core/gdbm.morph
diff --git a/strata/genivi-smartdevicelink.morph b/strata/genivi-smartdevicelink.morph
index 38a2269..477cee2 100644
--- a/strata/genivi-smartdevicelink.morph
+++ b/strata/genivi-smartdevicelink.morph
@@ -1,4 +1,4 @@
-name: smartdevicelink
+name: genivi-smartdevicelink
kind: stratum
description: Software for Smart Device Link by Ford
build-depends:
@@ -25,10 +25,10 @@ chunks:
build-depends:
- libapr-tarball
- libapr-util-tarball
-#- name: smartdevicelink
-# morph: strata/genivi-smartdevicelink/smartdevicelink.morph
-# repo: upstream:smartdevicelink
-# ref: ct-mcr-1/danielsilverstone/jetson-genivi
-# unpetrify-ref: 5a59c031430712fe270e72e8521866193c27fa56
-# build-depends:
-# - log4cxx
+- name: smartdevicelink
+ morph: strata/genivi-smartdevicelink/smartdevicelink.morph
+ repo: upstream:smartdevicelink
+ ref: ct-mcr-1/danielsilverstone/smartdevicelink
+ unpetrify-ref: ct-mcr-1/danielsilverstone/jetson-genivi
+ build-depends:
+ - log4cxx
diff --git a/strata/genivi-smartdevicelink/smartdevicelink.morph b/strata/genivi-smartdevicelink/smartdevicelink.morph
index 1ab5cad..06dc032 100644
--- a/strata/genivi-smartdevicelink/smartdevicelink.morph
+++ b/strata/genivi-smartdevicelink/smartdevicelink.morph
@@ -2,17 +2,9 @@ name: smartdevicelink
kind: chunk
configure-commands:
- - cmake -D HMI2=ON .
+ - cmake -D HMI2=ON -DCMAKE_INSTALL_PREFIX="$PREFIX/smartdevicelink" .
build-commands:
- make
install-commands:
- - make install 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
+ - make install DESTDIR="$DESTDIR"
+ - rm -rf "$DESTDIR/$(pwd)"
diff --git a/strata/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10.morph
index ae5fe65..5b0cc28 100644
--- a/strata/multimedia-gstreamer-0.10.morph
+++ b/strata/multimedia-gstreamer-0.10.morph
@@ -13,8 +13,8 @@ chunks:
build-depends: []
- name: gstreamer
repo: upstream:gstreamer
- ref: c7e4a97d26396882960fd399b1a5e298e40d2a35
- unpetrify-ref: baserock/morph/0.10
+ ref: 60185a634b9322758faf0578687594133cd9e6fa
+ unpetrify-ref: baserock/james/0.10
build-depends:
- orc
- name: gstreamer-plugins-base
diff --git a/systems/genivi-plusplus-system-x86_64-generic.morph b/systems/genivi-plusplus-system-x86_64-generic.morph
index 57ff381..9da8503 100644
--- a/systems/genivi-plusplus-system-x86_64-generic.morph
+++ b/systems/genivi-plusplus-system-x86_64-generic.morph
@@ -37,10 +37,12 @@ strata:
morph: strata/qt5-tools-new.morph
- name: genivi-smartdevicelink
morph: strata/genivi-smartdevicelink.morph
+- name: tools
+ morph: strata/tools.morph
configuration-extensions:
- set-hostname
- add-config-files
- simple-network
- nfsboot
- install-files
-- strip-gplv3
+#- strip-gplv3