From c38a7cdf83af58277ddbbff7ec87be0d08ba8c8a Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Wed, 10 Aug 2016 09:58:03 +0000 Subject: Move GENIVI definitions to 'genivi' subfolder This folder will now contain all the definitions related to GENIVI systems. Change-Id: Ia4dda4dc90b780807647861ae6f9c406262f85c0 --- clusters/ci.morph | 4 +-- clusters/gdp-jetson-upgrade.morph | 19 ----------- clusters/genivi-demo-platform-x86_32-deploy.morph | 22 ------------ clusters/genivi-demo-platform-x86_64-deploy.morph | 22 ------------ clusters/release-genivi-baseline.morph | 41 ----------------------- 5 files changed, 2 insertions(+), 106 deletions(-) delete mode 100644 clusters/gdp-jetson-upgrade.morph delete mode 100644 clusters/genivi-demo-platform-x86_32-deploy.morph delete mode 100644 clusters/genivi-demo-platform-x86_64-deploy.morph delete mode 100644 clusters/release-genivi-baseline.morph (limited to 'clusters') diff --git a/clusters/ci.morph b/clusters/ci.morph index a162eff0..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: 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: 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/clusters/gdp-jetson-upgrade.morph b/clusters/gdp-jetson-upgrade.morph deleted file mode 100644 index 33eb8ec1..00000000 --- a/clusters/gdp-jetson-upgrade.morph +++ /dev/null @@ -1,19 +0,0 @@ -name: gdp-jetson-upgrade -kind: cluster -systems: -- morph: systems/genivi-demo-platform-armv7lhf-jetson.morph - deploy-defaults: - 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 - FSTAB_SRC: LABEL=src /src auto defaults,rw,noatime,nofail 0 2 - GENIVI_WESTON_BACKEND: drm - GENIVI_WESTON_CONFIG: gdp - GENIVI_WESTON_AUTOSTART: True - deploy: - self: - type: extensions/ssh-rsync - location: root@127.0.0.1 diff --git a/clusters/genivi-demo-platform-x86_32-deploy.morph b/clusters/genivi-demo-platform-x86_32-deploy.morph deleted file mode 100644 index df02719d..00000000 --- a/clusters/genivi-demo-platform-x86_32-deploy.morph +++ /dev/null @@ -1,22 +0,0 @@ -name: genivi-demo-platform-x86_32-deploy -kind: cluster -description: | - Deploy GENIVI Demo platform system -systems: -- morph: systems/genivi-demo-platform-x86_32-generic.morph - deploy: - genivi-demo-platform-x86_32-generic: - type: extensions/rawdisk - location: genivi-demo-platform-x86_32-generic.img - DISK_SIZE: 4G - KERNEL_ARGS: vga=788 - INITRAMFS_PATH: boot/initramfs.gz - HOSTNAME: genivi-demo-platform-x86-32-generic - GENIVI_WESTON_CONFIG: gdp - GENIVI_WESTON_AUTOSTART: False - subsystems: - - morph: systems/initramfs-x86_32.morph - deploy: - initramfs-genivi-demo-platform-x86_32-generic: - type: extensions/initramfs - location: boot/initramfs.gz diff --git a/clusters/genivi-demo-platform-x86_64-deploy.morph b/clusters/genivi-demo-platform-x86_64-deploy.morph deleted file mode 100644 index cbbfbf39..00000000 --- a/clusters/genivi-demo-platform-x86_64-deploy.morph +++ /dev/null @@ -1,22 +0,0 @@ -name: genivi-demo-platform-x86_64-deploy -kind: cluster -description: | - Deploy GENIVI Demo platform system -systems: -- morph: systems/genivi-demo-platform-x86_64-generic.morph - deploy: - genivi-demo-platform-x86_64-generic: - type: extensions/rawdisk - location: genivi-demo-platform-x86_64-generic.img - DISK_SIZE: 4G - KERNEL_ARGS: vga=788 - INITRAMFS_PATH: boot/initramfs.gz - HOSTNAME: genivi-demo-platform-x86-64-generic - GENIVI_WESTON_CONFIG: gdp - GENIVI_WESTON_AUTOSTART: False - subsystems: - - morph: systems/initramfs-x86_64.morph - deploy: - initramfs-genivi-demo-platform-x86_64-generic: - type: extensions/initramfs - location: boot/initramfs.gz diff --git a/clusters/release-genivi-baseline.morph b/clusters/release-genivi-baseline.morph deleted file mode 100644 index f7e07042..00000000 --- a/clusters/release-genivi-baseline.morph +++ /dev/null @@ -1,41 +0,0 @@ -name: release-genivi-baseline -kind: cluster -description: | - Deploy GENIVI Baseline systems -systems: -- morph: systems/genivi-baseline-system-x86_64-generic.morph - deploy: - genivi-baseline-system-x86_64-generic: - type: extensions/rawdisk - location: genivi-baseline-system-x86_64-generic.img - DISK_SIZE: 4G - KERNEL_ARGS: vga=788 - INITRAMFS_PATH: boot/initramfs.gz - HOSTNAME: genivi-baseline-system-x86-64-generic - GENIVI_WESTON_BACKEND: fbdev - GENIVI_WESTON_CONFIG: baseline - GENIVI_WESTON_AUTOSTART: False - subsystems: - - morph: systems/initramfs-x86_64.morph - deploy: - initramfs-genivi-baseline-system-x86_64-generic: - type: extensions/initramfs - location: boot/initramfs.gz -- morph: systems/genivi-baseline-system-armv7lhf-jetson.morph - deploy: - genivi-baseline-system-armv7lhf-jetson: - type: extensions/rawdisk - location: genivi-baseline-system-armv7lhf-jetson.img - DISK_SIZE: 4G - 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 - HOSTNAME: genivi-baseline-system-armv7lhf-jetson - GENIVI_WESTON_BACKEND: drm - GENIVI_WESTON_CONFIG: baseline - GENIVI_WESTON_AUTOSTART: False - -- cgit v1.2.1