diff options
author | Brint E. Kriebel <bekit@cyngn.com> | 2015-02-22 15:14:26 -0800 |
---|---|---|
committer | Brint E. Kriebel <bekit@cyngn.com> | 2016-01-27 18:32:26 -0800 |
commit | a321927684eb1fa22cdc4eb3855bdd1ef614aa79 (patch) | |
tree | 4c2bf91cea52496d702f0d380f164f88541e8095 | |
parent | 1b6aaec245bca0d95326698d7ff1c2c117d760e8 (diff) | |
download | replicant_build-a321927684eb1fa22cdc4eb3855bdd1ef614aa79.zip replicant_build-a321927684eb1fa22cdc4eb3855bdd1ef614aa79.tar.gz replicant_build-a321927684eb1fa22cdc4eb3855bdd1ef614aa79.tar.bz2 |
releasetools: Store and use the dt image file through target files
Target files packages may be used for signing images separate from the
build process. Store the device tree image file in the target files
package so it can be used during the signing process.
Change-Id: Ie8507121fa9c4ba57ecffeab05bd859ae5f5b788
Ticket: CYNGNOS-1744
-rw-r--r-- | core/Makefile | 4 | ||||
-rw-r--r-- | tools/releasetools/common.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/Makefile b/core/Makefile index 7eca2db..2e050ba 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1701,7 +1701,7 @@ ifdef BOARD_RAMDISK_OFFSET $(hide) echo "$(BOARD_RAMDISK_OFFSET)" > $(zip_root)/RECOVERY/ramdisk_offset endif ifeq ($(strip $(BOARD_KERNEL_SEPARATED_DT)),true) - $(hide) echo "$(INSTALLED_DTIMAGE_TARGET)" > $(zip_root)/RECOVERY/dt_args + $(hide) $(ACP) $(INSTALLED_DTIMAGE_TARGET) $(zip_root)/RECOVERY/dt endif @# Components of the boot image $(hide) mkdir -p $(zip_root)/BOOT @@ -1734,7 +1734,7 @@ ifdef BOARD_RAMDISK_OFFSET $(hide) echo "$(BOARD_RAMDISK_OFFSET)" > $(zip_root)/BOOT/ramdisk_offset endif ifeq ($(strip $(BOARD_KERNEL_SEPARATED_DT)),true) - $(hide) echo "$(INSTALLED_DTIMAGE_TARGET)" > $(zip_root)/BOOT/dt_args + $(hide) $(ACP) $(INSTALLED_DTIMAGE_TARGET) $(zip_root)/BOOT/dt endif ifdef ZIP_SAVE_UBOOTIMG_ARGS $(hide) echo "$(ZIP_SAVE_UBOOTIMG_ARGS)" > $(zip_root)/BOOT/ubootargs diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index de2660a..224b276 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -395,10 +395,10 @@ def BuildBootableImage(sourcedir, fs_config_file, info_dict=None): cmd.append("--ramdisk_offset") cmd.append(open(fn).read().rstrip("\n")) - fn = os.path.join(sourcedir, "dt_args") + fn = os.path.join(sourcedir, "dt") if os.access(fn, os.F_OK): cmd.append("--dt") - cmd.append(open(fn).read().rstrip("\n")) + cmd.append(fn) fn = os.path.join(sourcedir, "pagesize") if os.access(fn, os.F_OK): |