openkylin
/
live-build
mirror of https://gitee.com/openkylin/live-build.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

适配openkylin grub2 2.12, 不存在linuxefi模块时就不添加

This commit is contained in:
谢炜 2023-11-03 18:19:54 +08:00
parent 7315c6290e
commit 83184edaa9
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
live-build (3.0~a57-ok5) nile; urgency=medium
* 适配openkylin grub2 2.12, 不存在linuxefi模块时就不添加
-- Xie Wei <xiewei@kylinos.cn> Fri, 03 Nov 2023 18:18:43 +0800
live-build (3.0~a57-ok4) nile; urgency=medium live-build (3.0~a57-ok4) nile; urgency=medium
* add depends dpkg-dev, apt-utils * add depends dpkg-dev, apt-utils

3
scripts/build/lb_binary_grub2-efi
View File

@ -327,7 +327,10 @@ if [ -d chroot/usr/lib/grub/x86_64-efi ];then
KY_EFI_NAME="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" KY_GRUB_EFI_NAME="grubx64.efi"
if [ -f /usr/lib/grub/x86_64-efi/linuxefi.mod ]
then
GRUB_MODS="${GRUB_MODS} linuxefi" GRUB_MODS="${GRUB_MODS} linuxefi"
fi
elif [ -d chroot/usr/lib/grub/arm64-efi ];then elif [ -d chroot/usr/lib/grub/arm64-efi ];then
KY_EFI="/usr/lib/grub/arm64-efi" KY_EFI="/usr/lib/grub/arm64-efi"
KY_EFI_NAME="arm64-efi" KY_EFI_NAME="arm64-efi"