diff options
| author | Mike Lockwood <lockwood@google.com> | 2012-03-21 17:08:21 -0700 |
|---|---|---|
| committer | Mike Lockwood <lockwood@google.com> | 2012-03-21 17:08:21 -0700 |
| commit | 1c06bc778c69ecefac24188b49580c66a488dbb8 (patch) | |
| tree | 2283425b42fd3ea2e3ae078ead17aa9a976c7980 /core/tasks | |
| parent | bd570f71257fe9ea47814cb3b594eca467d3f98d (diff) | |
| parent | 7d2ba7cff79393fbb0e7df91c4d72d4d22789cf8 (diff) | |
| download | build-1c06bc778c69ecefac24188b49580c66a488dbb8.zip build-1c06bc778c69ecefac24188b49580c66a488dbb8.tar.gz build-1c06bc778c69ecefac24188b49580c66a488dbb8.tar.bz2 | |
Merge commit '7d2ba7c'
Diffstat (limited to 'core/tasks')
| -rw-r--r-- | core/tasks/factory_ramdisk.mk | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/core/tasks/factory_ramdisk.mk b/core/tasks/factory_ramdisk.mk index ecfc4d0..6757194 100644 --- a/core/tasks/factory_ramdisk.mk +++ b/core/tasks/factory_ramdisk.mk @@ -60,14 +60,22 @@ INTERNAL_FACTORY_RAMDISK_FILES := $(filter $(TARGET_FACTORY_RAMDISK_OUT)/%, \ ifneq (,$(INTERNAL_FACTORY_RAMDISK_EXTRA_MODULES_FILES)$(INTERNAL_FACTORY_RAMDISK_FILES)) +BUILT_FACTORY_RAMDISK_FS := $(PRODUCT_OUT)/factory_ramdisk.gz BUILT_FACTORY_RAMDISK_TARGET := $(PRODUCT_OUT)/factory_ramdisk.img -INSTALLED_FACTORY_RAMDISK_TARGET := $(BUILT_FACTORY_RAMDISK_TARGET) -$(INSTALLED_FACTORY_RAMDISK_TARGET) : $(MKBOOTFS) \ +INSTALLED_FACTORY_RAMDISK_FS := $(BUILT_FACTORY_RAMDISK_FS) +$(INSTALLED_FACTORY_RAMDISK_FS) : $(MKBOOTFS) \ $(INTERNAL_FACTORY_RAMDISK_EXTRA_MODULES_FILES) $(INTERNAL_FACTORY_RAMDISK_FILES) | $(MINIGZIP) - $(call pretty,"Target factory ram disk: $@") + $(call pretty,"Target factory ram disk file system: $@") $(hide) $(MKBOOTFS) $(TARGET_FACTORY_RAMDISK_OUT) | $(MINIGZIP) > $@ +TARGET_RAMDISK_KERNEL := $(INSTALLED_KERNEL_TARGET) +INSTALLED_FACTORY_RAMDISK_TARGET := $(BUILT_FACTORY_RAMDISK_TARGET) +$(INSTALLED_FACTORY_RAMDISK_TARGET) : $(MKBOOTIMG) $(TARGET_RAMDISK_KERNEL) $(INSTALLED_FACTORY_RAMDISK_FS) + $(call pretty,"Target factory ram disk img format: $@") + $(MKBOOTIMG) --kernel $(TARGET_RAMDISK_KERNEL) --ramdisk $(INSTALLED_FACTORY_RAMDISK_FS) \ + --base $(BOARD_KERNEL_BASE) --output $@ + endif endif # ONE_SHOT_MAKEFILE |