diff options
| -rw-r--r-- | releasetools.py | 4 | ||||
| -rw-r--r-- | shbootimg.mk | 2 | ||||
| -rwxr-xr-x | updater.sh | 29 |
3 files changed, 1 insertions, 34 deletions
diff --git a/releasetools.py b/releasetools.py index d9ec402..91b8bee 100644 --- a/releasetools.py +++ b/releasetools.py @@ -23,7 +23,6 @@ TARGET_DIR = os.getenv('OUT') UTILITIES_DIR = os.path.join(TARGET_DIR, 'utilities') def FullOTA_Assertions(info): - info.output_zip.write(os.path.join(TARGET_DIR, "modem.bin"), "modem.bin") info.output_zip.write(os.path.join(TARGET_DIR, "updater.sh"), "updater.sh") info.output_zip.write(os.path.join(UTILITIES_DIR, "make_ext4fs"), "make_ext4fs") info.output_zip.write(os.path.join(UTILITIES_DIR, "busybox"), "busybox") @@ -33,9 +32,6 @@ def FullOTA_Assertions(info): info.output_zip.write(os.path.join(LOCAL_DIR, "bml_over_mtd.sh"), "bml_over_mtd.sh") info.script.AppendExtra( - ('package_extract_file("modem.bin", "/tmp/modem.bin");\n' - 'set_perm(0, 0, 0777, "/tmp/modem.bin");')) - info.script.AppendExtra( ('package_extract_file("updater.sh", "/tmp/updater.sh");\n' 'set_perm(0, 0, 0777, "/tmp/updater.sh");')) info.script.AppendExtra( diff --git a/shbootimg.mk b/shbootimg.mk index a057b5a..9651e14 100644 --- a/shbootimg.mk +++ b/shbootimg.mk @@ -1,7 +1,7 @@ LOCAL_PATH := $(call my-dir) # Add ramdisk dependencies to kernel -TARGET_KERNEL_BINARIES: $(recovery_ramdisk) $(INSTALLED_RAMDISK_TARGET) $(PRODUCT_OUT)/utilities/flash_image $(PRODUCT_OUT)/utilities/busybox $(PRODUCT_OUT)/utilities/make_ext4fs $(PRODUCT_OUT)/utilities/erase_image $(PRODUCT_OUT)/modem.bin +TARGET_KERNEL_BINARIES: $(recovery_ramdisk) $(INSTALLED_RAMDISK_TARGET) $(PRODUCT_OUT)/utilities/flash_image $(PRODUCT_OUT)/utilities/busybox $(PRODUCT_OUT)/utilities/make_ext4fs $(PRODUCT_OUT)/utilities/erase_image INSTALLED_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/boot.img $(INSTALLED_BOOTIMAGE_TARGET): $(INSTALLED_KERNEL_TARGET) @@ -156,35 +156,6 @@ elif /tmp/busybox test -e /dev/block/mtdblock0 ; then # everything is logged into /sdcard/cyanogenmod.log set_log /sdcard/cyanogenmod_mtd.log - if $IS_GSM ; then - # create mountpoint for radio partition - /tmp/busybox mkdir -p /radio - - # make sure radio partition is mounted - if ! /tmp/busybox grep -q /radio /proc/mounts ; then - /tmp/busybox umount -l /dev/block/mtdblock5 - if ! /tmp/busybox mount -t yaffs2 /dev/block/mtdblock5 /radio ; then - /tmp/busybox echo "Cannot mount radio partition." - exit 5 - fi - fi - - # if modem.bin doesn't exist on radio partition, format the partition and copy it - if ! /tmp/busybox test -e /radio/modem.bin ; then - /tmp/busybox umount -l /dev/block/mtdblock5 - /tmp/erase_image radio - if ! /tmp/busybox mount -t yaffs2 /dev/block/mtdblock5 /radio ; then - /tmp/busybox echo "Cannot copy modem.bin to radio partition." - exit 5 - else - /tmp/busybox cp /tmp/modem.bin /radio/modem.bin - fi - fi - - # unmount radio partition - /tmp/busybox umount -l /dev/block/mtdblock5 - fi - if ! /tmp/busybox test -e /sdcard/cyanogenmod.cfg ; then # update install - flash boot image then skip back to updater-script # (boot image is already flashed for first time install or old mtd upgrade) |