| Revisión | 2796e618bea4b351254e92cd0fc968bd5992389f (tree) |
|---|---|
| Tiempo | 2016-02-05 17:58:23 |
| Autor | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Android.mk: refine the rules to build iso_img
The original rules may fail at some situations.
Reported-by: Jaroslav Penaska <j.penaska@gmail.com>
Android.mk (diff)| @@ -59,9 +59,10 @@ $(INSTALL_RAMDISK): $(wildcard $(LOCAL_PATH)/install/*/* $(LOCAL_PATH)/install/* | ||
| 59 | 59 | $(MKBOOTFS) $(dir $(dir $(<D))) | gzip -9 > $@ |
| 60 | 60 | |
| 61 | 61 | boot_dir := $(PRODUCT_OUT)/boot |
| 62 | -$(boot_dir): $(shell find $(LOCAL_PATH)/boot -type f | sort -r) $(systemimg) $(GENERIC_X86_CONFIG_MK) | $(ACP) | |
| 62 | +$(boot_dir): $(shell find $(LOCAL_PATH)/boot -type f | sort -r) $(systemimg) $(INSTALL_RAMDISK) $(GENERIC_X86_CONFIG_MK) | $(ACP) | |
| 63 | 63 | $(hide) rm -rf $@ |
| 64 | 64 | $(ACP) -pr $(dir $(<D)) $@ |
| 65 | + $(ACP) -pr $(dir $(<D))../install/grub2/efi $@ | |
| 65 | 66 | |
| 66 | 67 | BUILT_IMG := $(addprefix $(PRODUCT_OUT)/,ramdisk.img initrd.img install.img) $(systemimg) |
| 67 | 68 | BUILT_IMG += $(if $(TARGET_PREBUILT_KERNEL),$(TARGET_PREBUILT_KERNEL),$(PRODUCT_OUT)/kernel) |
| @@ -71,7 +72,6 @@ $(ISO_IMAGE): $(boot_dir) $(BUILT_IMG) | ||
| 71 | 72 | @echo ----- Making iso image ------ |
| 72 | 73 | $(hide) sed -i "s|\(Installation CD\)\(.*\)|\1 $(VER)|; s|CMDLINE|$(BOARD_KERNEL_CMDLINE)|" $</isolinux/isolinux.cfg |
| 73 | 74 | $(hide) sed -i "s|VER|$(VER)|; s|CMDLINE|$(BOARD_KERNEL_CMDLINE)|" $</boot/grub/grub.cfg |
| 74 | - $(hide) cp -r $(<D)/../../../../bootable/newinstaller/install/grub2/efi $</efi | |
| 75 | 75 | genisoimage -vJURT -b isolinux/isolinux.bin -c isolinux/boot.cat \ |
| 76 | 76 | -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot \ |
| 77 | 77 | -input-charset utf-8 -V "Android-x86 LiveCD" -o $@ $^ |
Android-x86
Fork