summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Thomas <james.thomas@codethink.co.uk>2014-10-04 21:59:19 (GMT)
committerJames Thomas <james.thomas@codethink.co.uk>2014-10-04 21:59:19 (GMT)
commita191f55d5eda86003c7d4404a73d0ad14230353f (patch)
tree3b889d2133b83f4d4a4cc4ec97658f6e61dfb622
parentd01fb386fbddf1e1249036e8399ac9ee8c56ed62 (diff)
downloaddefinitions-a191f55d5eda86003c7d4404a73d0ad14230353f.tar.gz
Move to using gbo
-rw-r--r--strata/genivi-smartdevicelink.morph11
-rw-r--r--strata/mesa-common.morph2
-rw-r--r--strata/x-common.morph4
-rw-r--r--tegra-deploy.morph2
4 files changed, 9 insertions, 10 deletions
diff --git a/strata/genivi-smartdevicelink.morph b/strata/genivi-smartdevicelink.morph
index 7d91468..367dabb 100644
--- a/strata/genivi-smartdevicelink.morph
+++ b/strata/genivi-smartdevicelink.morph
@@ -22,21 +22,22 @@ chunks:
- libapr-tarball
- name: log4cxx
repo: upstream:log4cxx
- ref: master
+ ref: bce06bb1eda64eb0ac8ef8910d7063ebbc84fd62
+ unpetrify-ref: master
build-depends:
- libapr-tarball
- libapr-util-tarball
- 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
+ ref: 69e3541e4e64b6e19c6f48ebc1160acb5496ed87
+ unpetrify-ref: baserock/danielsilverstone/smartdevicelink
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
+ ref: 69e3541e4e64b6e19c6f48ebc1160acb5496ed87
+ unpetrify-ref: baserock/danielsilverstone/smartdevicelink
build-depends:
- log4cxx
diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph
index 37d3c2c..1f4398a 100644
--- a/strata/mesa-common.morph
+++ b/strata/mesa-common.morph
@@ -7,6 +7,6 @@ chunks:
- name: mesa
morph: strata/mesa-common/mesa.morph
repo: upstream:mesa
- ref: ct-mcr-1/danielsilverstone/jetson-genivi
+ ref: 3e71258023dff682684fbe47c10ae2447981849b
unpetrify-ref: baserock/unified
build-depends: []
diff --git a/strata/x-common.morph b/strata/x-common.morph
index a03bce8..4827b10 100644
--- a/strata/x-common.morph
+++ b/strata/x-common.morph
@@ -233,8 +233,8 @@ chunks:
- name: drm
morph: strata/x-common/drm.morph
repo: upstream:drm
- ref: ct-mcr-1/danielsilverstone/jetson-genivi
- unpetrify-ref: 7ddc98f92f92560e2b52287ae8cf816ca4a057de
+ ref: bcac0a17407dc78d0813b2eea7fae7c34de54c1b
+ unpetrify-ref: baserock/jetson/drm
build-depends:
- xcb-pthread-stubs
- xorg-lib-libpciaccess
diff --git a/tegra-deploy.morph b/tegra-deploy.morph
index d82191b..e8e2f07 100644
--- a/tegra-deploy.morph
+++ b/tegra-deploy.morph
@@ -3,8 +3,6 @@ kind: cluster
systems:
- morph: systems/genivi-plusplus-system-armv7lhf-jetson.morph
deploy-defaults:
- TROVE_HOST: ct-mcr-1
- TROVE_ID: ct-mcr-1
ROOT_DEVICE: "/dev/mmcblk0p1"
DTB_PATH: "boot/tegra124-jetson-tk1.dtb"
BOOTLOADER_CONFIG_FORMAT: "extlinux"