ks: start using setup-mbr-ivi

Similarly to how we use 'setup-efi-ivi' for EFI images, start using
'setup-mbr-ivi' for MBR images. This means that MIC won't generate
extlinux.conf for us anymore, but the 'setup-mbr-ivi' script will.

The required MIC changes have been deployed on the build servers. This fixes
TIVI-1818.

Change-Id: I501ddf3f475959f386c8d2254161b8fb14f75028
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

diff --git a/ks/ivi-mbr-i586-emul.yaml b/ks/ivi-mbr-i586-emul.yaml
index 17f84ff..7047dd2 100644 (file)
--- a/ks/ivi-mbr-i586-emul.yaml
+++ b/ks/ivi-mbr-i586-emul.yaml
@@ -3,6 +3,8 @@ Schedule: "*"
 Active: True
 Mic2Options: -f loop --pack-to=@NAME@.tar.gz
 Platform: Wayland-i586
+InstallerFrameworkPlugins:
+    - bootloader
 Part: ivi-emul
 FileName: ivi-mbr-i586-emul
 Kernel: kernel-x86-ivi
@@ -11,6 +13,9 @@ Repos:
 ExtraPackages:
     - ivi-repos
     - system-plugin-emulator
+    - setup-mbr-ivi
 RemovePackages:
     - openssh
     - sdbd
+PostScripts:
+    - efi

diff --git a/ks/ivi-mbr-i586.yaml b/ks/ivi-mbr-i586.yaml
index f8400a6..0444f4f 100644 (file)
--- a/ks/ivi-mbr-i586.yaml
+++ b/ks/ivi-mbr-i586.yaml
@@ -2,6 +2,8 @@ Name: IVI MBR i586
 Schedule: "*"
 Active: True
 Platform: Wayland-i586
+InstallerFrameworkPlugins:
+    - bootloader
 Part: ivi-mbr
 FileName: ivi-mbr-i586
 Kernel: kernel-x86-ivi
@@ -9,3 +11,6 @@ Repos:
     - ivi
 ExtraPackages:
     - ivi-repos
+    - setup-mbr-ivi
+PostScripts:
+    - efi

diff --git a/ks/ivi-min-mbr-i586.yaml b/ks/ivi-min-mbr-i586.yaml
index c27f419..ce3d20b 100644 (file)
--- a/ks/ivi-min-mbr-i586.yaml
+++ b/ks/ivi-min-mbr-i586.yaml
@@ -2,6 +2,8 @@ Name: IVI Minimal MBR i586
 Schedule: "*"
 Active: True
 Platform: Default
+InstallerFrameworkPlugins:
+    - bootloader
 Part: ivi-mbr
 FileName: ivi-min-mbr-i586
 Kernel: kernel-x86-ivi
@@ -9,5 +11,7 @@ Repos:
     - ivi        
 ExtraPackages:
     - ivi-repos
+    - setup-mbr-ivi
 PostScripts:
     - base-ivi-minimal
+    - efi

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