From 459ce0756d6c359204026f147dd1443bdc0f8928 Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Mon, 31 Oct 2016 14:45:32 +0900 Subject: Moving weston systems, clusters and related strata under weston subdirectory Change-Id: Ia805fcbd11d894eb74b18704b6a7070bcc7dd11a --- clusters/ci.morph | 4 ++-- clusters/weston-qt5-system-x86_64-deploy.morph | 23 ---------------------- clusters/weston-system-x86_64-generic-deploy.morph | 23 ---------------------- 3 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 clusters/weston-qt5-system-x86_64-deploy.morph delete mode 100644 clusters/weston-system-x86_64-generic-deploy.morph (limited to 'clusters') diff --git a/clusters/ci.morph b/clusters/ci.morph index c5fcb07b..91df7fab 100644 --- a/clusters/ci.morph +++ b/clusters/ci.morph @@ -52,7 +52,7 @@ systems: location: xfce-system-x86_64.img DISK_SIZE: 4G KERNEL_ARGS: vga=788 -- morph: systems/weston-system-armv7lhf-jetson.morph +- morph: weston/systems/weston-system-armv7lhf-jetson.morph deploy: weston-system-armv7lhf-jetson: type: extensions/rawdisk @@ -91,7 +91,7 @@ systems: GENIVI_WESTON_BACKEND: drm GENIVI_WESTON_CONFIG: baseline GENIVI_WESTON_AUTOSTART: True -- morph: systems/weston-qt5-system-x86_64.morph +- morph: weston/systems/weston-qt5-system-x86_64.morph deploy: weston-qt5-system-x86_64.morph: type: extensions/rawdisk diff --git a/clusters/weston-qt5-system-x86_64-deploy.morph b/clusters/weston-qt5-system-x86_64-deploy.morph deleted file mode 100644 index fa876dce..00000000 --- a/clusters/weston-qt5-system-x86_64-deploy.morph +++ /dev/null @@ -1,23 +0,0 @@ -name: weston-qt5-system-x86_64-deploy -kind: cluster -description: | - Deploy a stock weston system. - - The resulting image can be copied to a USB and booted from there, - as well as in a virtual machine. - -systems: -- morph: systems/weston-qt5-system-x86_64.morph - deploy: - weston-qt5-system-x86_64: - type: extensions/rawdisk - location: /weston-qt5-system-x86_64.img - DISK_SIZE: 4G - KERNEL_ARGS: vga=788 - INITRAMFS_PATH: boot/initramfs.gz - subsystems: - - morph: systems/initramfs-x86_64.morph - deploy: - initramfs: - type: initramfs - location: boot/initramfs.gz diff --git a/clusters/weston-system-x86_64-generic-deploy.morph b/clusters/weston-system-x86_64-generic-deploy.morph deleted file mode 100644 index 65e35bd7..00000000 --- a/clusters/weston-system-x86_64-generic-deploy.morph +++ /dev/null @@ -1,23 +0,0 @@ -name: weston-system-x86_64-generic-deploy -kind: cluster -description: | - Deploy a stock weston system. - - The resulting image can be copied to a USB and booted from there, - as well as in a virtual machine. - -systems: -- morph: systems/weston-system-x86_64-generic.morph - deploy: - weston-system-x86_64-generic: - type: extensions/rawdisk - location: /weston-system-x86_64-generic.img - DISK_SIZE: 4G - KERNEL_ARGS: vga=788 - INITRAMFS_PATH: boot/initramfs.gz - subsystems: - - morph: systems/initramfs-x86_64.morph - deploy: - initramfs: - type: extensions/initramfs - location: boot/initramfs.gz -- cgit v1.2.1