Update isolinux to 6.03

Use the binary files from AOSP source tree.

diff --git a/Android.mk b/Android.mk
index b62f7d6..a4241e2 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -61,11 +61,20 @@ $(INSTALL_RAMDISK): $(wildcard $(LOCAL_PATH)/install/*/* $(LOCAL_PATH)/install/*
        $(if $(TARGET_INSTALL_SCRIPTS),mkdir -p $(TARGET_INSTALLER_OUT)/scripts; $(ACP) -p $(TARGET_INSTALL_SCRIPTS) $(TARGET_INSTALLER_OUT)/scripts)
        $(MKBOOTFS) $(dir $(dir $(<D))) $(TARGET_INSTALLER_OUT) | gzip -9 > $@
 
+isolinux_files := $(addprefix external/syslinux/bios/com32/, \
+       ../core/isolinux.bin \
+       chain/chain.c32 \
+       elflink/ldlinux/ldlinux.c32 \
+       lib/libcom32.c32 \
+       libutil/libutil.c32 \
+       menu/vesamenu.c32)
+
 boot_dir := $(PRODUCT_OUT)/boot
-$(boot_dir): $(shell find $(LOCAL_PATH)/boot -type f | sort -r) $(systemimg) $(INSTALL_RAMDISK) $(GENERIC_X86_CONFIG_MK) | $(ACP)
+$(boot_dir): $(shell find $(LOCAL_PATH)/boot -type f | sort -r) $(isolinux_files) $(systemimg) $(INSTALL_RAMDISK) $(GENERIC_X86_CONFIG_MK) | $(ACP)
        $(hide) rm -rf $@
        $(ACP) -pr $(dir $(<D)) $@
        $(ACP) -pr $(dir $(<D))../install/grub2/efi $@
+       $(ACP) $(isolinux_files) $@/isolinux
        img=$@/boot/grub/efi.img; dd if=/dev/zero of=$$img bs=1M count=4; \
        mkdosfs -n EFI $$img; mmd -i $$img ::boot; \
        mcopy -si $$img $@/efi ::; mdel -i $$img ::efi/boot/*.cfg

diff --git a/boot/isolinux/isolinux.bin b/boot/isolinux/isolinux.bin
deleted file mode 100644 (file)
index e4ebc5d..0000000
Binary files a/boot/isolinux/isolinux.bin and /dev/null differ

diff --git a/boot/isolinux/isolinux.cfg b/boot/isolinux/isolinux.cfg
index 258e8d5..f8f8c2d 100644 (file)
--- a/boot/isolinux/isolinux.cfg
+++ b/boot/isolinux/isolinux.cfg
@@ -63,7 +63,8 @@ menu separator
 
 label local
        menu label Boot from ^local drive
-       localboot 0xffff
+       kernel chain.c32
+       append hd0
 
 menu separator
 

diff --git a/boot/isolinux/vesamenu.c32 b/boot/isolinux/vesamenu.c32
deleted file mode 100644 (file)
index 8681a27..0000000
Binary files a/boot/isolinux/vesamenu.c32 and /dev/null differ