[meego-commits] 14733: Changes to Trunk:Testing/installer

[Liu Xinyun]

Hi,
I have made the following changes to installer in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Liu Xinyun

[This message was auto-generated]

---

Request #14733:

  submit:   home:xyl:branches:Trunk:Testing/installer(r2)(cleanup) -> Trunk:Testing/installer


Message:
    Fix BMC #11970. Use mesa.c32 for IVI image to workaround cosole switch issue.

State:   new          2011-03-13T22:47:25 xyl
Comment: None



changes files:
--------------
--- installer.changes
+++ installer.changes
@@ -0,0 +1,3 @@
+* Mon Mar 14 2011 Liu,Xinyun <xinyun.liu at intel.com> - 0.56
+- Fix BMC #11970. Use mesa.c32 for IVI image to workaround cosole switch issue.
+

new:
----
  fix-11970-switch-console.patch

spec files:
-----------
--- installer.spec
+++ installer.spec
@@ -31,6 +31,7 @@
 Patch1:     fix-4065-launch-install-from-menu.patch
 Patch2:     fix-5266-set-default-bootdev.patch
 Patch3:     fix-7294-typo-german-po.patch
+Patch4:     fix-11970-switch-console.patch
 Requires:   pygtk2-libglade
 Requires:   rpm-python >= %{rpmpythonver}
 Requires:   rhpl >= %{rhplver}
@@ -107,6 +108,8 @@
 %patch2 -p1
 # fix-7294-typo-german-po.patch
 %patch3 -p1
+# fix-11970-switch-console.patch
+%patch4 -p1
 # >> setup
 # << setup
 

other changes:
--------------

++++++ fix-11970-switch-console.patch (new)
--- fix-11970-switch-console.patch
+++ fix-11970-switch-console.patch
+diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py
+index 2c25931..77bbd47 100644
+--- a/booty/bootloaderInfo.py
++++ b/booty/bootloaderInfo.py
+@@ -705,7 +705,7 @@ class syslinuxBootloaderInfo(bootloaderInfo):
+ 
+         defaultmenu="default vesamenu.c32"
+         for (label, longlabel, version) in kernelList:
+-            if version.find("-ivi") != -1:
++            if version.find("-connext") != -1 or version.find("-automotive") != -1 :
+                 log.info("booty: ivi build, use menu.c32")
+                 defaultmenu="default menu.c32"
+                 break

++++++ installer.yaml
--- installer.yaml
+++ installer.yaml
@@ -13,6 +13,7 @@
     - fix-4065-launch-install-from-menu.patch
     - fix-5266-set-default-bootdev.patch
     - fix-7294-typo-german-po.patch
+    - fix-11970-switch-console.patch
 Description: |
     The installer package contains the program which was used to install your 
     system.  These files are of little use on an already installed system.