add ext2 module to grub.efi

debian/changelog

@@ -1,3 +1,10 @@
+live-build (3.0~a57-1ubuntu38k56) focal; urgency=medium
+
+  [ 谢炜 ]
+  * add ext2 module to grub.efi
+
+ -- Xie Wei <xiewei@kylinos.cn>  Wed, 03 Jun 2020 16:18:45 +0800
+
 live-build (3.0~a57-1ubuntu38k55) focal; urgency=medium
 
   [ 谢炜 ]

debian/patches/0082-drop-default-initramfs-compression-override.patch

@@ -1,21 +0,0 @@
-From: =?utf-8?b?6LCi54Kc?= <xiewei@kylinos.cn>
-Date: Tue, 10 Mar 2020 10:11:56 +0800
-Subject: drop default initramfs compression override
-
----
- functions/defaults.sh | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/functions/defaults.sh b/functions/defaults.sh
-index 9368a9d..6f4b82c 100755
---- a/functions/defaults.sh
-+++ b/functions/defaults.sh
-@@ -220,8 +220,6 @@ Set_defaults ()
- 			;;
- 	esac
- 
--	LB_INITRAMFS_COMPRESSION="${LB_INITRAMFS_COMPRESSION:-gzip}"
--
- 	# Setting initsystem
- 	case "${LB_MODE}" in
- 		ubuntu|kubuntu)

debian/patches/0085-add-mips64el-support.patch

@@ -9,10 +9,10 @@ Subject: add mips64el support
  mode change 100644 => 100755 scripts/build/lb_binary_grub2-efi
 
 diff --git a/functions/defaults.sh b/functions/defaults.sh
-index 6f4b82c..b836ad5 100755
+index 9368a9d..349f157 100755
 --- a/functions/defaults.sh
 +++ b/functions/defaults.sh
-@@ -696,6 +696,10 @@ Set_defaults ()
+@@ -698,6 +698,10 @@ Set_defaults ()
  			# Assume we'll have a generic kernel for arm64 some day:
  			LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
  			;;

debian/patches/0087-add-ext2-module-to-grub.efi.patch

@@ -0,0 +1,21 @@
+From: =?utf-8?b?6LCi54Kc?= <xiewei@kylinos.cn>
+Date: Wed, 3 Jun 2020 16:18:04 +0800
+Subject: add ext2 module to grub.efi
+
+---
+ scripts/build/lb_binary_grub2-efi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/build/lb_binary_grub2-efi b/scripts/build/lb_binary_grub2-efi
+index af653ed..4f95d8f 100755
+--- a/scripts/build/lb_binary_grub2-efi
++++ b/scripts/build/lb_binary_grub2-efi
+@@ -338,7 +338,7 @@ if [ -n "${KY_EFI}" ];then
+ input_efi_dir=${KY_EFI}
+ core_efi_img=\$(mktemp)
+ efi_mount_tmp=\$(mktemp -d)
+-grub-mkimage -p /boot/grub -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
++grub-mkimage -p /boot/grub -o \${core_efi_img} -O ${KY_EFI_NAME} -d \${input_efi_dir} ext2 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}

debian/patches/series

@@ -84,3 +84,4 @@ strip-pool-for-di.patch
 0085-add-mips64el-support.patch
 0086-ignore-update-apt-xapian-index-error.patch
 0087-check-makedev-in-lb_binary_grub2-efi.patch
+0087-add-ext2-module-to-grub.efi.patch