liuyi: add KY_GRUB_EFI image

debian/changelog

@@ -1,3 +1,10 @@
+live-build (3.0~a57-1ubuntu38k50) bionic; urgency=medium
+
+  [ 谢炜 ]
+  * liuyi: add KY_GRUB_EFI image
+
+ -- Xie Wei <xiewei@kylinos.cn>  Mon, 23 Mar 2020 17:02:33 +0800
+
 live-build (3.0~a57-1ubuntu38k49) bionic; urgency=medium
 
   [ 谢炜 ]

debian/patches/0083-liuyi-add-KY_GRUB_EFI-image.patch

@@ -0,0 +1,42 @@
+From: =?utf-8?b?6LCi54Kc?= <xiewei@kylinos.cn>
+Date: Mon, 23 Mar 2020 17:01:17 +0800
+Subject: liuyi: add KY_GRUB_EFI image
+
+---
+ scripts/build/lb_binary_grub2-efi | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/scripts/build/lb_binary_grub2-efi b/scripts/build/lb_binary_grub2-efi
+index 477fdb1..05a93f9 100644
+--- a/scripts/build/lb_binary_grub2-efi
++++ b/scripts/build/lb_binary_grub2-efi
+@@ -304,11 +304,13 @@ KY_EFI_NAME=""
+ if [ -d chroot/usr/lib/grub/x86_64-efi ];then
+     KY_EFI="/usr/lib/grub/x86_64-efi"
+     KY_EFI_NAME="x86_64-efi"
+-    KY_BOOT_EFI_NAME="bootx64.efi"
++    KY_BOOT_EFI_NAME="BOOTX64.EFI"
++    KY_GRUB_EFI_NAME="grubx64.efi"
+ elif  [ -d chroot/usr/lib/grub/arm64-efi ];then
+     KY_EFI="/usr/lib/grub/arm64-efi"
+     KY_EFI_NAME="arm64-efi"
+-    KY_BOOT_EFI_NAME="bootaa64.efi"
++    KY_BOOT_EFI_NAME="BOOTAA64.EFI"
++    KY_GRUB_EFI_NAME="grubaa64.efi"
+ fi
+ 
+ mkdir -p binary/boot/grub
+@@ -321,9 +323,10 @@ grub-mkimage -o \${core_efi_img} -O ${KY_EFI_NAME} -d \${input_efi_dir}  fat par
+ 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/
++mkdir -p \${efi_mount_tmp}/EFI/BOOT/
++cp \${core_efi_img} \${efi_mount_tmp}/EFI/BOOT/${KY_BOOT_EFI_NAME}
++cp \${core_efi_img} \${efi_mount_tmp}/EFI/BOOT/${KY_GRUB_EFI_NAME}
++cp -r \${efi_mount_tmp}/EFI binary/
+ umount \${efi_mount_tmp}
+ rm -rf \${efi_mount_tmp}
+ rm -rf \${core_efi_img}

debian/patches/series

@@ -80,3 +80,4 @@ strip-pool-for-di.patch
 0080-late-resolv.conf-symlink.patch
 0081-Handle-includes.chroot-files-installed-over-symlinke.patch
 0082-drop-default-initramfs-compression-override.patch
+0083-liuyi-add-KY_GRUB_EFI-image.patch