summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-08-10 11:09:23 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-08-10 11:10:42 +0000
commitbecfd2af922084017213a072d317edb597fac9f8 (patch)
treee3e7422e89c10cf14ebd489644940f23447399d7
parent5472fa81ed9eacbe11f48daac8aa1f4808de1982 (diff)
downloaddefinitions-baserock/pedroalvarez/definitions-genivi-subfolder.tar.gz
Change-Id: Iea0d4ddee4cf17b8d8e377386ae4abbb597e6f6e
-rw-r--r--clusters/ci.morph4
-rw-r--r--genivi/clusters/gdp-jetson-upgrade.morph (renamed from definitions-genivi/clusters/gdp-jetson-upgrade.morph)2
-rw-r--r--genivi/clusters/genivi-demo-platform-x86_32-deploy.morph (renamed from definitions-genivi/clusters/genivi-demo-platform-x86_32-deploy.morph)2
-rw-r--r--genivi/clusters/genivi-demo-platform-x86_64-deploy.morph (renamed from definitions-genivi/clusters/genivi-demo-platform-x86_64-deploy.morph)2
-rw-r--r--genivi/clusters/release-genivi-baseline.morph (renamed from definitions-genivi/clusters/release-genivi-baseline.morph)4
-rw-r--r--genivi/strata/genivi-demo-platform-libs.morph (renamed from definitions-genivi/strata/genivi-demo-platform-libs.morph)2
-rw-r--r--genivi/strata/genivi-demo-platform-libs/dbus-c++.morph (renamed from definitions-genivi/strata/genivi-demo-platform-libs/dbus-c++.morph)0
-rw-r--r--genivi/strata/genivi-demo-platform.morph (renamed from definitions-genivi/strata/genivi-demo-platform.morph)14
-rw-r--r--genivi/strata/genivi-demo-platform/audiomanager-poc.morph (renamed from definitions-genivi/strata/genivi-demo-platform/audiomanager-poc.morph)0
-rw-r--r--genivi/strata/genivi-demo-platform/audiomanager@gdp.morph (renamed from definitions-genivi/strata/genivi-demo-platform/audiomanager@gdp.morph)0
-rw-r--r--genivi/strata/genivi-demo-platform/browser-poc.morph (renamed from definitions-genivi/strata/genivi-demo-platform/browser-poc.morph)0
-rw-r--r--genivi/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph (renamed from definitions-genivi/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph)0
-rw-r--r--genivi/strata/genivi-demo-platform/mm-common.morph (renamed from definitions-genivi/strata/genivi-demo-platform/mm-common.morph)0
-rw-r--r--genivi/strata/genivi.morph (renamed from definitions-genivi/strata/genivi.morph)20
-rw-r--r--genivi/strata/genivi/DLT-daemon.morph (renamed from definitions-genivi/strata/genivi/DLT-daemon.morph)0
-rw-r--r--genivi/strata/genivi/genivi-common-api-dbus-runtime.morph (renamed from definitions-genivi/strata/genivi/genivi-common-api-dbus-runtime.morph)0
-rw-r--r--genivi/strata/genivi/genivi-common-api-runtime.morph (renamed from definitions-genivi/strata/genivi/genivi-common-api-runtime.morph)0
-rw-r--r--genivi/strata/genivi/googlemock.morph (renamed from definitions-genivi/strata/genivi/googlemock.morph)0
-rw-r--r--genivi/strata/genivi/googletest.morph (renamed from definitions-genivi/strata/genivi/googletest.morph)0
-rw-r--r--genivi/strata/genivi/itzam-tarball.morph (renamed from definitions-genivi/strata/genivi/itzam-tarball.morph)0
-rw-r--r--genivi/strata/genivi/linuxquota.morph (renamed from definitions-genivi/strata/genivi/linuxquota.morph)0
-rw-r--r--genivi/strata/genivi/node-startup-controller.morph (renamed from definitions-genivi/strata/genivi/node-startup-controller.morph)0
-rw-r--r--genivi/strata/genivi/persistence-administrator.morph (renamed from definitions-genivi/strata/genivi/persistence-administrator.morph)0
-rw-r--r--genivi/strata/genivi/persistence-common-object.morph (renamed from definitions-genivi/strata/genivi/persistence-common-object.morph)0
-rw-r--r--genivi/strata/weston-genivi.morph (renamed from definitions-genivi/strata/weston-genivi.morph)4
-rw-r--r--genivi/strata/weston-genivi/wayland-ivi-extension.morph (renamed from definitions-genivi/strata/weston-genivi/wayland-ivi-extension.morph)0
-rw-r--r--genivi/strata/weston-genivi/weston.morph (renamed from definitions-genivi/strata/weston-genivi/weston.morph)0
-rw-r--r--genivi/systems/genivi-baseline-system-armv7lhf-jetson.morph (renamed from definitions-genivi/systems/genivi-baseline-system-armv7lhf-jetson.morph)4
-rw-r--r--genivi/systems/genivi-baseline-system-armv7lhf-versatile.morph (renamed from definitions-genivi/systems/genivi-baseline-system-armv7lhf-versatile.morph)4
-rw-r--r--genivi/systems/genivi-baseline-system-x86_64-generic.morph (renamed from definitions-genivi/systems/genivi-baseline-system-x86_64-generic.morph)4
-rw-r--r--genivi/systems/genivi-demo-platform-armv7lhf-jetson.morph (renamed from definitions-genivi/systems/genivi-demo-platform-armv7lhf-jetson.morph)8
-rw-r--r--genivi/systems/genivi-demo-platform-x86_32-generic.morph (renamed from definitions-genivi/systems/genivi-demo-platform-x86_32-generic.morph)8
-rw-r--r--genivi/systems/genivi-demo-platform-x86_64-generic.morph (renamed from definitions-genivi/systems/genivi-demo-platform-x86_64-generic.morph)8
33 files changed, 45 insertions, 45 deletions
diff --git a/clusters/ci.morph b/clusters/ci.morph
index 1da9317f..c5fcb07b 100644
--- a/clusters/ci.morph
+++ b/clusters/ci.morph
@@ -65,7 +65,7 @@ systems:
BOOTLOADER_INSTALL: none
KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1
nouveau.pstate=1
-- morph: definitions-genivi/systems/genivi-baseline-system-x86_64-generic.morph
+- morph: genivi/systems/genivi-baseline-system-x86_64-generic.morph
deploy:
genivi-baseline-system-x86_64-generic:
type: extensions/rawdisk
@@ -75,7 +75,7 @@ systems:
GENIVI_WESTON_BACKEND: fbdev
GENIVI_WESTON_CONFIG: baseline
GENIVI_WESTON_AUTOSTART: False
-- morph: definitions-genivi/systems/genivi-baseline-system-armv7lhf-jetson.morph
+- morph: genivi/systems/genivi-baseline-system-armv7lhf-jetson.morph
deploy:
genivi-baseline-system-armv7lhf-jetson:
type: extensions/rawdisk
diff --git a/definitions-genivi/clusters/gdp-jetson-upgrade.morph b/genivi/clusters/gdp-jetson-upgrade.morph
index 35761bf1..57287f4c 100644
--- a/definitions-genivi/clusters/gdp-jetson-upgrade.morph
+++ b/genivi/clusters/gdp-jetson-upgrade.morph
@@ -1,7 +1,7 @@
name: gdp-jetson-upgrade
kind: cluster
systems:
-- morph: definitions-genivi/systems/genivi-demo-platform-armv7lhf-jetson.morph
+- morph: genivi/systems/genivi-demo-platform-armv7lhf-jetson.morph
deploy-defaults:
BOOT_DEVICE: "/dev/mmcblk0p1"
ROOT_DEVICE: "/dev/mmcblk0p2"
diff --git a/definitions-genivi/clusters/genivi-demo-platform-x86_32-deploy.morph b/genivi/clusters/genivi-demo-platform-x86_32-deploy.morph
index ca3c39e6..d1c5544d 100644
--- a/definitions-genivi/clusters/genivi-demo-platform-x86_32-deploy.morph
+++ b/genivi/clusters/genivi-demo-platform-x86_32-deploy.morph
@@ -3,7 +3,7 @@ kind: cluster
description: |
Deploy GENIVI Demo platform system
systems:
-- morph: definitions-genivi/systems/genivi-demo-platform-x86_32-generic.morph
+- morph: genivi/systems/genivi-demo-platform-x86_32-generic.morph
deploy:
genivi-demo-platform-x86_32-generic:
type: extensions/rawdisk
diff --git a/definitions-genivi/clusters/genivi-demo-platform-x86_64-deploy.morph b/genivi/clusters/genivi-demo-platform-x86_64-deploy.morph
index 73915543..4e1005c4 100644
--- a/definitions-genivi/clusters/genivi-demo-platform-x86_64-deploy.morph
+++ b/genivi/clusters/genivi-demo-platform-x86_64-deploy.morph
@@ -3,7 +3,7 @@ kind: cluster
description: |
Deploy GENIVI Demo platform system
systems:
-- morph: definitions-genivi/systems/genivi-demo-platform-x86_64-generic.morph
+- morph: genivi/systems/genivi-demo-platform-x86_64-generic.morph
deploy:
genivi-demo-platform-x86_64-generic:
type: extensions/rawdisk
diff --git a/definitions-genivi/clusters/release-genivi-baseline.morph b/genivi/clusters/release-genivi-baseline.morph
index 660d0bb4..08a8c622 100644
--- a/definitions-genivi/clusters/release-genivi-baseline.morph
+++ b/genivi/clusters/release-genivi-baseline.morph
@@ -3,7 +3,7 @@ kind: cluster
description: |
Deploy GENIVI Baseline systems
systems:
-- morph: definitions-genivi/systems/genivi-baseline-system-x86_64-generic.morph
+- morph: genivi/systems/genivi-baseline-system-x86_64-generic.morph
deploy:
genivi-baseline-system-x86_64-generic:
type: extensions/rawdisk
@@ -21,7 +21,7 @@ systems:
initramfs-genivi-baseline-system-x86_64-generic:
type: extensions/initramfs
location: boot/initramfs.gz
-- morph: definitions-genivi/systems/genivi-baseline-system-armv7lhf-jetson.morph
+- morph: genivi/systems/genivi-baseline-system-armv7lhf-jetson.morph
deploy:
genivi-baseline-system-armv7lhf-jetson:
type: extensions/rawdisk
diff --git a/definitions-genivi/strata/genivi-demo-platform-libs.morph b/genivi/strata/genivi-demo-platform-libs.morph
index 99e1bb17..e45c1abe 100644
--- a/definitions-genivi/strata/genivi-demo-platform-libs.morph
+++ b/genivi/strata/genivi-demo-platform-libs.morph
@@ -7,7 +7,7 @@ build-depends:
- morph: strata/bluetooth.morph
chunks:
- name: dbus-c++
- morph: definitions-genivi/strata/genivi-demo-platform-libs/dbus-c++.morph
+ morph: genivi/strata/genivi-demo-platform-libs/dbus-c++.morph
repo: upstream:dbus-c++
ref: 8d351eec25430651acbac014e44ec011fac32d57
unpetrify-ref: baserock/genivi-demo-platform
diff --git a/definitions-genivi/strata/genivi-demo-platform-libs/dbus-c++.morph b/genivi/strata/genivi-demo-platform-libs/dbus-c++.morph
index bd805ebf..bd805ebf 100644
--- a/definitions-genivi/strata/genivi-demo-platform-libs/dbus-c++.morph
+++ b/genivi/strata/genivi-demo-platform-libs/dbus-c++.morph
diff --git a/definitions-genivi/strata/genivi-demo-platform.morph b/genivi/strata/genivi-demo-platform.morph
index a0b1a618..9b5194bb 100644
--- a/definitions-genivi/strata/genivi-demo-platform.morph
+++ b/genivi/strata/genivi-demo-platform.morph
@@ -2,16 +2,16 @@ name: genivi-demo-platform
kind: stratum
description: Components which make up the GENIVI demo platform.
build-depends:
-- morph: definitions-genivi/strata/genivi-demo-platform-libs.morph
+- morph: genivi/strata/genivi-demo-platform-libs.morph
- morph: strata/qt5-tools.morph
- morph: strata/qt5-tools-qtmultimedia.morph
- morph: strata/qt5-tools-qtwebkit.morph
-- morph: definitions-genivi/strata/genivi.morph
+- morph: genivi/strata/genivi.morph
- morph: strata/wayland-generic.morph
-- morph: definitions-genivi/strata/weston-genivi.morph
+- morph: genivi/strata/weston-genivi.morph
chunks:
- name: browser-poc
- morph: definitions-genivi/strata/genivi-demo-platform/browser-poc.morph
+ morph: genivi/strata/genivi-demo-platform/browser-poc.morph
repo: upstream:genivi/browser-poc
ref: d90501f8bd3edcd35eae72efbfb4583ba8f3cdfc
unpetrify-ref: baserock/genivi/genivi-demo-platform
@@ -19,12 +19,12 @@ chunks:
documentation/designdocument/cls:
url: http://github.com/Pelagicore/Pelagicore-LaTeX-Class.git
- name: audiomanager-poc
- morph: definitions-genivi/strata/genivi-demo-platform/audiomanager-poc.morph
+ morph: genivi/strata/genivi-demo-platform/audiomanager-poc.morph
repo: upstream:audiomanager
ref: bb65a4d0a18667baa64e5ba40104dc2cda06b299
unpetrify-ref: baserock/genivi/genivi-demo-platform
- name: audiomanager@gdp
- morph: definitions-genivi/strata/genivi-demo-platform/audiomanager@gdp.morph
+ morph: genivi/strata/genivi-demo-platform/audiomanager@gdp.morph
repo: upstream:audiomanager
ref: ba709ee7d4f9f81af638a3d3c640b7152bbe32bc
unpetrify-ref: baserock/genivi/6.1-3-gba709ee-gdp
@@ -36,7 +36,7 @@ chunks:
build-depends:
- audiomanager@gdp
- name: genivi-demo-platform-hmi
- morph: definitions-genivi/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
+ morph: genivi/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
repo: upstream:genivi/genivi-demo-platform-hmi
ref: fd2c954165b0c0f7f4d9e94e8c9c3c8541a53e79
unpetrify-ref: master
diff --git a/definitions-genivi/strata/genivi-demo-platform/audiomanager-poc.morph b/genivi/strata/genivi-demo-platform/audiomanager-poc.morph
index 6974705b..6974705b 100644
--- a/definitions-genivi/strata/genivi-demo-platform/audiomanager-poc.morph
+++ b/genivi/strata/genivi-demo-platform/audiomanager-poc.morph
diff --git a/definitions-genivi/strata/genivi-demo-platform/audiomanager@gdp.morph b/genivi/strata/genivi-demo-platform/audiomanager@gdp.morph
index d77d0e68..d77d0e68 100644
--- a/definitions-genivi/strata/genivi-demo-platform/audiomanager@gdp.morph
+++ b/genivi/strata/genivi-demo-platform/audiomanager@gdp.morph
diff --git a/definitions-genivi/strata/genivi-demo-platform/browser-poc.morph b/genivi/strata/genivi-demo-platform/browser-poc.morph
index 1ca23d40..1ca23d40 100644
--- a/definitions-genivi/strata/genivi-demo-platform/browser-poc.morph
+++ b/genivi/strata/genivi-demo-platform/browser-poc.morph
diff --git a/definitions-genivi/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph b/genivi/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
index ae3d645a..ae3d645a 100644
--- a/definitions-genivi/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
+++ b/genivi/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
diff --git a/definitions-genivi/strata/genivi-demo-platform/mm-common.morph b/genivi/strata/genivi-demo-platform/mm-common.morph
index 4f416e7c..4f416e7c 100644
--- a/definitions-genivi/strata/genivi-demo-platform/mm-common.morph
+++ b/genivi/strata/genivi-demo-platform/mm-common.morph
diff --git a/definitions-genivi/strata/genivi.morph b/genivi/strata/genivi.morph
index d8c21949..4c75d54b 100644
--- a/definitions-genivi/strata/genivi.morph
+++ b/genivi/strata/genivi.morph
@@ -6,41 +6,41 @@ build-depends:
- morph: strata/sound-server-pulseaudio.morph
chunks:
- name: linuxquota
- morph: definitions-genivi/strata/genivi/linuxquota.morph
+ morph: genivi/strata/genivi/linuxquota.morph
repo: upstream:linuxquota
ref: 0804c89a16736533e440771dc42a15e5d0223902
unpetrify-ref: baserock/genivi/morph
- name: DLT-daemon
- morph: definitions-genivi/strata/genivi/DLT-daemon.morph
+ morph: genivi/strata/genivi/DLT-daemon.morph
repo: upstream:DLT-daemon
ref: e9a486a08fff6d3cc7133a350cec3ee10f463207
unpetrify-ref: v2.15.0
- name: node-startup-controller
- morph: definitions-genivi/strata/genivi/node-startup-controller.morph
+ morph: genivi/strata/genivi/node-startup-controller.morph
repo: upstream:node-startup-controller
ref: b77fb1dbb280ec45525853e52a362eafd736b400
unpetrify-ref: baserock/systemd_v216
build-depends:
- DLT-daemon
- name: googletest
- morph: definitions-genivi/strata/genivi/googletest.morph
+ morph: genivi/strata/genivi/googletest.morph
repo: upstream:googletest
ref: 5e3f7d3db4c16e2ba8b42b0bf4689f7d2abbcb08
unpetrify-ref: baserock/morph
- name: googlemock
- morph: definitions-genivi/strata/genivi/googlemock.morph
+ morph: genivi/strata/genivi/googlemock.morph
repo: upstream:googlemock
ref: 0e9998c140079046c396a0e7033bb465abae79cd
unpetrify-ref: baserock/morph
build-depends:
- googletest
- name: genivi-common-api-runtime
- morph: definitions-genivi/strata/genivi/genivi-common-api-runtime.morph
+ morph: genivi/strata/genivi/genivi-common-api-runtime.morph
repo: upstream:genivi-common-api-runtime
ref: 77d9cdaf6acee03a1e360e0e1a3cd0b01a95b407
unpetrify-ref: 3.1.5
- name: genivi-common-api-dbus-runtime
- morph: definitions-genivi/strata/genivi/genivi-common-api-dbus-runtime.morph
+ morph: genivi/strata/genivi/genivi-common-api-dbus-runtime.morph
repo: upstream:genivi-common-api-dbus-runtime
ref: 3348a422ffc756b63de5890356383858a898e8b1
unpetrify-ref: 3.1.5
@@ -58,12 +58,12 @@ chunks:
- genivi-common-api-runtime
- genivi-common-api-dbus-runtime
- name: itzam-tarball
- morph: definitions-genivi/strata/genivi/itzam-tarball.morph
+ morph: genivi/strata/genivi/itzam-tarball.morph
repo: upstream:itzam-tarball
ref: 4ebcf671416927b64475da7b810b6016c847bf73
unpetrify-ref: baserock/genivi/baseline
- name: persistence-common-object
- morph: definitions-genivi/strata/genivi/persistence-common-object.morph
+ morph: genivi/strata/genivi/persistence-common-object.morph
repo: upstream:genivi/persistence-common-object
ref: 395b0f504e05ee6c59c1b9d9267c793e072a19ba
unpetrify-ref: master
@@ -88,7 +88,7 @@ chunks:
- DLT-daemon
- persistence-client-library
- name: persistence-administrator
- morph: definitions-genivi/strata/genivi/persistence-administrator.morph
+ morph: genivi/strata/genivi/persistence-administrator.morph
repo: upstream:genivi/persistence-administrator
ref: 47e5a424c8ef6e33565737f20d3bd81f69c8efc9
unpetrify-ref: master
diff --git a/definitions-genivi/strata/genivi/DLT-daemon.morph b/genivi/strata/genivi/DLT-daemon.morph
index 19ffd3b5..19ffd3b5 100644
--- a/definitions-genivi/strata/genivi/DLT-daemon.morph
+++ b/genivi/strata/genivi/DLT-daemon.morph
diff --git a/definitions-genivi/strata/genivi/genivi-common-api-dbus-runtime.morph b/genivi/strata/genivi/genivi-common-api-dbus-runtime.morph
index fa8742a0..fa8742a0 100644
--- a/definitions-genivi/strata/genivi/genivi-common-api-dbus-runtime.morph
+++ b/genivi/strata/genivi/genivi-common-api-dbus-runtime.morph
diff --git a/definitions-genivi/strata/genivi/genivi-common-api-runtime.morph b/genivi/strata/genivi/genivi-common-api-runtime.morph
index 1c4a66c2..1c4a66c2 100644
--- a/definitions-genivi/strata/genivi/genivi-common-api-runtime.morph
+++ b/genivi/strata/genivi/genivi-common-api-runtime.morph
diff --git a/definitions-genivi/strata/genivi/googlemock.morph b/genivi/strata/genivi/googlemock.morph
index b3eaa952..b3eaa952 100644
--- a/definitions-genivi/strata/genivi/googlemock.morph
+++ b/genivi/strata/genivi/googlemock.morph
diff --git a/definitions-genivi/strata/genivi/googletest.morph b/genivi/strata/genivi/googletest.morph
index 7723c721..7723c721 100644
--- a/definitions-genivi/strata/genivi/googletest.morph
+++ b/genivi/strata/genivi/googletest.morph
diff --git a/definitions-genivi/strata/genivi/itzam-tarball.morph b/genivi/strata/genivi/itzam-tarball.morph
index eaf2db61..eaf2db61 100644
--- a/definitions-genivi/strata/genivi/itzam-tarball.morph
+++ b/genivi/strata/genivi/itzam-tarball.morph
diff --git a/definitions-genivi/strata/genivi/linuxquota.morph b/genivi/strata/genivi/linuxquota.morph
index 826696ad..826696ad 100644
--- a/definitions-genivi/strata/genivi/linuxquota.morph
+++ b/genivi/strata/genivi/linuxquota.morph
diff --git a/definitions-genivi/strata/genivi/node-startup-controller.morph b/genivi/strata/genivi/node-startup-controller.morph
index d3d6dc77..d3d6dc77 100644
--- a/definitions-genivi/strata/genivi/node-startup-controller.morph
+++ b/genivi/strata/genivi/node-startup-controller.morph
diff --git a/definitions-genivi/strata/genivi/persistence-administrator.morph b/genivi/strata/genivi/persistence-administrator.morph
index f4fd07a5..f4fd07a5 100644
--- a/definitions-genivi/strata/genivi/persistence-administrator.morph
+++ b/genivi/strata/genivi/persistence-administrator.morph
diff --git a/definitions-genivi/strata/genivi/persistence-common-object.morph b/genivi/strata/genivi/persistence-common-object.morph
index 179a6031..179a6031 100644
--- a/definitions-genivi/strata/genivi/persistence-common-object.morph
+++ b/genivi/strata/genivi/persistence-common-object.morph
diff --git a/definitions-genivi/strata/weston-genivi.morph b/genivi/strata/weston-genivi.morph
index a3aec486..a684645e 100644
--- a/definitions-genivi/strata/weston-genivi.morph
+++ b/genivi/strata/weston-genivi.morph
@@ -8,12 +8,12 @@ build-depends:
- morph: strata/wayland-generic.morph
chunks:
- name: weston
- morph: definitions-genivi/strata/weston-genivi/weston.morph
+ morph: genivi/strata/weston-genivi/weston.morph
repo: upstream:weston
ref: 2e5232b980eaa1074023a65dd7941e80b72a763c
unpetrify-ref: baserock/weston-1.11.0/tegra
- name: wayland-ivi-extension
- morph: definitions-genivi/strata/weston-genivi/wayland-ivi-extension.morph
+ morph: genivi/strata/weston-genivi/wayland-ivi-extension.morph
repo: upstream:genivi/wayland-ivi-extension
ref: 6c2823684105c0bd46aaeca817fe5d87e7c6da25
unpetrify-ref: 1.10.90
diff --git a/definitions-genivi/strata/weston-genivi/wayland-ivi-extension.morph b/genivi/strata/weston-genivi/wayland-ivi-extension.morph
index 08d43bac..08d43bac 100644
--- a/definitions-genivi/strata/weston-genivi/wayland-ivi-extension.morph
+++ b/genivi/strata/weston-genivi/wayland-ivi-extension.morph
diff --git a/definitions-genivi/strata/weston-genivi/weston.morph b/genivi/strata/weston-genivi/weston.morph
index ff1d6a9c..ff1d6a9c 100644
--- a/definitions-genivi/strata/weston-genivi/weston.morph
+++ b/genivi/strata/weston-genivi/weston.morph
diff --git a/definitions-genivi/systems/genivi-baseline-system-armv7lhf-jetson.morph b/genivi/systems/genivi-baseline-system-armv7lhf-jetson.morph
index 179d613a..e2145b6f 100644
--- a/definitions-genivi/systems/genivi-baseline-system-armv7lhf-jetson.morph
+++ b/genivi/systems/genivi-baseline-system-armv7lhf-jetson.morph
@@ -32,7 +32,7 @@ strata:
- name: multimedia-gstreamer
morph: strata/multimedia-gstreamer.morph
- name: genivi
- morph: definitions-genivi/strata/genivi.morph
+ morph: genivi/strata/genivi.morph
- name: wayland-generic
morph: strata/wayland-generic.morph
- name: graphics-common
@@ -44,7 +44,7 @@ strata:
- name: x-common
morph: strata/x-common.morph
- name: weston-genivi
- morph: definitions-genivi/strata/weston-genivi.morph
+ morph: genivi/strata/weston-genivi.morph
configuration-extensions:
- extensions/set-hostname
- extensions/add-config-files
diff --git a/definitions-genivi/systems/genivi-baseline-system-armv7lhf-versatile.morph b/genivi/systems/genivi-baseline-system-armv7lhf-versatile.morph
index c206d4c2..35104513 100644
--- a/definitions-genivi/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/genivi/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -32,7 +32,7 @@ strata:
- name: multimedia-gstreamer
morph: strata/multimedia-gstreamer.morph
- name: genivi
- morph: definitions-genivi/strata/genivi.morph
+ morph: genivi/strata/genivi.morph
- name: wayland-generic
morph: strata/wayland-generic.morph
- name: graphics-common
@@ -42,7 +42,7 @@ strata:
- name: x-common
morph: strata/x-common.morph
- name: weston-genivi
- morph: definitions-genivi/strata/weston-genivi.morph
+ morph: genivi/strata/weston-genivi.morph
configuration-extensions:
- extensions/set-hostname
- extensions/add-config-files
diff --git a/definitions-genivi/systems/genivi-baseline-system-x86_64-generic.morph b/genivi/systems/genivi-baseline-system-x86_64-generic.morph
index d96b9419..ec32952c 100644
--- a/definitions-genivi/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/genivi/systems/genivi-baseline-system-x86_64-generic.morph
@@ -32,7 +32,7 @@ strata:
- name: multimedia-gstreamer
morph: strata/multimedia-gstreamer.morph
- name: genivi
- morph: definitions-genivi/strata/genivi.morph
+ morph: genivi/strata/genivi.morph
- name: wayland-generic
morph: strata/wayland-generic.morph
- name: graphics-common
@@ -46,7 +46,7 @@ strata:
- name: x-common
morph: strata/x-common.morph
- name: weston-genivi
- morph: definitions-genivi/strata/weston-genivi.morph
+ morph: genivi/strata/weston-genivi.morph
configuration-extensions:
- extensions/set-hostname
- extensions/add-config-files
diff --git a/definitions-genivi/systems/genivi-demo-platform-armv7lhf-jetson.morph b/genivi/systems/genivi-demo-platform-armv7lhf-jetson.morph
index fdd9ddd6..e729c314 100644
--- a/definitions-genivi/systems/genivi-demo-platform-armv7lhf-jetson.morph
+++ b/genivi/systems/genivi-demo-platform-armv7lhf-jetson.morph
@@ -38,7 +38,7 @@ strata:
- name: navigation
morph: strata/navigation.morph
- name: genivi
- morph: definitions-genivi/strata/genivi.morph
+ morph: genivi/strata/genivi.morph
- name: wayland-generic
morph: strata/wayland-generic.morph
- name: graphics-common
@@ -52,7 +52,7 @@ strata:
- name: x-common
morph: strata/x-common.morph
- name: weston-genivi
- morph: definitions-genivi/strata/weston-genivi.morph
+ morph: genivi/strata/weston-genivi.morph
- name: ruby
morph: strata/ruby.morph
- name: icu-common
@@ -68,9 +68,9 @@ strata:
- name: python-pygobject
morph: strata/python-pygobject.morph
- name: genivi-demo-platform-libs
- morph: definitions-genivi/strata/genivi-demo-platform-libs.morph
+ morph: genivi/strata/genivi-demo-platform-libs.morph
- name: genivi-demo-platform
- morph: definitions-genivi/strata/genivi-demo-platform.morph
+ morph: genivi/strata/genivi-demo-platform.morph
- name: tools
morph: strata/tools.morph
configuration-extensions:
diff --git a/definitions-genivi/systems/genivi-demo-platform-x86_32-generic.morph b/genivi/systems/genivi-demo-platform-x86_32-generic.morph
index 4c4c40ee..a18bbe28 100644
--- a/definitions-genivi/systems/genivi-demo-platform-x86_32-generic.morph
+++ b/genivi/systems/genivi-demo-platform-x86_32-generic.morph
@@ -38,7 +38,7 @@ strata:
- name: navigation
morph: strata/navigation.morph
- name: genivi
- morph: definitions-genivi/strata/genivi.morph
+ morph: genivi/strata/genivi.morph
- name: wayland-generic
morph: strata/wayland-generic.morph
- name: graphics-common
@@ -54,7 +54,7 @@ strata:
- name: x-common
morph: strata/x-common.morph
- name: weston-genivi
- morph: definitions-genivi/strata/weston-genivi.morph
+ morph: genivi/strata/weston-genivi.morph
- name: ruby
morph: strata/ruby.morph
- name: icu-common
@@ -70,9 +70,9 @@ strata:
- name: python-pygobject
morph: strata/python-pygobject.morph
- name: genivi-demo-platform-libs
- morph: definitions-genivi/strata/genivi-demo-platform-libs.morph
+ morph: genivi/strata/genivi-demo-platform-libs.morph
- name: genivi-demo-platform
- morph: definitions-genivi/strata/genivi-demo-platform.morph
+ morph: genivi/strata/genivi-demo-platform.morph
- name: tools
morph: strata/tools.morph
configuration-extensions:
diff --git a/definitions-genivi/systems/genivi-demo-platform-x86_64-generic.morph b/genivi/systems/genivi-demo-platform-x86_64-generic.morph
index cef51f23..a14216bc 100644
--- a/definitions-genivi/systems/genivi-demo-platform-x86_64-generic.morph
+++ b/genivi/systems/genivi-demo-platform-x86_64-generic.morph
@@ -38,7 +38,7 @@ strata:
- name: navigation
morph: strata/navigation.morph
- name: genivi
- morph: definitions-genivi/strata/genivi.morph
+ morph: genivi/strata/genivi.morph
- name: wayland-generic
morph: strata/wayland-generic.morph
- name: graphics-common
@@ -54,7 +54,7 @@ strata:
- name: x-common
morph: strata/x-common.morph
- name: weston-genivi
- morph: definitions-genivi/strata/weston-genivi.morph
+ morph: genivi/strata/weston-genivi.morph
- name: ruby
morph: strata/ruby.morph
- name: icu-common
@@ -70,9 +70,9 @@ strata:
- name: python-pygobject
morph: strata/python-pygobject.morph
- name: genivi-demo-platform-libs
- morph: definitions-genivi/strata/genivi-demo-platform-libs.morph
+ morph: genivi/strata/genivi-demo-platform-libs.morph
- name: genivi-demo-platform
- morph: definitions-genivi/strata/genivi-demo-platform.morph
+ morph: genivi/strata/genivi-demo-platform.morph
- name: tools
morph: strata/tools.morph
configuration-extensions: