From 4cab512544ba3af437b80910250696054d5a2413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E7=82=9C?= <xiewei@kylinos.cn>
Date: Thu, 5 Dec 2019 19:06:09 +0800
Subject: [PATCH] part_gpt

---
 debian/changelog                              |  6 +++++
 ...077-add-part_gpt-module-to-grub2.efi.patch | 27 +++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 34 insertions(+)
 create mode 100644 debian/patches/0077-add-part_gpt-module-to-grub2.efi.patch

diff --git a/debian/changelog b/debian/changelog
index a1b5082..c08672e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-build (3.0~a57-1ubuntu33k47) bionic; urgency=medium
+
+  * add part_gpt module to grub2.efi
+
+ -- Xie Wei <xiewei@kylinos.cn>  Thu, 05 Dec 2019 19:05:09 +0800
+
 live-build (3.0~a57-1ubuntu33k46) bionic; urgency=medium
 
   [ 谢炜 ]
diff --git a/debian/patches/0077-add-part_gpt-module-to-grub2.efi.patch b/debian/patches/0077-add-part_gpt-module-to-grub2.efi.patch
new file mode 100644
index 0000000..e9a812e
--- /dev/null
+++ b/debian/patches/0077-add-part_gpt-module-to-grub2.efi.patch
@@ -0,0 +1,27 @@
+From: =?utf-8?b?6LCi54Kc?= <xiewei@kylinos.cn>
+Date: Thu, 5 Dec 2019 19:04:34 +0800
+Subject: add part_gpt module to grub2.efi
+
+---
+ scripts/build/lb_binary_grub2-efi | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/scripts/build/lb_binary_grub2-efi b/scripts/build/lb_binary_grub2-efi
+index b8bade8..c6d5c92 100644
+--- a/scripts/build/lb_binary_grub2-efi
++++ b/scripts/build/lb_binary_grub2-efi
+@@ -318,12 +318,13 @@ if [ -n "${KY_EFI}" ];then
+ input_efi_dir=${KY_EFI}
+ core_efi_img=\$(mktemp)
+ efi_mount_tmp=\$(mktemp -d)
+-grub-mkimage -o \${core_efi_img} -O ${KY_EFI_NAME} -d \${input_efi_dir}  fat part_msdos search_fs_uuid search_label search_fs_file search normal linux font all_video reboot configfile test iso9660
++grub-mkimage -o \${core_efi_img} -O ${KY_EFI_NAME} -d \${input_efi_dir}  fat part_msdos part_gpt search_fs_uuid search_label search_fs_file search normal linux font all_video reboot configfile test iso9660
+ dd if=/dev/zero of=efi.img bs=1M count=100
+ mkfs.vfat efi.img
+ mount -o loop efi.img \${efi_mount_tmp}
+ mkdir -p \${efi_mount_tmp}/efi/boot/
+ cp \${core_efi_img} \${efi_mount_tmp}/efi/boot/${KY_BOOT_EFI_NAME}
++cp -r \${efi_mount_tmp}/efi binary/
+ umount \${efi_mount_tmp}
+ rm -rf \${efi_mount_tmp}
+ rm -rf \${core_efi_img}
diff --git a/debian/patches/series b/debian/patches/series
index b466cc4..6803495 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -74,3 +74,4 @@ strip-pool-for-di.patch
 0074-save-installer.udeb-cache-when-use-custom-udeb-list.patch
 0075-create-component-Release-file-locally.patch
 0076-fix-kylin-efi.patch
+0077-add-part_gpt-module-to-grub2.efi.patch