From ae5253edc66beaf107d3233d4ab06ec126f3c279 Mon Sep 17 00:00:00 2001 From: "Graydon, Tracy" Date: Tue, 2 Jul 2013 15:55:35 -0700 Subject: [PATCH] Change wayland image naming to be less clunky Change-Id: I65b7cfeb4b38190dc871e7b6caaa4801c6bccebe --- ks/{ivi-wayland-efi-i586.yaml => ivi-efi-i586.yaml} | 2 +- ks/{ivi-wayland-efi-x86_64.yaml => ivi-efi-x86_64.yaml} | 2 +- ks/{ivi-wayland-mbr-i586.yaml => ivi-mbr-i586.yaml} | 2 +- ks/{ivi-wayland-mbr-x86_64.yaml => ivi-mbr-x86_64.yaml} | 2 +- ks/{ivi-wayland-release-efi-i586.yaml => ivi-release-efi-i586.yaml} | 2 +- ks/{ivi-wayland-release-mbr-i586.yaml => ivi-release-mbr-i586.yaml} | 2 +- packaging/meta-ivi.changes | 3 +++ 7 files changed, 9 insertions(+), 6 deletions(-) rename ks/{ivi-wayland-efi-i586.yaml => ivi-efi-i586.yaml} (77%) rename ks/{ivi-wayland-efi-x86_64.yaml => ivi-efi-x86_64.yaml} (80%) rename ks/{ivi-wayland-mbr-i586.yaml => ivi-mbr-i586.yaml} (77%) rename ks/{ivi-wayland-mbr-x86_64.yaml => ivi-mbr-x86_64.yaml} (80%) rename ks/{ivi-wayland-release-efi-i586.yaml => ivi-release-efi-i586.yaml} (82%) rename ks/{ivi-wayland-release-mbr-i586.yaml => ivi-release-mbr-i586.yaml} (82%) diff --git a/ks/ivi-wayland-efi-i586.yaml b/ks/ivi-efi-i586.yaml similarity index 77% rename from ks/ivi-wayland-efi-i586.yaml rename to ks/ivi-efi-i586.yaml index 8eee015..96f9d3f 100644 --- a/ks/ivi-wayland-efi-i586.yaml +++ b/ks/ivi-efi-i586.yaml @@ -3,5 +3,5 @@ Schedule: "*" Active: False Platform: Wayland Part: ivi -FileName: ivi-wayland-efi-i586 +FileName: ivi-efi-i586 Kernel: kernel-x86-ivi diff --git a/ks/ivi-wayland-efi-x86_64.yaml b/ks/ivi-efi-x86_64.yaml similarity index 80% rename from ks/ivi-wayland-efi-x86_64.yaml rename to ks/ivi-efi-x86_64.yaml index e2a0345..f6cc106 100644 --- a/ks/ivi-wayland-efi-x86_64.yaml +++ b/ks/ivi-efi-x86_64.yaml @@ -3,6 +3,6 @@ Schedule: "*" Active: False Platform: Wayland Part: ivi -FileName: ivi-wayland-efi-x86_64 +FileName: ivi-efi-x86_64 Kernel: kernel-adaptation-pc Architecture: x86_84 diff --git a/ks/ivi-wayland-mbr-i586.yaml b/ks/ivi-mbr-i586.yaml similarity index 77% rename from ks/ivi-wayland-mbr-i586.yaml rename to ks/ivi-mbr-i586.yaml index 9b97f34..bcf6c39 100644 --- a/ks/ivi-wayland-mbr-i586.yaml +++ b/ks/ivi-mbr-i586.yaml @@ -3,5 +3,5 @@ Schedule: "*" Active: True Platform: Wayland Part: ivi -FileName: ivi-wayland-mbr-i586 +FileName: ivi-mbr-i586 Kernel: kernel-x86-ivi diff --git a/ks/ivi-wayland-mbr-x86_64.yaml b/ks/ivi-mbr-x86_64.yaml similarity index 80% rename from ks/ivi-wayland-mbr-x86_64.yaml rename to ks/ivi-mbr-x86_64.yaml index 9d6384c..47e5560 100644 --- a/ks/ivi-wayland-mbr-x86_64.yaml +++ b/ks/ivi-mbr-x86_64.yaml @@ -3,6 +3,6 @@ Schedule: "*" Active: False Platform: Wayland Part: ivi -FileName: ivi-wayland-mbr-x86_64 +FileName: ivi-mbr-x86_64 Kernel: kernel-adaptation-pc Architecture: x86_84 diff --git a/ks/ivi-wayland-release-efi-i586.yaml b/ks/ivi-release-efi-i586.yaml similarity index 82% rename from ks/ivi-wayland-release-efi-i586.yaml rename to ks/ivi-release-efi-i586.yaml index ab78dcd..97fbce0 100644 --- a/ks/ivi-wayland-release-efi-i586.yaml +++ b/ks/ivi-release-efi-i586.yaml @@ -3,7 +3,7 @@ Schedule: "*" Active: False Platform: Wayland Part: ivi -FileName: ivi-wayland-release-efi-i586 +FileName: ivi-release-efi-i586 Kernel: kernel-x86-ivi ExtraPackages: - release-repos diff --git a/ks/ivi-wayland-release-mbr-i586.yaml b/ks/ivi-release-mbr-i586.yaml similarity index 82% rename from ks/ivi-wayland-release-mbr-i586.yaml rename to ks/ivi-release-mbr-i586.yaml index 47e1ab0..5b4bdc6 100644 --- a/ks/ivi-wayland-release-mbr-i586.yaml +++ b/ks/ivi-release-mbr-i586.yaml @@ -3,7 +3,7 @@ Schedule: "*" Active: True Platform: Wayland Part: ivi -FileName: ivi-wayland-release-mbr-i586 +FileName: ivi-release-mbr-i586 Kernel: kernel-x86-ivi ExtraPackages: - release-repos diff --git a/packaging/meta-ivi.changes b/packaging/meta-ivi.changes index ae2b704..aa3b62e 100644 --- a/packaging/meta-ivi.changes +++ b/packaging/meta-ivi.changes @@ -1,3 +1,6 @@ +* Tue Jul 2 22:53:25 UTC 2013 - tracy.graydon@intel.com +- Drop "wayland" from the ks and image name for wayland images. It's hideously clunky. + * Tue Jul 2 19:02:39 UTC 2013 - tracy.graydon@intel.com - TIVI-1121: remove --fstab=uuid causing filesystem to be mounted ro. - Add new ks files for EFI boot (currently disabled) and rename mbr images -- 2.7.4