3 files changed, 84 insertions, 1 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui/0007-Fix-some-page-keeps-loading-on-IE11.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui/0007-Fix-some-page-keeps-loading-on-IE11.patch
new file mode 100644
index 000000000..31d810cb6
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui/0007-Fix-some-page-keeps-loading-on-IE11.patch
@@ -0,0 +1,68 @@
+From 5a3750377629725890f949d68e7e0ba7d4752825 Mon Sep 17 00:00:00 2001
+From: Mirage Su <mirage.su@mic.com.tw>
+Date: Fri, 8 Mar 2019 17:12:46 +0800
+Subject: [PATCH] Fix some page keeps loading on IE11
+
+---
+ app/index.js      |  1 +
+ package-lock.json | 19 +++++++++++++++++++
+ package.json      |  1 +
+ 3 files changed, 21 insertions(+)
+ mode change 100644 => 100755 package-lock.json
+
+diff --git a/app/index.js b/app/index.js
+index c9fed83..c51203e 100644
+--- a/app/index.js
++++ b/app/index.js
+@@ -8,6 +8,7 @@
+  */
+ import 'angular/angular-csp.css';
+ import 'bootstrap/dist/css/bootstrap.css';
++import 'babel-polyfill';
+ 
+ import angular from 'angular';
+ import angular_animate from 'angular-animate';
+diff --git a/package-lock.json b/package-lock.json
+old mode 100644
+new mode 100755
+index 2d9d31b..61e9787
+--- a/package-lock.json
++++ b/package-lock.json
+@@ -1500,6 +1500,25 @@
+         "babel-runtime": "6.26.0"
+       }
+     },
++    "babel-polyfill": {
++      "version": "6.26.0",
++      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
++      "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
++      "dev": true,
++      "requires": {
++        "babel-runtime": "^6.26.0",
++        "core-js": "^2.5.0",
++        "regenerator-runtime": "^0.10.5"
++      },
++      "dependencies": {
++        "regenerator-runtime": {
++          "version": "0.10.5",
++          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
++          "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
++          "dev": true
++        }
++      }
++    },
+     "babel-register": {
+       "version": "6.26.0",
+       "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
+diff --git a/package.json b/package.json
+index 35c6b78..1bdf934 100644
+--- a/package.json
++++ b/package.json
+@@ -50,6 +50,7 @@
+     "autoprefixer": "9.1.5",
+     "babel-core": "6.26.3",
+     "babel-loader": "8.0.2",
++    "babel-polyfill": "^6.26.0",
+     "compression-webpack-plugin": "2.0.0",
+     "copy-webpack-plugin": "4.5.2",
+     "csp-html-webpack-plugin": "^2.5.0",
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui/config.json b/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui/config.json
new file mode 100644
index 000000000..1543a6249
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui/config.json
@@ -0,0 +1,8 @@
+{
+  "customKeyEnable": true,
+  "keyType" : "VT100+",
+  "customConsoleDisplaySize": {
+    "width": 100,
+    "height": 32
+  }
+}
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend
index e40b5ed8e..dd1ed6613 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend
@@ -1,3 +1,10 @@
 FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
 
-SRC_URI += "file://0001-Implement-KVM-in-webui.patch"
+SRC_URI += "file://0001-Implement-KVM-in-webui.patch \
+            file://config.json \
+            file://0007-Fix-some-page-keeps-loading-on-IE11.patch \
+            "
+
+do_compile_prepend() {
+        cp -r ${WORKDIR}/config.json ${S}/
+}