-ifeq ($(TARGET_ARCH),x86)
+# Copyright 2009-2014, The Android-x86 Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ifneq ($(filter x86%,$(TARGET_ARCH)),)
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-VER ?= $(shell date +"%F")
+LOCAL_MODULE := edit_mbr
+LOCAL_SRC_FILES := editdisklbl/editdisklbl.c
+LOCAL_CFLAGS := -O2 -g -W -Wall -Werror# -D_LARGEFILE64_SOURCE
+LOCAL_STATIC_LIBRARIES := libdiskconfig_host libcutils liblog
+edit_mbr := $(HOST_OUT_EXECUTABLES)/$(LOCAL_MODULE)
+include $(BUILD_HOST_EXECUTABLE)
-LOCAL_MODULE := newinstaller
-LOCAL_MODULE_TAGS := system_builder
+VER ?= $(shell date +"%F")
# use squashfs for iso, unless explictly disabled
ifneq ($(USE_SQUASHFS),0)
endef
endif
+define check-density
+ eval d=$$(grep ^ro.sf.lcd_density $(INSTALLED_DEFAULT_PROP_TARGET) $(INSTALLED_BUILD_PROP_TARGET) | sed 's|\(.*\)=\(.*\)|\2|'); \
+ [ -z "$$d" ] || ( awk -v d=$$d ' BEGIN { \
+ if (d <= 180) { \
+ label="liveh"; dpi="HDPI"; \
+ } else { \
+ label="livem"; dpi="MDPI"; \
+ } \
+ } { \
+ if (match($$2, label)) \
+ s=5; \
+ else if (match($$0, dpi)) \
+ s=4; \
+ else \
+ s=0; \
+ for (i = 0; i < s; ++i) \
+ getline; \
+ gsub(" DPI=[0-9]*",""); print $$0; \
+ }' $(1) > $(1)_ && mv $(1)_ $(1) )
+endef
+
initrd_dir := $(LOCAL_PATH)/initrd
initrd_bin := \
$(initrd_dir)/init \
$(wildcard $(initrd_dir)/*/*)
+systemimg := $(PRODUCT_OUT)/system.$(if $(MKSQUASHFS),sfs,img)
+
INITRD_RAMDISK := $(PRODUCT_OUT)/initrd.img
-$(INITRD_RAMDISK): $(initrd_bin) | $(ACP) $(MKBOOTFS)
+$(INITRD_RAMDISK): $(initrd_bin) $(systemimg) $(TARGET_INITRD_SCRIPTS) | $(ACP) $(MKBOOTFS)
rm -rf $(TARGET_INSTALLER_OUT)
$(ACP) -pr $(initrd_dir) $(TARGET_INSTALLER_OUT)
+ $(if $(TARGET_INITRD_SCRIPTS),$(ACP) -p $(TARGET_INITRD_SCRIPTS) $(TARGET_INSTALLER_OUT)/scripts)
ln -s /bin/ld-linux.so.2 $(TARGET_INSTALLER_OUT)/lib
- mkdir -p $(addprefix $(TARGET_INSTALLER_OUT)/,android mnt proc sys tmp sfs hd)
- echo "VER=$(VER)" > $(TARGET_INSTALLER_OUT)/scripts/10-ver
+ mkdir -p $(addprefix $(TARGET_INSTALLER_OUT)/,android iso mnt proc sys tmp sfs hd)
+ echo "VER=$(VER)" > $(TARGET_INSTALLER_OUT)/scripts/00-ver
$(MKBOOTFS) $(TARGET_INSTALLER_OUT) | gzip -9 > $@
INSTALL_RAMDISK := $(PRODUCT_OUT)/install.img
-$(INSTALL_RAMDISK): $(wildcard $(LOCAL_PATH)/install/*/*) | $(MKBOOTFS)
+$(INSTALL_RAMDISK): $(wildcard $(LOCAL_PATH)/install/*/* $(LOCAL_PATH)/install/*/*/*/*) | $(MKBOOTFS)
+ $(if $(TARGET_INSTALL_SCRIPTS),$(ACP) -p $(TARGET_INSTALL_SCRIPTS) $(TARGET_INSTALLER_OUT)/scripts)
$(MKBOOTFS) $(dir $(dir $(<D))) | gzip -9 > $@
boot_dir := $(PRODUCT_OUT)/boot
-$(boot_dir): $(wildcard $(LOCAL_PATH)/boot/isolinux/*) | $(ACP)
- rm -rf $@
+$(boot_dir): $(wildcard $(LOCAL_PATH)/boot/isolinux/*) $(systemimg) $(GENERIC_X86_CONFIG_MK) | $(ACP)
+ $(hide) rm -rf $@
$(ACP) -pr $(dir $(<D)) $@
-BUILT_IMG := $(addprefix $(PRODUCT_OUT)/,system.$(if $(MKSQUASHFS),sfs,img) ramdisk.img initrd.img install.img)
+BUILT_IMG := $(addprefix $(PRODUCT_OUT)/,ramdisk.img initrd.img install.img) $(systemimg)
BUILT_IMG += $(if $(TARGET_PREBUILT_KERNEL),$(TARGET_PREBUILT_KERNEL),$(PRODUCT_OUT)/kernel)
ISO_IMAGE := $(PRODUCT_OUT)/$(TARGET_PRODUCT).iso
$(ISO_IMAGE): $(boot_dir) $(BUILT_IMG)
@echo ----- Making iso image ------
+ $(hide) $(call check-density,$</isolinux/isolinux.cfg)
$(hide) sed -i "s|\(Installation CD\)\(.*\)|\1 $(VER)|; s|CMDLINE|$(BOARD_KERNEL_CMDLINE)|" $</isolinux/isolinux.cfg
genisoimage -vJURT -b isolinux/isolinux.bin -c isolinux/boot.cat \
-no-emul-boot -boot-load-size 4 -boot-info-table \
- -input-charset utf-8 -V "Android LiveCD" -o $@ $^
-
-ANDROID_SRC := /android-system
-USB_BOOT := $(PRODUCT_OUT)/usb_boot
-
-usb_tmp_img := $(PRODUCT_OUT)/usb_tmp.img
-$(usb_tmp_img): $(wildcard $(LOCAL_PATH)/usb/*) $(BUILT_IMG) | $(ACP) $(MKEXT2IMG)
- rm -rf $(USB_BOOT)
- mkdir -p $(USB_BOOT)$(ANDROID_SRC)
- touch $(USB_BOOT)/ramdisk
- echo 1 > $(USB_BOOT)/cmdline
- ln $(BUILT_IMG) $(USB_BOOT)$(ANDROID_SRC)
- $(ACP) -fp $(<D)/* $(<D)/../install/grub/android-x86.xpm.gz $(USB_BOOT)
- ln -s grub4dos $(USB_BOOT)/kernel
- $(hide) sed -i "s|VER|$(VER)|; s|CMDLINE|$(BOARD_KERNEL_CMDLINE)|" $(USB_BOOT)/menu.lst
- num_blocks=`du -sk $(USB_BOOT) | tail -n1 | awk '{print $$1;}'`; \
- num_inodes=`find $(USB_BOOT) | wc -l`; \
- $(MKEXT2IMG) -d $(USB_BOOT) -b `expr $$num_blocks + 20480` -N `expr $$num_inodes + 15` -m 0 $@
-
-USB_LAYOUT := $(LOCAL_PATH)/usb_layout.conf
-USB_IMAGE := $(PRODUCT_OUT)/$(TARGET_PRODUCT)_usb.img
-$(USB_IMAGE): $(usb_tmp_img) $(USB_LAYOUT) $(PRODUCT_OUT)/grub/grub.bin
- @echo ----- Making usb image ------
- @sed 's|default 2|default 0|' $(PRODUCT_OUT)/grub/grub.bin > $@
- @$(edit_mbr) -l $(USB_LAYOUT) -i $@ usb_boot=$(usb_tmp_img)
-
-.PHONY: iso_img usb_img
+ -input-charset utf-8 -V "Android-x86 LiveCD" -o $@ $^
+ $(hide) isohybrid $@ || echo -e "isohybrid not found.\nInstall syslinux 4.0 or higher if you want to build a usb bootable iso."
+ @echo -e "\n\n$@ is built successfully.\n\n"
+
+# Note: requires dosfstools
+EFI_IMAGE := $(PRODUCT_OUT)/$(TARGET_PRODUCT).img
+ESP_LAYOUT := $(LOCAL_PATH)/editdisklbl/esp_layout.conf
+$(EFI_IMAGE): $(wildcard $(LOCAL_PATH)/boot/efi/*/*) $(BUILT_IMG) $(ESP_LAYOUT) | $(edit_mbr)
+ $(hide) sed "s|VER|$(VER)|; s|CMDLINE|$(BOARD_KERNEL_CMDLINE)|" $(<D)/grub.cfg > $(@D)/grub.cfg
+ $(hide) size=0; \
+ for s in `du -sk $^ | awk '{print $$1}'`; do \
+ size=$$(($$size+$$s)); \
+ done; \
+ size=$$(($$(($$(($$(($$(($$size + $$(($$size / 100)))) - 1)) / 32)) + 1)) * 32)); \
+ rm -f $@.fat; mkdosfs -n Android-x86 -C $@.fat $$size
+ $(hide) mcopy -Qsi $@.fat $(<D)/../../../install/grub2/efi $(BUILT_IMG) ::
+ $(hide) mcopy -Qoi $@.fat $(@D)/grub.cfg ::efi/boot
+ $(hide) cat /dev/null > $@; $(edit_mbr) -l $(ESP_LAYOUT) -i $@ esp=$@.fat
+ $(hide) rm -f $@.fat
+
+.PHONY: iso_img usb_img efi_img
iso_img: $(ISO_IMAGE)
-usb_img: $(USB_IMAGE)
+usb_img: $(ISO_IMAGE)
+efi_img: $(EFI_IMAGE)
endif
OSDN Git Service
