merge from open-source master
Change-Id: I0a6dc054775374db6b312feccebc46e26266b1fe
This commit is contained in:
@@ -735,6 +735,34 @@ systemtarball-nodeps: $(FS_GET_STATS) \
|
|||||||
stnod: systemtarball-nodeps
|
stnod: systemtarball-nodeps
|
||||||
|
|
||||||
|
|
||||||
|
#######
|
||||||
|
## boot tarball
|
||||||
|
define build-boottarball-target
|
||||||
|
$(hide) echo "Target boot fs tarball: $(INSTALLED_BOOTTARBALL_TARGET)
|
||||||
|
$(hide) mkdir -p $(PRODUCT_OUT)/boot
|
||||||
|
$(hide) cp -f $(INTERNAL_BOOTIMAGE_FILES) $(PRODUCT_OUT)/boot/.
|
||||||
|
$(hide) echo $(BOARD_KERNEL_CMDLINE) > $(PRODUCT_OUT)/boot/cmdline
|
||||||
|
$(hide) $(MKTARBALL) $(FS_GET_STATS) \
|
||||||
|
$(PRODUCT_OUT) boot $(PRIVATE_BOOT_TAR) \
|
||||||
|
$(INSTALLED_BOOTTARBALL_TARGET)
|
||||||
|
endef
|
||||||
|
|
||||||
|
ifndef BOOT_TARBALL_FORMAT
|
||||||
|
BOOT_TARBALL_FORMAT := bz2
|
||||||
|
endif
|
||||||
|
|
||||||
|
boot_tar := $(PRODUCT_OUT)/boot.tar
|
||||||
|
INSTALLED_BOOTTARBALL_TARGET := $(boot_tar).$(BOOT_TARBALL_FORMAT)
|
||||||
|
$(INSTALLED_BOOTTARBALL_TARGET): PRIVATE_BOOT_TAR := $(boot_tar)
|
||||||
|
$(INSTALLED_BOOTTARBALL_TARGET): $(FS_GET_STATS) $(INTERNAL_BOOTIMAGE_FILES)
|
||||||
|
$(build-boottarball-target)
|
||||||
|
|
||||||
|
.PHONY: boottarball-nodeps btnod
|
||||||
|
boottarball-nodeps btnod: $(FS_GET_STATS) \
|
||||||
|
$(filter-out boottarball-nodeps btnod,$(MAKECMDGOALS))
|
||||||
|
$(build-boottarball-target)
|
||||||
|
|
||||||
|
|
||||||
# -----------------------------------------------------------------
|
# -----------------------------------------------------------------
|
||||||
# data partition image
|
# data partition image
|
||||||
INTERNAL_USERDATAIMAGE_FILES := \
|
INTERNAL_USERDATAIMAGE_FILES := \
|
||||||
|
@@ -671,6 +671,9 @@ ramdisk: $(INSTALLED_RAMDISK_TARGET)
|
|||||||
.PHONY: systemtarball
|
.PHONY: systemtarball
|
||||||
systemtarball: $(INSTALLED_SYSTEMTARBALL_TARGET)
|
systemtarball: $(INSTALLED_SYSTEMTARBALL_TARGET)
|
||||||
|
|
||||||
|
.PHONY: boottarball
|
||||||
|
boottarball: $(INSTALLED_BOOTTARBALL_TARGET)
|
||||||
|
|
||||||
.PHONY: userdataimage
|
.PHONY: userdataimage
|
||||||
userdataimage: $(INSTALLED_USERDATAIMAGE_TARGET)
|
userdataimage: $(INSTALLED_USERDATAIMAGE_TARGET)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user