summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <daniel.silverstone@codethink.co.uk>2014-09-22 12:46:05 (GMT)
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2014-09-22 12:46:05 (GMT)
commitfec5566131a117848333cd2b64dea8aa42e871f7 (patch)
tree424333c28ac1c757e8d332c3ceb550bb863628a7
parent5aefe187a5917c67c7af0d7ebcbf95389408fe85 (diff)
downloaddefinitions-fec5566131a117848333cd2b64dea8aa42e871f7.tar.gz
fixme: more bits
-rw-r--r--strata/bsp-jetson-devel.morph4
-rw-r--r--strata/bsp-jetson-devel/jetson-linux.morph (renamed from strata/bsp-jetson-devel/linux.morph)0
-rw-r--r--strata/genivi-smartdevicelink.morph38
-rw-r--r--systems/genivi-plusplus-system-armv7lhf-jetson.morph4
4 files changed, 22 insertions, 24 deletions
diff --git a/strata/bsp-jetson-devel.morph b/strata/bsp-jetson-devel.morph
index 98bf8da..5a4adb7 100644
--- a/strata/bsp-jetson-devel.morph
+++ b/strata/bsp-jetson-devel.morph
@@ -18,8 +18,8 @@ chunks:
unpetrify-ref: baserock/arm/tegra-uboot-btrfs
build-depends:
- device-tree-compiler
-- name: linux
- morph: strata/bsp-jetson-devel/linux.morph
+- name: jetson-linux
+ morph: strata/bsp-jetson-devel/jetson-linux.morph
repo: upstream:linux
ref: 4e9de37d16981f7c1b31feb41ff0e553ba489be0
unpetrify-ref: baserock/arm/tegra-3.10
diff --git a/strata/bsp-jetson-devel/linux.morph b/strata/bsp-jetson-devel/jetson-linux.morph
index 1d3298e..1d3298e 100644
--- a/strata/bsp-jetson-devel/linux.morph
+++ b/strata/bsp-jetson-devel/jetson-linux.morph
diff --git a/strata/genivi-smartdevicelink.morph b/strata/genivi-smartdevicelink.morph
index 4167077..6dfb349 100644
--- a/strata/genivi-smartdevicelink.morph
+++ b/strata/genivi-smartdevicelink.morph
@@ -1,17 +1,12 @@
+name: smartdevicelink
kind: stratum
-name: smartdevicelink
description: Software for Smart Device Link by Ford
build-depends:
- - morph: strata/genivi-foundation.morph
- - morph: strata/genivi.morph
- - morph: strata/audio-bluetooth.morph
- - morph: strata/qt5-tools-jetson.morph
+- morph: strata/genivi-foundation.morph
+- morph: strata/genivi.morph
+- morph: strata/audio-bluetooth.morph
+- morph: strata/qt5-tools-jetson.morph
chunks:
-#- name: libapr
-# repo: upstream:libapr
-# morph: strata/smartdevicelink/libapr.morph
-# ref: 1.5.1
-# build-depends: []
- name: libapr-tarball
repo: upstream:libapr-tarball
ref: dea1efeb7f60fc6848e1e72b3fc973d0057565db
@@ -24,15 +19,16 @@ chunks:
unpetrify-ref: baserock/morph
build-depends:
- libapr-tarball
-- name: log4cxx
+- name: log4cxx
repo: upstream:log4cxx
- ref: master
- build-depends:
- - libapr-tarball
- - libapr-util-tarball
-- name: smartdevicelink
- repo: upstream:smartdevicelink
- morph: strata/genivi-smartdevicelink/smartdevicelink.morph
- ref: 5a59c031430712fe270e72e8521866193c27fa56
- build-depends:
- - log4cxx
+ ref: master
+ 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
diff --git a/systems/genivi-plusplus-system-armv7lhf-jetson.morph b/systems/genivi-plusplus-system-armv7lhf-jetson.morph
index 4180d66..0b95d9c 100644
--- a/systems/genivi-plusplus-system-armv7lhf-jetson.morph
+++ b/systems/genivi-plusplus-system-armv7lhf-jetson.morph
@@ -35,8 +35,10 @@ strata:
morph: strata/weston-genivi.morph
- name: qt5-tools-jetson
morph: strata/qt5-tools-jetson.morph
-- name: smartdevicelink
+- name: genivi-smartdevicelink
morph: strata/genivi-smartdevicelink.morph
+- name: tools
+ morph: strata/tools.morph
configuration-extensions:
- set-hostname
- add-config-files