TIVI-1052: enable EFI bootable images

Change-Id: Idf82ea263ec7ade335b6666703bd6b2c581d60c4

diff --git a/ivi.yaml b/ivi.yaml
index 504e046..5f66b67 100644 (file)
--- a/ivi.yaml
+++ b/ivi.yaml
@@ -3,7 +3,7 @@ Default:
     Active: True
     Mic2Options: -f raw --fstab=name --copy-kernel --runtime=native --compress-disk-image=bz2 --generate-bmap
     Architecture: ia32
-    Part: ivi
+    Part: ivi-mbr
     Language: en_US.UTF-8
     Keyboard: us
     Timezone: America/Los_Angeles
@@ -31,7 +31,7 @@ Default:
         - buildname  
 
 Wayland:
-    Part: ivi
+    Part: ivi-mbr
     UserGroups: "audio,video,weston-launch"
     Groups:
         - IVI Middleware

diff --git a/ks/ivi-efi-i586.yaml b/ks/ivi-efi-i586.yaml
index 96f9d3f..4bed871 100644 (file)
--- a/ks/ivi-efi-i586.yaml
+++ b/ks/ivi-efi-i586.yaml
@@ -1,7 +1,11 @@
-Name: IVI Wayland EFI i586
+Name: IVI EFI i586
 Schedule: "*"
-Active: False
+Active: True
 Platform: Wayland
-Part: ivi
+Part: ivi-efi
 FileName: ivi-efi-i586
 Kernel: kernel-x86-ivi
+ExtraPackages:
+    - setup-efi-ivi
+PostScripts:
+    - efi

diff --git a/ks/ivi-efi-x86_64.yaml b/ks/ivi-efi-x86_64.yaml
index f6cc106..e529893 100644 (file)
--- a/ks/ivi-efi-x86_64.yaml
+++ b/ks/ivi-efi-x86_64.yaml
@@ -1,8 +1,12 @@
-Name: IVI Wayland EFI x86_64
+Name: IVI EFI x86_64
 Schedule: "*"
 Active: False
 Platform: Wayland
-Part: ivi
+Part: ivi-efi
 FileName: ivi-efi-x86_64
 Kernel: kernel-adaptation-pc
 Architecture: x86_84
+ExtraPackages:
+    - setup-efi-ivi
+PostScripts:
+    - efi

diff --git a/ks/ivi-mbr-i586.yaml b/ks/ivi-mbr-i586.yaml
index bcf6c39..ac6d4dd 100644 (file)
--- a/ks/ivi-mbr-i586.yaml
+++ b/ks/ivi-mbr-i586.yaml
@@ -1,7 +1,7 @@
-Name: IVI Wayland MBR i586
+Name: IVI MBR i586
 Schedule: "*"
 Active: True
 Platform: Wayland
-Part: ivi
+Part: ivi-mbr
 FileName: ivi-mbr-i586
 Kernel: kernel-x86-ivi

diff --git a/ks/ivi-mbr-x86_64.yaml b/ks/ivi-mbr-x86_64.yaml
index 47e5560..3a646b8 100644 (file)
--- a/ks/ivi-mbr-x86_64.yaml
+++ b/ks/ivi-mbr-x86_64.yaml
@@ -1,8 +1,8 @@
-Name: IVI Wayland MBR x86_64
+Name: IVI MBR x86_64
 Schedule: "*"
 Active: False
 Platform: Wayland
-Part: ivi
+Part: ivi-mbr
 FileName: ivi-mbr-x86_64
 Kernel: kernel-adaptation-pc
 Architecture: x86_84

diff --git a/ks/ivi-min-efi-i586.yaml b/ks/ivi-min-efi-i586.yaml
index 8d48e5e..027e3d7 100644 (file)
--- a/ks/ivi-min-efi-i586.yaml
+++ b/ks/ivi-min-efi-i586.yaml
@@ -1,9 +1,13 @@
 Name: IVI Minimal EFI i586
 Schedule: "*"
-Active: False
+Active: True
 Platform: Default
-Part: ivi
+Installerfw: extlinux
+Part: ivi-efi
 FileName: ivi-min-efi-i586
 Kernel: kernel-x86-ivi
+ExtraPackages:
+    - setup-efi-ivi
 PostScripts:
     - base-ivi-minimal
+    - efi

diff --git a/ks/ivi-min-mbr-i586.yaml b/ks/ivi-min-mbr-i586.yaml
index 9e794a2..fefcdef 100644 (file)
--- a/ks/ivi-min-mbr-i586.yaml
+++ b/ks/ivi-min-mbr-i586.yaml
@@ -2,7 +2,7 @@ Name: IVI Minimal MBR i586
 Schedule: "*"
 Active: True
 Platform: Default
-Part: ivi
+Part: ivi-mbr
 FileName: ivi-min-mbr-i586
 Kernel: kernel-x86-ivi
 PostScripts:

diff --git a/ks/ivi-release-efi-i586.yaml b/ks/ivi-release-efi-i586.yaml
index 97fbce0..d1fb918 100644 (file)
--- a/ks/ivi-release-efi-i586.yaml
+++ b/ks/ivi-release-efi-i586.yaml
@@ -1,11 +1,14 @@
-Name: IVI Wayland Release EFI i586
+Name: IVI Release EFI i586
 Schedule: "*"
 Active: False
 Platform: Wayland
-Part: ivi
+Part: ivi-efi
 FileName: ivi-release-efi-i586
 Kernel: kernel-x86-ivi
 ExtraPackages:
     - release-repos
+    - setup-efi-ivi
 RemovePackages:
     - ivi-repos
+PostScripts:
+    - efi

diff --git a/ks/ivi-release-mbr-i586.yaml b/ks/ivi-release-mbr-i586.yaml
index 5b4bdc6..dea0825 100644 (file)
--- a/ks/ivi-release-mbr-i586.yaml
+++ b/ks/ivi-release-mbr-i586.yaml
@@ -1,8 +1,8 @@
-Name: IVI Wayland Release MBR i586
+Name: IVI Release MBR i586
 Schedule: "*"
-Active: True
+Active: False
 Platform: Wayland
-Part: ivi
+Part: ivi-mbr
 FileName: ivi-release-mbr-i586
 Kernel: kernel-x86-ivi
 ExtraPackages:

diff --git a/packaging/meta-ivi.changes b/packaging/meta-ivi.changes
index aa3b62e..91ce874 100644 (file)
--- a/packaging/meta-ivi.changes
+++ b/packaging/meta-ivi.changes
@@ -1,3 +1,6 @@
+* Thu Jul  4 06:18:32 UTC 2013 - tracy.graydon@intel.com
+- TIVI-1052: set up EFI bootable images
+
 * 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. 
 

diff --git a/partitions/README.ivi b/partitions/README.ivi
index e69de29..d15c3a0 100644 (file)
--- a/partitions/README.ivi
+++ b/partitions/README.ivi
@@ -0,0 +1,4 @@
+ivi-mbr partition file is for images using "legacy" mbr partitioning scheme.
+ivi-efi partition file is for images using EFI partitoning scheme.
+
+These files are referenced in the respective image ks files to set the partitioning accordingly

diff --git a/partitions/ivi-efi b/partitions/ivi-efi
new file mode 100644 (file)
index 0000000..f4f4886
--- /dev/null
+++ b/partitions/ivi-efi
@@ -0,0 +1,2 @@
+part /boot --size 64 --ondisk sdb --fstype=vfat --label boot --active --align 1024 --part-type C12A7328-F81F-11D2-BA4B-00A0C93EC93B
+part / --size 3748 --ondisk sdb --fstype=ext4 --label platform --align 1024

diff --git a/partitions/ivi b/partitions/ivi-mbr
similarity index 100%
rename from partitions/ivi
rename to partitions/ivi-mbr

diff --git a/scripts/efi.post b/scripts/efi.post
new file mode 100644 (file)
index 0000000..00df656
--- /dev/null
+++ b/scripts/efi.post
@@ -0,0 +1,3 @@
+# efi.post
+/usr/sbin/setup-efi-ivi
+