summaryrefslogtreecommitdiff
path: root/clusters
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2016-10-31 15:09:29 +0900
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2016-11-11 17:36:41 +0900
commitec458e22d52b15458636a1f550e55e92a4fee962 (patch)
tree3110b91a6d09d0b5663f6c3542cbc7ed18bb8cd4 /clusters
parent459ce0756d6c359204026f147dd1443bdc0f8928 (diff)
downloaddefinitions-ec458e22d52b15458636a1f550e55e92a4fee962.tar.gz
Move gnome systems, clusters and strata into gnome subdirectory
Change-Id: I44b4df44b0b144a09977a009595124b4d04128c6
Diffstat (limited to 'clusters')
-rw-r--r--clusters/ci.morph2
-rw-r--r--clusters/gnome-system-armv7lhf-jetson-deploy.morph17
-rw-r--r--clusters/gnome-system-x86_64-deploy.morph24
3 files changed, 1 insertions, 42 deletions
diff --git a/clusters/ci.morph b/clusters/ci.morph
index 91df7fab..d9f22630 100644
--- a/clusters/ci.morph
+++ b/clusters/ci.morph
@@ -38,7 +38,7 @@ systems:
BOOTLOADER_INSTALL: none
KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1
nouveau.pstate=1
-- morph: systems/gnome-system-x86_64.morph
+- morph: gnome/systems/gnome-system-x86_64.morph
deploy:
gnome-system-x86_64:
type: extensions/rawdisk
diff --git a/clusters/gnome-system-armv7lhf-jetson-deploy.morph b/clusters/gnome-system-armv7lhf-jetson-deploy.morph
deleted file mode 100644
index c74f1209..00000000
--- a/clusters/gnome-system-armv7lhf-jetson-deploy.morph
+++ /dev/null
@@ -1,17 +0,0 @@
-name: gnome-system-armv7lhf-jetson-deploy
-kind: cluster
-description: Deploy a GNOME system.
-systems:
-- morph: systems/gnome-system-armv7lhf-jetson.morph
- deploy:
- gnome-system-armv7lhf-jetson:
- type: extensions/rawdisk
- location: gnome-system-armv7lhf-jetson.img
- DISK_SIZE: 7G
- BOOT_DEVICE: /dev/mmcblk0p1
- ROOT_DEVICE: /dev/mmcblk0p2
- DTB_PATH: boot/tegra124-jetson-tk1.dtb
- BOOTLOADER_CONFIG_FORMAT: extlinux
- BOOTLOADER_INSTALL: none
- KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1
- nouveau.pstate=1
diff --git a/clusters/gnome-system-x86_64-deploy.morph b/clusters/gnome-system-x86_64-deploy.morph
deleted file mode 100644
index b3015ff2..00000000
--- a/clusters/gnome-system-x86_64-deploy.morph
+++ /dev/null
@@ -1,24 +0,0 @@
-name: gnome-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/gnome-system-x86_64.morph
- deploy:
- gnome-system-x86_64:
- type: extensions/rawdisk
- location: /gnome-system-x86_64.img
- DISK_SIZE: 7G
- INSTALL_FILES: install-files/gnome/manifest
- KERNEL_ARGS: vga=788
- INITRAMFS_PATH: boot/initramfs.gz
- subsystems:
- - morph: systems/initramfs-x86_64.morph
- deploy:
- initramfs:
- type: initramfs
- location: boot/initramfs.gz