menu.lst: support both hdpi and mdpi for usb_img

diff --git a/Android.mk b/Android.mk
index 5ae1fb0..b06b710 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -37,6 +37,7 @@ $(INITRD_RAMDISK): $(initrd_bin) $(systemimg) $(TARGET_INITRD_SCRIPTS) | $(ACP)
 
 INSTALL_RAMDISK := $(PRODUCT_OUT)/install.img
 $(INSTALL_RAMDISK): $(wildcard $(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
@@ -48,7 +49,7 @@ BUILT_IMG := $(addprefix $(PRODUCT_OUT)/,ramdisk.img initrd.img install.img) $(s
 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)
+$(ISO_IMAGE): $(boot_dir) $(BUILT_IMG) $(GENERIC_X86_CONFIG_MK)
        @echo ----- Making iso image ------
        $(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 \

diff --git a/usb/menu.lst b/usb/menu.lst
index 54f15b7..14f0f83 100644 (file)
--- a/usb/menu.lst
+++ b/usb/menu.lst
@@ -3,8 +3,12 @@ timeout=6
 root (hd0,0)
 splashimage=/android-x86.xpm.gz
 
-title Live USB - Run Android-x86 without Installation
-       kernel /android-system/kernel CMDLINE quiet SRC=/android-system
+title Live USB - Run Android-x86 without Installation (HDPI)
+       kernel /android-system/kernel CMDLINE quiet SRC=/android-system HDPI=1
+       initrd /android-system/initrd.img
+
+title Live USB - Run Android-x86 without Installation (MDPI)
+       kernel /android-system/kernel CMDLINE quiet SRC=/android-system MDPI=1
        initrd /android-system/initrd.img
 
 title Live USB - VESA Mode