bootable/newinstaller
| Revision | c81db3fb5effef1bdb4deed1cf5bb8b78fb42ffc (tree) |
|---|---|
| Time | 2020-03-13 12:55:30 |
| Author | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge remote-tracking branch 'x86/pie-x86' into q-x86
Conflicts:
initrd/init
Android.mk (diff) initrd/init (diff)| @@ -14,7 +14,6 @@ | ||
| 14 | 14 | |
| 15 | 15 | ifneq ($(filter x86%,$(TARGET_ARCH)),) |
| 16 | 16 | LOCAL_PATH := $(call my-dir) |
| 17 | -include $(CLEAR_VARS) | |
| 18 | 17 | |
| 19 | 18 | include $(CLEAR_VARS) |
| 20 | 19 | LOCAL_IS_HOST_MODULE := true |
| @@ -83,6 +82,7 @@ BUILT_IMG := $(addprefix $(PRODUCT_OUT)/,initrd.img install.img) $(systemimg) | ||
| 83 | 82 | BUILT_IMG += $(if $(TARGET_PREBUILT_KERNEL),$(TARGET_PREBUILT_KERNEL),$(PRODUCT_OUT)/kernel) |
| 84 | 83 | |
| 85 | 84 | ISO_IMAGE := $(PRODUCT_OUT)/$(TARGET_PRODUCT).iso |
| 85 | +ISOHYBRID := LD_LIBRARY_PATH=$(LOCAL_PATH)/install/lib external/syslinux/bios/utils/isohybrid | |
| 86 | 86 | $(ISO_IMAGE): $(boot_dir) $(BUILT_IMG) |
| 87 | 87 | @echo ----- Making iso image ------ |
| 88 | 88 | $(hide) sed -i "s|\(Installation CD\)\(.*\)|\1 $(VER)|; s|CMDLINE|$(BOARD_KERNEL_CMDLINE)|" $</isolinux/isolinux.cfg |
| @@ -93,7 +93,7 @@ $(ISO_IMAGE): $(boot_dir) $(BUILT_IMG) | ||
| 93 | 93 | $$GENISOIMG -vJURT -b isolinux/isolinux.bin -c isolinux/boot.cat \ |
| 94 | 94 | -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot \ |
| 95 | 95 | -input-charset utf-8 -V "$(if $(RELEASE_OS_TITLE),$(RELEASE_OS_TITLE),Android-x86) $(VER) ($(TARGET_ARCH))" -o $@ $^ |
| 96 | - $(hide) external/syslinux/bios/utils/isohybrid.pl $@ | |
| 96 | + $(hide) $(ISOHYBRID) --uefi $@ | |
| 97 | 97 | @echo -e "\n\n$@ is built successfully.\n\n" |
| 98 | 98 | |
| 99 | 99 | rpm: $(wildcard $(LOCAL_PATH)/rpm/*) $(BUILT_IMG) |
| @@ -106,10 +106,10 @@ check_root() | ||
| 106 | 106 | elif [ -e /mnt/$SRC/system.img ]; then |
| 107 | 107 | remount_rw |
| 108 | 108 | mount -o loop,noatime /mnt/$SRC/system.img android |
| 109 | - elif [ -d /mnt/$SRC/system ]; then | |
| 109 | + elif [ -s /mnt/$SRC/system/default.prop ]; then | |
| 110 | 110 | remount_rw |
| 111 | 111 | mount --bind /mnt/$SRC/system android |
| 112 | - elif [ -z "$SRC" -a -e /mnt/default.prop ]; then | |
| 112 | + elif [ -z "$SRC" -a -s /mnt/default.prop ]; then | |
| 113 | 113 | mount --bind /mnt android |
| 114 | 114 | else |
| 115 | 115 | return 1 |
Fork