summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2016-10-31 04:24:49 (GMT)
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2016-11-11 08:36:41 (GMT)
commit96fe3824740eb01fa6b5ee3a7d803c4d23a34cfa (patch)
tree0f6bec07bd4b7b6244ce7edc0c4cd5b88c75077f
parent6cb5b32227de1043933fed3542e70bc3c64f59c3 (diff)
downloaddefinitions-96fe3824740eb01fa6b5ee3a7d803c4d23a34cfa.tar.gz
Moving ivi systems & clusters and related strata to ivi subdir
Change-Id: I9ebe47f7808885be59ead2ac0778fbf762ad3c4e
-rw-r--r--ivi/clusters/ivi-system-armv7lhf-jetson-deploy.morph (renamed from clusters/ivi-system-armv7lhf-jetson-deploy.morph)2
-rw-r--r--ivi/clusters/ivi-system-x86_32-deploy.morph (renamed from clusters/ivi-system-x86_32-deploy.morph)2
-rw-r--r--ivi/clusters/ivi-system-x86_64-deploy.morph (renamed from clusters/ivi-system-x86_64-deploy.morph)2
-rw-r--r--ivi/strata/bsp-x86_32-ivi.morph (renamed from strata/bsp-x86_32-ivi.morph)2
-rw-r--r--ivi/strata/bsp-x86_32-ivi/linux-x86-32-ivi.morph (renamed from strata/bsp-x86_32-ivi/linux-x86-32-ivi.morph)0
-rw-r--r--ivi/strata/bsp-x86_64-ivi.morph (renamed from strata/bsp-x86_64-ivi.morph)2
-rw-r--r--ivi/strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph (renamed from strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph)0
-rw-r--r--ivi/strata/qt5-ivi.morph (renamed from strata/qt5-ivi.morph)2
-rw-r--r--ivi/strata/qt5-ivi/qtapplicationmanager.morph (renamed from strata/qt5-ivi/qtapplicationmanager.morph)0
-rw-r--r--ivi/strata/rvi.morph (renamed from strata/rvi.morph)2
-rw-r--r--ivi/strata/rvi/rvi_core.morph (renamed from strata/rvi/rvi_core.morph)0
-rw-r--r--ivi/systems/ivi-system-armv7lhf-jetson.morph (renamed from systems/ivi-system-armv7lhf-jetson.morph)0
-rw-r--r--ivi/systems/ivi-system-x86_32.morph (renamed from systems/ivi-system-x86_32.morph)6
-rw-r--r--ivi/systems/ivi-system-x86_64.morph (renamed from systems/ivi-system-x86_64.morph)6
14 files changed, 13 insertions, 13 deletions
diff --git a/clusters/ivi-system-armv7lhf-jetson-deploy.morph b/ivi/clusters/ivi-system-armv7lhf-jetson-deploy.morph
index fef8935..b7d5474 100644
--- a/clusters/ivi-system-armv7lhf-jetson-deploy.morph
+++ b/ivi/clusters/ivi-system-armv7lhf-jetson-deploy.morph
@@ -2,7 +2,7 @@ name: ivi-system-armv7lhf-jetson-deploy
kind: cluster
description: Deploy a IVI system.
systems:
-- morph: systems/ivi-system-armv7lhf-jetson.morph
+- morph: ivi/systems/ivi-system-armv7lhf-jetson.morph
deploy:
ivi-system-armv7lhf-jetson:
type: extensions/rawdisk
diff --git a/clusters/ivi-system-x86_32-deploy.morph b/ivi/clusters/ivi-system-x86_32-deploy.morph
index 90ce494..9adaa19 100644
--- a/clusters/ivi-system-x86_32-deploy.morph
+++ b/ivi/clusters/ivi-system-x86_32-deploy.morph
@@ -7,7 +7,7 @@ description: |
as well as in a virtual machine.
systems:
-- morph: systems/ivi-system-x86_32.morph
+- morph: ivi/systems/ivi-system-x86_32.morph
deploy:
ivi-system-x86_32:
type: extensions/rawdisk
diff --git a/clusters/ivi-system-x86_64-deploy.morph b/ivi/clusters/ivi-system-x86_64-deploy.morph
index 0833ec8..5e18cd3 100644
--- a/clusters/ivi-system-x86_64-deploy.morph
+++ b/ivi/clusters/ivi-system-x86_64-deploy.morph
@@ -7,7 +7,7 @@ description: |
as well as in a virtual machine.
systems:
-- morph: systems/ivi-system-x86_64.morph
+- morph: ivi/systems/ivi-system-x86_64.morph
deploy:
ivi-system-x86_64:
type: extensions/rawdisk
diff --git a/strata/bsp-x86_32-ivi.morph b/ivi/strata/bsp-x86_32-ivi.morph
index 860540d..383a9c2 100644
--- a/strata/bsp-x86_32-ivi.morph
+++ b/ivi/strata/bsp-x86_32-ivi.morph
@@ -6,7 +6,7 @@ build-depends:
- morph: strata/bsp-x86_both-tools.morph
chunks:
- name: linux-x86-32-ivi
- morph: strata/bsp-x86_32-ivi/linux-x86-32-ivi.morph
+ morph: ivi/strata/bsp-x86_32-ivi/linux-x86-32-ivi.morph
repo: upstream:linux
ref: 523d939ef98fd712632d93a5a2b588e477a7565e
unpetrify-ref: v4.7
diff --git a/strata/bsp-x86_32-ivi/linux-x86-32-ivi.morph b/ivi/strata/bsp-x86_32-ivi/linux-x86-32-ivi.morph
index 400c549..400c549 100644
--- a/strata/bsp-x86_32-ivi/linux-x86-32-ivi.morph
+++ b/ivi/strata/bsp-x86_32-ivi/linux-x86-32-ivi.morph
diff --git a/strata/bsp-x86_64-ivi.morph b/ivi/strata/bsp-x86_64-ivi.morph
index f86a8d0..84d305e 100644
--- a/strata/bsp-x86_64-ivi.morph
+++ b/ivi/strata/bsp-x86_64-ivi.morph
@@ -6,7 +6,7 @@ build-depends:
- morph: strata/bsp-x86_both-tools.morph
chunks:
- name: linux-x86-64-ivi
- morph: strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph
+ morph: ivi/strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph
repo: upstream:linux
ref: 523d939ef98fd712632d93a5a2b588e477a7565e
unpetrify-ref: v4.7
diff --git a/strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph b/ivi/strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph
index fef340d..fef340d 100644
--- a/strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph
+++ b/ivi/strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph
diff --git a/strata/qt5-ivi.morph b/ivi/strata/qt5-ivi.morph
index 16e7cd2..e18652a 100644
--- a/strata/qt5-ivi.morph
+++ b/ivi/strata/qt5-ivi.morph
@@ -6,7 +6,7 @@ build-depends:
- morph: strata/qt5-tools.morph
chunks:
- name: qtapplicationmanager
- morph: strata/qt5-ivi/qtapplicationmanager.morph
+ morph: ivi/strata/qt5-ivi/qtapplicationmanager.morph
repo: upstream:qt5/qtapplicationmanager
ref: fb9670e9e381aa391e5fe3eccd76db0f7b866abb
unpetrify-ref: 5.7
diff --git a/strata/qt5-ivi/qtapplicationmanager.morph b/ivi/strata/qt5-ivi/qtapplicationmanager.morph
index 45f2c07..45f2c07 100644
--- a/strata/qt5-ivi/qtapplicationmanager.morph
+++ b/ivi/strata/qt5-ivi/qtapplicationmanager.morph
diff --git a/strata/rvi.morph b/ivi/strata/rvi.morph
index 74b0242..8fd1187 100644
--- a/strata/rvi.morph
+++ b/ivi/strata/rvi.morph
@@ -5,7 +5,7 @@ build-depends:
- morph: strata/erlang.morph
chunks:
- name: rvi_core
- morph: strata/rvi/rvi_core.morph
+ morph: ivi/strata/rvi/rvi_core.morph
repo: upstream:rvi/rvi_core
ref: 9a3db2baecdddbfba8e8bfeb71038e4de6a44225
unpetrify-ref: v0.5.0
diff --git a/strata/rvi/rvi_core.morph b/ivi/strata/rvi/rvi_core.morph
index c34f8a9..c34f8a9 100644
--- a/strata/rvi/rvi_core.morph
+++ b/ivi/strata/rvi/rvi_core.morph
diff --git a/systems/ivi-system-armv7lhf-jetson.morph b/ivi/systems/ivi-system-armv7lhf-jetson.morph
index 552e31a..552e31a 100644
--- a/systems/ivi-system-armv7lhf-jetson.morph
+++ b/ivi/systems/ivi-system-armv7lhf-jetson.morph
diff --git a/systems/ivi-system-x86_32.morph b/ivi/systems/ivi-system-x86_32.morph
index 455301e..12f5efc 100644
--- a/systems/ivi-system-x86_32.morph
+++ b/ivi/systems/ivi-system-x86_32.morph
@@ -8,7 +8,7 @@ strata:
- name: bsp-x86_both-tools
morph: strata/bsp-x86_both-tools.morph
- name: bsp-x86_32-ivi
- morph: strata/bsp-x86_32-ivi.morph
+ morph: ivi/strata/bsp-x86_32-ivi.morph
- name: build-essential
morph: strata/build-essential.morph
- name: core
@@ -68,7 +68,7 @@ strata:
- name: python3-gobject
morph: strata/python3-gobject.morph
- name: qt5-ivi
- morph: strata/qt5-ivi.morph
+ morph: ivi/strata/qt5-ivi.morph
- name: qt5-tools
morph: strata/qt5-tools.morph
- name: qt5-tools-qtmultimedia
@@ -98,7 +98,7 @@ strata:
- name: x-common
morph: strata/x-common.morph
- name: rvi
- morph: strata/rvi.morph
+ morph: ivi/strata/rvi.morph
configuration-extensions:
- extensions/set-hostname
- extensions/install-essential-files
diff --git a/systems/ivi-system-x86_64.morph b/ivi/systems/ivi-system-x86_64.morph
index 9b805c9..eabb48e 100644
--- a/systems/ivi-system-x86_64.morph
+++ b/ivi/systems/ivi-system-x86_64.morph
@@ -8,7 +8,7 @@ strata:
- name: bsp-x86_both-tools
morph: strata/bsp-x86_both-tools.morph
- name: bsp-x86_64-ivi
- morph: strata/bsp-x86_64-ivi.morph
+ morph: ivi/strata/bsp-x86_64-ivi.morph
- name: build-essential
morph: strata/build-essential.morph
- name: core
@@ -68,7 +68,7 @@ strata:
- name: python3-gobject
morph: strata/python3-gobject.morph
- name: qt5-ivi
- morph: strata/qt5-ivi.morph
+ morph: ivi/strata/qt5-ivi.morph
- name: qt5-tools
morph: strata/qt5-tools.morph
- name: qt5-tools-qtmultimedia
@@ -98,7 +98,7 @@ strata:
- name: x-common
morph: strata/x-common.morph
- name: rvi
- morph: strata/rvi.morph
+ morph: ivi/strata/rvi.morph
configuration-extensions:
- extensions/set-hostname
- extensions/install-essential-files