Added UEFI specific fix - we need to apply different kernel configurations for 32-bit and 64-bit targets. Tested the build process (works fine), UEFI boot from CD (works fine), BIOS boot from CD (works fine) and EFI boot from HDD after manual installation (works fine). The installer part is still not UEFI ready.

This commit is contained in:
Ivan Davidov 2016-10-16 18:22:50 +03:00
parent 50fb618a0b
commit 66630efd28
2 changed files with 10 additions and 3 deletions

View File

@ -75,8 +75,15 @@ else
# Enable the EFI stub
sed -i "s/.*CONFIG_EFI_STUB.*/CONFIG_EFI_STUB=y/" .config
# Explicitly enable the mixed EFI mode.
# Check if we are building 32-bit kernel. The exit code is '1' when we are
# building 64-bit kernel, otherwise the exit status is '0'.
grep -q "CONFIG_X86_32=y" .config
# The '$?' variable holds the exit code of the last issued command.
if [ $? = 1 ] ; then
# Enable the mixed EFI mode when building 64-bit kernel.
echo "CONFIG_EFI_MIXED=y" > .config
fi
fi
# Compile the kernel with optimization for 'parallel jobs' = 'number of processors'.

View File

@ -136,7 +136,7 @@ echo 'default kernel.xz initrd=rootfs.xz vga=ask' > ./syslinux.cfg
mkdir -p efi/boot
cat << CEOF > ./efi/boot/startup.nsh
echo -off
echo "Minimal Linux Live" is starting...
echo Minimal Linux Live is starting...
\\kernel.xz initrd=\\rootfs.xz
CEOF