diff options
| author | Paul Kocialkowski <contact@paulk.fr> | 2014-05-03 22:16:29 +0200 |
|---|---|---|
| committer | Paul Kocialkowski <contact@paulk.fr> | 2014-05-03 22:16:29 +0200 |
| commit | d1f1c82ad66a22bf8de04c395821416847cb9135 (patch) | |
| tree | a61a421ea0d21c88fd5ca23dff3e6d66602171e1 | |
| parent | 9c19cd047ebeb81a054e6a372285988414d4f295 (diff) | |
| download | device_goldelico_gta04-d1f1c82ad66a22bf8de04c395821416847cb9135.zip device_goldelico_gta04-d1f1c82ad66a22bf8de04c395821416847cb9135.tar.gz device_goldelico_gta04-d1f1c82ad66a22bf8de04c395821416847cb9135.tar.bz2 | |
bootimg.mk: bootable target instead of bootloader
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
| -rw-r--r-- | bootimg.mk | 10 | ||||
| -rwxr-xr-x | replicant_gta04_install.sh | 6 |
2 files changed, 8 insertions, 8 deletions
@@ -16,12 +16,12 @@ LOCAL_PATH := $(call my-dir) INSTALLED_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk.cpio -INSTALLED_BOOTLOADER_TARGET := $(PRODUCT_OUT)/bootloader.zip +INSTALLED_BOOTABLE_TARGET := $(PRODUCT_OUT)/bootable.zip INSTALLED_UBOOT_SCRIPT_MODULE := $(PRODUCT_OUT)/boot.scr INSTALLED_UBOOT_SPLASH_MODULE := $(PRODUCT_OUT)/splash.rgb16z -.PHONY: bootloader -bootloader: $(INSTALLED_BOOTLOADER_TARGET) +.PHONY: bootable +bootable: $(INSTALLED_BOOTABLE_TARGET) BUILT_RAMDISK_TARGET := $(INSTALLED_RAMDISK_TARGET) @@ -45,6 +45,6 @@ $(INSTALLED_BOOTLOADERIMAGE_TARGET): $(INSTALLED_XLOADER_MODULE) $(INSTALLED_UBO @echo -e ${CL_CYN}"Made U-Boot script: $(INSTALLED_UBOOT_SCRIPT_MODULE)"${CL_RST} @echo -e ${CL_CYN}"Made U-Boot: $(INSTALLED_UBOOT_MODULE)"${CL_RST} -$(INSTALLED_BOOTLOADER_TARGET): $(INSTALLED_RECOVERYIMAGE_TARGET) $(INSTALLED_BOOTLOADERIMAGE_TARGET) $(PRODUCT_OUT)/replicant_gta04_install.sh +$(INSTALLED_BOOTABLE_TARGET): $(INSTALLED_RECOVERYIMAGE_TARGET) $(INSTALLED_BOOTLOADERIMAGE_TARGET) $(PRODUCT_OUT)/replicant_gta04_install.sh zip -qj $@ $(INSTALLED_RECOVERYIMAGE_TARGET) $(INSTALLED_XLOADER_MODULE) $(INSTALLED_UBOOT_SPLASH_MODULE) $(INSTALLED_UBOOT_SCRIPT_MODULE) $(INSTALLED_UBOOT_MODULE) - @echo -e ${CL_CYN}"Made bootloader: $(INSTALLED_BOOTLOADER_TARGET)"${CL_RST} + @echo -e ${CL_CYN}"Made bootable: $@"${CL_RST} diff --git a/replicant_gta04_install.sh b/replicant_gta04_install.sh index f8f0874..30bf5f5 100755 --- a/replicant_gta04_install.sh +++ b/replicant_gta04_install.sh @@ -34,7 +34,7 @@ DRIVE_CYLINDERS="" DRIVE_PART="" SYSTEM_ZIP="replicant-4.2-gta04.zip" -BOOTLOADER_ZIP="bootloader.zip" +BOOTABLE_ZIP="bootable.zip" FILES_BASE="." MOUNT_BASE="/media" @@ -49,7 +49,7 @@ display_help() { echo "Usage: $0 [COMMAND] [DRIVE]" echo "" echo "It is expected that the following files are located in $FILES_BASE:" - echo " $BOOTLOADER_ZIP for setup" + echo " $BOOTABLE_ZIP for setup" echo " $SYSTEM_ZIP for install" echo "" echo "Commands:" @@ -254,7 +254,7 @@ setup_boot_install() { mkdir -p "$MOUNT_BASE/boot" mount "${DRIVE_PART}1" "$MOUNT_BASE/boot" - unzip -o "$FILES_BASE/$BOOTLOADER_ZIP" "**" -d "$MOUNT_BASE/boot/" + unzip -o "$FILES_BASE/$BOOTABLE_ZIP" "**" -d "$MOUNT_BASE/boot/" dir=$( pwd ) echo "Syncing boot files" |