aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2019-06-30 22:55:46 -0400
committerHongxu Jia <hongxu.jia@windriver.com>2019-07-06 11:29:49 +0800
commit159e81417c4f974ea238a7c219a67f7400519804 (patch)
treef0f1bced3c72d53ccae7caeedb454d86428301d7
parent69405eaac4cd3bf69895fbaea02f03eab3e86060 (diff)
downloadmeta-anaconda-159e81417c4f974ea238a7c219a67f7400519804.tar.gz
meta-anaconda-159e81417c4f974ea238a7c219a67f7400519804.tar.bz2
meta-anaconda-159e81417c4f974ea238a7c219a67f7400519804.zip
python3-anaconda re-organize local patch: rebase 0065-bootloader.py-fix-UEFI-multilib-installation.patch
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-rw-r--r--recipes-installer/anaconda/files/0065-bootloader.py-fix-UEFI-multilib-installation.patch20
1 files changed, 10 insertions, 10 deletions
diff --git a/recipes-installer/anaconda/files/0065-bootloader.py-fix-UEFI-multilib-installation.patch b/recipes-installer/anaconda/files/0065-bootloader.py-fix-UEFI-multilib-installation.patch
index 1de8e75..5c0080b 100644
--- a/recipes-installer/anaconda/files/0065-bootloader.py-fix-UEFI-multilib-installation.patch
+++ b/recipes-installer/anaconda/files/0065-bootloader.py-fix-UEFI-multilib-installation.patch
@@ -1,7 +1,7 @@
-From c1ddff0b0f2b6f2942d2f2c38b992dced8c4f542 Mon Sep 17 00:00:00 2001
-From: Ovidiu Panait <ovidiu.panait@windriver.com>
-Date: Thu, 9 Aug 2018 17:32:24 +0800
-Subject: [PATCH 65/65] bootloader.py: fix UEFI multilib installation
+From d081c0284d061290b2fe56b78c688a8d133b40b4 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Mon, 1 Jul 2019 10:55:12 +0800
+Subject: [PATCH] bootloader.py: fix UEFI multilib installation
Fix the following UEFI installation errors when installing multilib
images on intel-x86-64:
@@ -20,14 +20,14 @@ Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
- pyanaconda/bootloader.py | 15 +++++++++++++++
+ pyanaconda/bootloader/efi.py | 15 +++++++++++++++
1 file changed, 15 insertions(+)
-diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
-index 530ff3a..dfce593 100644
---- a/pyanaconda/bootloader.py
-+++ b/pyanaconda/bootloader.py
-@@ -1815,10 +1815,25 @@ class EFIBase(object):
+diff --git a/pyanaconda/bootloader/efi.py b/pyanaconda/bootloader/efi.py
+index 6199b51..b2413a0 100644
+--- a/pyanaconda/bootloader/efi.py
++++ b/pyanaconda/bootloader/efi.py
+@@ -137,10 +137,25 @@ class EFIBase(object):
f.write('grub-mkimage -c /tmp/load.cfg $@ search_fs_uuid\n')
os.chmod(util.getSysroot() + "/tmp/grub-mkimage-wrapper.sh", 0o755)