* use BOARD_KERNEL_CMDLINE as the default cmdline

* modify isolinux.cfg on making
* add usb_img target

diff --git a/Android.mk b/Android.mk
index aa4d3fd..b4985ae 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -21,29 +21,54 @@ initrd_bin := \
        $(initrd_dir)/init \
        $(wildcard $(initrd_dir)/*/*)
 
-installer_ramdisk := $(PRODUCT_OUT)/initrd.img
-$(installer_ramdisk): $(initrd_bin) | $(ACP) $(MKBOOTFS)
+INITRD_RAMDISK := $(PRODUCT_OUT)/initrd.img
+$(INITRD_RAMDISK): $(initrd_bin) | $(ACP) $(MKBOOTFS)
        rm -rf $(TARGET_INSTALLER_OUT)
        $(ACP) -pr $(initrd_dir) $(TARGET_INSTALLER_OUT)
        ln -s /bin/ld-linux.so.2 $(TARGET_INSTALLER_OUT)/lib
        mkdir -p $(addprefix $(TARGET_INSTALLER_OUT)/,android mnt proc sys tmp sfs)
        $(MKBOOTFS) $(TARGET_INSTALLER_OUT) | gzip -9 > $@
 
-boot_dir := $(LOCAL_PATH)/boot
-boot_bin := $(wildcard $(boot_dir)/isolinux/*)
+boot_dir := $(PRODUCT_OUT)/boot
+$(boot_dir): $(wildcard $(LOCAL_PATH)/boot/isolinux/*) | $(ACP)
+       rm -rf $@
+       $(ACP) -pr $(dir $(<D)) $@
+       $(hide) sed -i "s|CMDLINE|$(BOARD_KERNEL_CMDLINE)|; s|DATE|`date +"%F"`|" $@/isolinux/isolinux.cfg
 
 BUILT_IMG := $(addprefix $(PRODUCT_OUT)/,ramdisk.img system.$(if $(MKSQUASHFS),sfs,img) initrd.img)
 BUILT_IMG += $(if $(TARGET_PREBUILT_KERNEL),$(TARGET_PREBUILT_KERNEL),$(PRODUCT_OUT)/kernel)
 
 ISO_IMAGE := $(PRODUCT_OUT)/$(TARGET_PRODUCT).iso
-$(ISO_IMAGE): $(BUILT_IMG) $(boot_bin)
+$(ISO_IMAGE): $(boot_dir) $(BUILT_IMG)
        @echo ----- Making iso image ------
        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 $@ \
-               $(boot_dir) $(BUILT_IMG)
+               -input-charset utf-8 -V "Android LiveCD" -o $@ $^
 
-.PHONY: iso_img
+ANDROID_SRC := /android-system
+USB_BOOT := $(PRODUCT_OUT)/usb_boot
+
+usb_tmp_img := $(PRODUCT_OUT)/usb_tmp.img
+$(usb_tmp_img): $(BUILT_IMG) | $(MKEXT2IMG)
+       rm -rf $(USB_BOOT)
+       mkdir -p $(USB_BOOT)$(ANDROID_SRC)
+       echo -n "$(BOARD_KERNEL_CMDLINE) SRC=$(ANDROID_SRC)" > $(USB_BOOT)/cmdline
+       ln $^ $(USB_BOOT)
+       mv $(USB_BOOT)/{ramdisk.img,system.*} $(USB_BOOT)$(ANDROID_SRC)
+       mv $(USB_BOOT)/initrd.img $(USB_BOOT)/ramdisk
+       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
 iso_img: $(ISO_IMAGE)
+usb_img: $(USB_IMAGE)
 
 endif

diff --git a/boot/isolinux/isolinux.cfg b/boot/isolinux/isolinux.cfg
index 33d7d2e..1e681c1 100644 (file)
--- a/boot/isolinux/isolinux.cfg
+++ b/boot/isolinux/isolinux.cfg
@@ -3,7 +3,7 @@ default vesamenu.c32
 timeout 600
 
 menu background splash.png
-menu title Android Live & Installation CD
+menu title Android Live & Installation CD (DATE)
 menu color border 0 #ffffffff #00000000
 menu color sel 7 #ffffffff #ff000000
 menu color title 0 #ffffffff #00000000
@@ -15,19 +15,19 @@ menu color hotkey 7 #ffffffff #ff000000
 label live
        menu label Live CD - Run Android without installation
        kernel /kernel
-       append initrd=/initrd.img root=/dev/ram0 androidboot.hardware=eeepc quiet SRC= DATA= SDCARD=
+       append initrd=/initrd.img CMDLINE quiet SRC= DATA= SDCARD=
 
 label vesa
        menu label Live CD - VESA mode
        kernel /kernel
-       append initrd=/initrd.img root=/dev/ram0 androidboot.hardware=eeepc vga=788 quiet SRC= DATA= SDCARD=
+       append initrd=/initrd.img CMDLINE quiet vga=788 SRC= DATA= SDCARD=
 
 label debug
        menu label Live CD - Debug mode
        kernel /kernel
-       append initrd=/initrd.img root=/dev/ram0 androidboot.hardware=eeepc vga=788 DEBUG=1 SRC= DATA= SDCARD=
+       append initrd=/initrd.img CMDLINE vga=788 DEBUG=1 SRC= DATA= SDCARD=
 
 label install
        menu label Installation - Install Android to harddisk
        kernel /kernel
-       append initrd=/initrd.img root=/dev/ram0 console=ttyS1,115200n8 console=tty0 androidboot.hardware=eeepc vga=788 INSTALL=1
+       append initrd=/initrd.img CMDLINE vga=788 INSTALL=1

diff --git a/usb_layout.conf b/usb_layout.conf
new file mode 100644 (file)
index 0000000..533ba0d
--- /dev/null
+++ b/usb_layout.conf
@@ -0,0 +1,19 @@
+device {
+    scheme mbr
+
+    # bytes in a disk "block", must be a power of 2!
+    sector_size 512
+
+    # What LBA should the partitions start at?
+    start_lba 2048
+
+    # Autodetect disk size if == 0
+    num_lba 0
+
+    partitions {
+        usb_boot {
+            active y
+            type linux
+        }
+    }
+}