diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-11-17 10:52:31 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-11-17 10:52:31 +0000 |
| commit | 522e5ce8f922a688c1fa715d35445aeebf975336 (patch) | |
| tree | 0c4fc5cd15bce4758b8393e666fbca3137f55f48 /systems | |
| parent | f7804de43f3a5fd99fc110f120d65555cef41b52 (diff) | |
| parent | 09c2dc8456b1abc033c79b97646284db113b80ff (diff) | |
| download | definitions-522e5ce8f922a688c1fa715d35445aeebf975336.tar.gz | |
Merge branch 'baserock/pedroalvarez/unify-jetson-kernel'
This includes the patches from Pedro Alvarez required to make the
release.
Reviewed-by: Pedro Alvarez
Reviewed-by: Sam Thursfield
Diffstat (limited to 'systems')
| -rw-r--r-- | systems/build-system-armv7lhf-jetson.morph | 4 | ||||
| -rw-r--r-- | systems/devel-system-armv7lhf-jetson.morph | 4 | ||||
| -rw-r--r-- | systems/genivi-baseline-system-armv7lhf-jetson.morph | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index db0b36e9..674b5406 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -9,8 +9,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: bsp-jetson-devel - morph: strata/bsp-jetson-devel.morph +- name: bsp-jetson + morph: strata/bsp-jetson.morph - name: tools morph: strata/tools.morph - name: morph-utils diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph index 35976a70..0bf7da18 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -21,8 +21,8 @@ strata: morph: strata/openstack-clients.morph - name: nfs morph: strata/nfs.morph -- name: bsp-jetson-devel - morph: strata/bsp-jetson-devel.morph +- name: bsp-jetson + morph: strata/bsp-jetson.morph - name: nodejs morph: strata/nodejs.morph - name: ruby diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph index 39f05b4f..59cca3e8 100644 --- a/systems/genivi-baseline-system-armv7lhf-jetson.morph +++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph @@ -9,8 +9,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: bsp-jetson-genivi - morph: strata/bsp-jetson-genivi.morph +- name: bsp-jetson + morph: strata/bsp-jetson.morph - name: connectivity morph: strata/connectivity.morph - name: connman-common |