16 files changed, 320 insertions, 6 deletions
diff --git a/common-targets.yaml b/common-targets.yaml
index e2a5bde..cfe3ad1 100644
--- a/common-targets.yaml
+++ b/common-targets.yaml
@@ -3,29 +3,39 @@ Targets:
     -   Name: ia32-wayland
         Images:
             - common-installer-mbr-i586.yaml
+            - common-installer-efi-i586.yaml
             - common-wayland-mbr-i586.yaml
+            - common-wayland-efi-i586.yaml
             - common-qa-unsafe-wayland-mbr-i586.yaml
+            - common-qa-unsafe-wayland-efi-i586.yaml
 
     -   Name: emulator32-wayland
         Images:
             - common-emulator-wayland-mbr-i586.yaml
+            - common-emulator-wayland-efi-i586.yaml
             - common-emulator-qa-unsafe-wayland-mbr-i586.yaml
+            - common-emulator-qa-unsafe-wayland-efi-i586.yaml
 
     -   Name: ia32-x11
         Images:
             - common-x11-mbr-i586.yaml
+            - common-x11-efi-i586.yaml
             - common-qa-unsafe-x11-mbr-i586.yaml
+            - common-qa-unsafe-x11-efi-i586.yaml
 
     -   Name: x86_64-wayland
         Images:
             - common-wayland-mbr-x86_64.yaml
+            - common-wayland-efi-x86_64.yaml
             - common-qa-unsafe-wayland-mbr-x86_64.yaml
             - common-qa-unsafe-wayland-efi-x86_64.yaml
 
     -   Name: x86_64-x11
         Images:
             - common-x11-mbr-x86_64.yaml
+            - common-x11-efi-x86_64.yaml
             - common-qa-unsafe-x11-mbr-x86_64.yaml
+            - common-qa-unsafe-x11-efi-x86_64.yaml
 
     -   Name: arm-wayland
         Images:
diff --git a/ks/common-emulator-qa-unsafe-wayland-efi-i586.yaml b/ks/common-emulator-qa-unsafe-wayland-efi-i586.yaml
new file mode 100644
index 0000000..e22df21
--- /dev/null
+++ b/ks/common-emulator-qa-unsafe-wayland-efi-i586.yaml
@@ -0,0 +1,29 @@
+Name: common-emulator-qa-unsafe-wayland-efi-i586
+Architecture: ia32
+Schedule: "*"
+Active: True
+Platform: Wayland
+InstallerFrameworkPlugins:
+    - bootloader
+    - fstab
+Part: common-efi
+Mic2Options: -f loop --pack-to=@NAME@.tar.gz --copy-kernel
+FileName: common-emulator-qa-unsafe-wayland-efi-i586
+Kernel: kernel-profile-common
+Repos:
+    - common-emulator-wayland_i586
+Groups:
+    - Generic Multimedia Intel
+    - Generic Automated QA Tools
+    - Generic QA Tools
+    - Common QA Tools
+    - Generic Setup Boot
+ExtraPackages:
+    - sdbd
+    - system-plugin-emulator
+PostScripts:
+    - generic-multimedia-intel
+    - generic-autoqa
+    - generic-qa
+    - common-qa
+    - generic-setup-boot
diff --git a/ks/common-emulator-wayland-efi-i586.yaml b/ks/common-emulator-wayland-efi-i586.yaml
new file mode 100644
index 0000000..b414f6f
--- /dev/null
+++ b/ks/common-emulator-wayland-efi-i586.yaml
@@ -0,0 +1,23 @@
+Name: common-emulator-wayland-efi-i586
+Architecture: ia32
+Schedule: "*"
+Active: True
+Platform: Wayland
+InstallerFrameworkPlugins:
+    - bootloader
+    - fstab
+Part: common-efi
+Mic2Options: -f loop --pack-to=@NAME@.tar.gz --copy-kernel
+FileName: common-emulator-wayland-efi-i586
+Kernel: kernel-profile-common
+Repos:
+    - common-emulator-wayland_i586
+ExtraPackages:
+    - sdbd
+    - system-plugin-emulator
+Groups:
+    - Generic Multimedia Intel
+    - Generic Setup Boot
+PostScripts:
+    - generic-multimedia-intel
+    - generic-setup-boot
diff --git a/ks/common-installer-efi-i586.yaml b/ks/common-installer-efi-i586.yaml
new file mode 100644
index 0000000..962f792
--- /dev/null
+++ b/ks/common-installer-efi-i586.yaml
@@ -0,0 +1,19 @@
+Name: common-installer-efi-i586
+Architecture: ia32
+Schedule: "*"
+Active: True
+Platform: Installer
+InstallerFrameworkPlugins:
+    - bootloader
+    - fstab
+Part: common-efi
+FileName: common-installer-efi-i586
+Kernel: kernel-profile-common
+Repos:
+    - common-wayland_i586
+Groups:
+    - Generic Setup Boot
+PostScripts:
+    - generic-setup-boot
+ExtraPackages:
+    - system-installer
diff --git a/ks/common-minimal-efi-i586.yaml b/ks/common-minimal-efi-i586.yaml
new file mode 100644
index 0000000..078b693
--- /dev/null
+++ b/ks/common-minimal-efi-i586.yaml
@@ -0,0 +1,17 @@
+Name: common-minimal-efi-i586
+Architecture: ia32
+Schedule: "*"
+Active: True
+Platform: Minimal
+InstallerFrameworkPlugins:
+    - bootloader
+    - fstab
+Part: common-efi
+FileName: common-minimal-efi-i586
+Kernel: kernel-profile-common
+Repos:
+    - common-wayland_i586
+Groups:
+    - Generic Setup Boot
+PostScripts:
+    - generic-setup-boot
diff --git a/ks/common-minimal-efi-x86_64.yaml b/ks/common-minimal-efi-x86_64.yaml
new file mode 100644
index 0000000..00edd50
--- /dev/null
+++ b/ks/common-minimal-efi-x86_64.yaml
@@ -0,0 +1,17 @@
+Name: common-minimal-efi-x86_64
+Architecture: x86_64
+Schedule: "*"
+Active: True
+Platform: Minimal
+InstallerFrameworkPlugins:
+    - bootloader
+    - fstab
+Part: common-efi
+FileName: common-minimal-efi-x86_64
+Kernel: kernel-profile-common
+Repos:
+    - common-wayland_x86_64
+Groups:
+    - Generic Setup Boot
+PostScripts:
+    - generic-setup-boot
diff --git a/ks/common-qa-unsafe-minimal-efi-i586.yaml b/ks/common-qa-unsafe-minimal-efi-i586.yaml
new file mode 100644
index 0000000..166dc50
--- /dev/null
+++ b/ks/common-qa-unsafe-minimal-efi-i586.yaml
@@ -0,0 +1,23 @@
+Name: common-qa-unsafe-minimal-efi-i586
+Architecture: ia32
+Schedule: "*"
+Active: True
+Platform: Minimal
+InstallerFrameworkPlugins:
+    - bootloader
+    - fstab
+Part: common-efi
+FileName: common-qa-unsafe-minimal-efi-i586
+Kernel: kernel-profile-common
+Repos:
+    - common-wayland_i586
+Groups:
+    - Generic Automated QA Tools
+    - Generic QA Tools
+    - Common QA Tools
+    - Generic Setup Boot
+PostScripts:
+    - generic-autoqa
+    - generic-qa
+    - common-qa
+    - generic-setup-boot
diff --git a/ks/common-qa-unsafe-minimal-efi-x86_64.yaml b/ks/common-qa-unsafe-minimal-efi-x86_64.yaml
new file mode 100644
index 0000000..7b1b4e9
--- /dev/null
+++ b/ks/common-qa-unsafe-minimal-efi-x86_64.yaml
@@ -0,0 +1,23 @@
+Name: common-qa-unsafe-minimal-efi-x86_64
+Architecture: x86_64
+Schedule: "*"
+Active: True
+Platform: Minimal
+InstallerFrameworkPlugins:
+    - bootloader
+    - fstab
+Part: common-efi
+FileName: common-qa-unsafe-minimal-efi-x86_64
+Kernel: kernel-profile-common
+Repos:
+    - common-wayland_x86_64
+Groups:
+    - Generic Automated QA Tools
+    - Generic QA Tools
+    - Common QA Tools
+    - Generic Setup Boot
+PostScripts:
+    - generic-autoqa
+    - generic-qa
+    - common-qa
+    - generic-setup-boot
diff --git a/ks/common-qa-unsafe-wayland-efi-i586.yaml b/ks/common-qa-unsafe-wayland-efi-i586.yaml
new file mode 100644
index 0000000..098c1de
--- /dev/null
+++ b/ks/common-qa-unsafe-wayland-efi-i586.yaml
@@ -0,0 +1,25 @@
+Name: common-qa-unsafe-wayland-efi-i586
+Architecture: ia32
+Schedule: "*"
+Active: True
+Platform: Wayland
+InstallerFrameworkPlugins:
+    - bootloader
+    - fstab
+Part: common-efi
+FileName: common-qa-unsafe-wayland-efi-i586
+Kernel: kernel-profile-common
+Repos:
+    - common-wayland_i586
+Groups:
+    - Generic Multimedia Intel
+    - Generic Automated QA Tools
+    - Generic QA Tools
+    - Common QA Tools
+    - Generic Setup Boot
+PostScripts:
+    - generic-multimedia-intel
+    - generic-autoqa
+    - generic-qa
+    - common-qa
+    - generic-setup-boot
diff --git a/ks/common-qa-unsafe-wayland-efi-x86_64.yaml b/ks/common-qa-unsafe-wayland-efi-x86_64.yaml
index 04f9329..f0a1aaf 100644
--- a/ks/common-qa-unsafe-wayland-efi-x86_64.yaml
+++ b/ks/common-qa-unsafe-wayland-efi-x86_64.yaml
@@ -23,9 +23,3 @@ PostScripts:
     - generic-qa
     - common-qa
     - generic-setup-boot
-ExtraPackages:
-    - gummiboot-splash
-    - setup-scripts-gummiboot
-    - setup-scripts-clone
-    - gptfdisk
-
diff --git a/ks/common-qa-unsafe-x11-efi-i586.yaml b/ks/common-qa-unsafe-x11-efi-i586.yaml
new file mode 100644
index 0000000..4e8025d
--- /dev/null
+++ b/ks/common-qa-unsafe-x11-efi-i586.yaml
@@ -0,0 +1,27 @@
+Name: common-qa-unsafe-x11-efi-i586
+Architecture: ia32
+Schedule: "*"
+Active: True
+Platform: X11
+InstallerFrameworkPlugins:
+    - bootloader
+    - fstab
+Part: common-efi
+FileName: common-qa-unsafe-x11-efi-i586
+Kernel: kernel-profile-common
+Repos:
+    - common-x11_i586
+Groups:
+    - Generic X11 Intel
+    - Generic Multimedia Intel
+    - Generic Automated QA Tools
+    - Generic QA Tools
+    - Common QA Tools
+    - Generic Setup Boot
+PostScripts:
+    - generic-x11-intel
+    - generic-multimedia-intel
+    - generic-autoqa
+    - generic-qa
+    - common-qa
+    - generic-setup-boot
diff --git a/ks/common-qa-unsafe-x11-efi-x86_64.yaml b/ks/common-qa-unsafe-x11-efi-x86_64.yaml
new file mode 100644
index 0000000..3c67d67
--- /dev/null
+++ b/ks/common-qa-unsafe-x11-efi-x86_64.yaml
@@ -0,0 +1,27 @@
+Name: common-qa-unsafe-x11-efi-x86_64
+Architecture: x86_64
+Schedule: "*"
+Active: True
+Platform: X11
+InstallerFrameworkPlugins:
+    - bootloader
+    - fstab
+Part: common-efi
+FileName: common-qa-unsafe-x11-efi-x86_64
+Kernel: kernel-profile-common
+Repos:
+    - common-x11_x86_64
+Groups:
+    - Generic X11 Intel
+    - Generic Multimedia Intel
+    - Generic Automated QA Tools
+    - Generic QA Tools
+    - Common QA Tools
+    - Generic Setup Boot
+PostScripts:
+    - generic-x11-intel
+    - generic-multimedia-intel
+    - generic-autoqa
+    - generic-qa
+    - common-qa
+    - generic-setup-boot
diff --git a/ks/common-wayland-efi-i586.yaml b/ks/common-wayland-efi-i586.yaml
new file mode 100644
index 0000000..c498dc5
--- /dev/null
+++ b/ks/common-wayland-efi-i586.yaml
@@ -0,0 +1,19 @@
+Name: common-wayland-efi-i586
+Architecture: ia32
+Schedule: "*"
+Active: True
+Platform: Wayland
+InstallerFrameworkPlugins:
+    - bootloader
+    - fstab
+Part: common-efi
+FileName: common-wayland-efi-i586
+Kernel: kernel-profile-common
+Repos:
+    - common-wayland_i586
+Groups:
+    - Generic Multimedia Intel
+    - Generic Setup Boot
+PostScripts:
+    - generic-multimedia-intel
+    - generic-setup-boot
diff --git a/ks/common-wayland-efi-x86_64.yaml b/ks/common-wayland-efi-x86_64.yaml
new file mode 100644
index 0000000..97c5891
--- /dev/null
+++ b/ks/common-wayland-efi-x86_64.yaml
@@ -0,0 +1,19 @@
+Name: common-wayland-efi-x86_64
+Architecture: x86_64
+Schedule: "*"
+Active: True
+Platform: Wayland
+InstallerFrameworkPlugins:
+    - bootloader
+    - fstab
+Part: common-efi
+FileName: common-wayland-efi-x86_64
+Kernel: kernel-profile-common
+Repos:
+    - common-wayland_x86_64
+Groups:
+    - Generic Multimedia Intel
+    - Generic Setup Boot
+PostScripts:
+    - generic-multimedia-intel
+    - generic-setup-boot
diff --git a/ks/common-x11-efi-i586.yaml b/ks/common-x11-efi-i586.yaml
new file mode 100644
index 0000000..eee87d2
--- /dev/null
+++ b/ks/common-x11-efi-i586.yaml
@@ -0,0 +1,21 @@
+Name: common-x11-efi-i586
+Architecture: ia32
+Schedule: "*"
+Active: True
+Platform: X11
+InstallerFrameworkPlugins:
+    - bootloader
+    - fstab
+Part: common-efi
+FileName: common-x11-efi-i586
+Kernel: kernel-profile-common
+Repos:
+    - common-x11_i586
+Groups:
+    - Generic X11 Intel
+    - Generic Multimedia Intel
+    - Generic Setup Boot
+PostScripts:
+    - generic-x11-intel
+    - generic-multimedia-intel
+    - generic-setup-boot
diff --git a/ks/common-x11-efi-x86_64.yaml b/ks/common-x11-efi-x86_64.yaml
new file mode 100644
index 0000000..5ec3eaf
--- /dev/null
+++ b/ks/common-x11-efi-x86_64.yaml
@@ -0,0 +1,21 @@
+Name: common-x11-efi-x86_64
+Architecture: x86_64
+Schedule: "*"
+Active: True
+Platform: X11
+InstallerFrameworkPlugins:
+    - bootloader
+    - fstab
+Part: common-efi
+FileName: common-x11-efi-x86_64
+Kernel: kernel-profile-common
+Repos:
+    - common-x11_x86_64
+Groups:
+    - Generic X11 Intel
+    - Generic Multimedia Intel
+    - Generic Setup Boot
+PostScripts:
+    - generic-x11-intel
+    - generic-multimedia-intel
+    - generic-setup-boot