From 554f6b401b5b34efc9d1f932992e2f8f4db45c31 Mon Sep 17 00:00:00 2001
From: Adam Coldrick <adam.coldrick@codethink.co.uk>
Date: Mon, 15 Jun 2015 14:44:38 +0000
Subject: Temporarily modify release.morph

We aren't releasing the GENIVI systems for 15.25, and we need to set
HOSTNAME so we don't end up with our released systems having strange
hostnames.
---
 clusters/release.morph | 31 +++++--------------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/clusters/release.morph b/clusters/release.morph
index 1574bde6..85ea9c39 100644
--- a/clusters/release.morph
+++ b/clusters/release.morph
@@ -12,17 +12,20 @@ systems:
     build-system-x86_32-chroot:
       type: extensions/tar
       location: build-system-x86_32-chroot.tar
+      HOSTNAME: build-system-x86-32-chroot
 - morph: systems/build-system-x86_32.morph
   deploy:
     build-system-x86_32:
       type: extensions/rawdisk
       location: build-system-x86_32.img
       DISK_SIZE: 6G
+      HOSTNAME: build-system-x86-32
 - morph: systems/build-system-x86_64-chroot.morph
   deploy:
     build-system-x86_64-chroot:
       type: extensions/tar
       location: build-system-x86_64-chroot.tar
+      HOSTNAME: build-system-x86-64-chroot
 - morph: systems/build-system-x86_64.morph
   deploy:
     build-system-x86_64:
@@ -30,6 +33,7 @@ systems:
       location: build-system-x86_64.img
       DISK_SIZE: 6G
       INITRAMFS_PATH: boot/initramfs.gz
+      HOSTNAME: build-system-x86_64
   subsystems:
   - morph: systems/initramfs-x86_64.morph
     deploy:
@@ -48,29 +52,4 @@ systems:
       BOOTLOADER_CONFIG_FORMAT: "extlinux"
       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
-  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
-  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: build-system-armv7lhf-jetson
-- 
cgit v1.2.1