| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081 |
- --- a/include/image.mk
- +++ b/include/image.mk
- @@ -300,6 +300,44 @@ ifdef CONFIG_TARGET_ROOTFS_TARGZ
- endef
- endif
-
- +define Device/Build/targz
- + $$(_TARGET): $(if $(CONFIG_JSON_OVERVIEW_IMAGE_INFO), \
- + $(BUILD_DIR)/json_info_files/$$(ROOTFSTZ).json, \
- + $(BIN_DIR)/$$(ROOTFSTZ))
- +
- + $(call Device/Export,$(BUILD_DIR)/json_info_files/$$(ROOTFSTZ).json,$(1))
- +
- + $(BUILD_DIR)/json_info_files/$$(ROOTFSTZ).json: $(BIN_DIR)/$$(ROOTFSTZ)
- + @mkdir -p $$(shell dirname $$@)
- + DEVICE_ID="$(1)" \
- + SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) \
- + FILE_NAME="$$(notdir $$^)" \
- + FILE_DIR="$(BIN_DIR)" \
- + FILE_TYPE="rootfs" \
- + FILE_FILESYSTEM="rootfs" \
- + DEVICE_IMG_PREFIX="$$(DEVICE_IMG_PREFIX)" \
- + DEVICE_VENDOR="$$(DEVICE_VENDOR)" \
- + DEVICE_MODEL="$$(DEVICE_MODEL)" \
- + DEVICE_VARIANT="$$(DEVICE_VARIANT)" \
- + DEVICE_ALT0_VENDOR="$$(DEVICE_ALT0_VENDOR)" \
- + DEVICE_ALT0_MODEL="$$(DEVICE_ALT0_MODEL)" \
- + DEVICE_ALT0_VARIANT="$$(DEVICE_ALT0_VARIANT)" \
- + DEVICE_ALT1_VENDOR="$$(DEVICE_ALT1_VENDOR)" \
- + DEVICE_ALT1_MODEL="$$(DEVICE_ALT1_MODEL)" \
- + DEVICE_ALT1_VARIANT="$$(DEVICE_ALT1_VARIANT)" \
- + DEVICE_ALT2_VENDOR="$$(DEVICE_ALT2_VENDOR)" \
- + DEVICE_ALT2_MODEL="$$(DEVICE_ALT2_MODEL)" \
- + DEVICE_ALT2_VARIANT="$$(DEVICE_ALT2_VARIANT)" \
- + DEVICE_TITLE="$$(DEVICE_TITLE)" \
- + DEVICE_PACKAGES="$$(DEVICE_PACKAGES)" \
- + TARGET="$(BOARD)" \
- + SUBTARGET="$(if $(SUBTARGET),$(SUBTARGET),generic)" \
- + VERSION_NUMBER="$(VERSION_NUMBER)" \
- + VERSION_CODE="$(VERSION_CODE)" \
- + SUPPORTED_DEVICES="$$(SUPPORTED_DEVICES)" \
- + $(TOPDIR)/scripts/json_add_image_info.py $$@
- +endef
- +
- ifdef CONFIG_TARGET_ROOTFS_CPIOGZ
- define Image/Build/cpiogz
- ( cd $(TARGET_DIR); find . | $(STAGING_DIR_HOST)/bin/cpio -o -H newc -R 0:0 | gzip -9n >$(BIN_DIR)/$(IMG_ROOTFS).cpio.gz )
- @@ -367,6 +405,7 @@ define Device/Init
- DEVICE_IMG_PREFIX := $(IMG_PREFIX)-$(1)
- DEVICE_IMG_NAME = $$(DEVICE_IMG_PREFIX)-$$(1)-$$(2)
- IMAGE_SIZE :=
- + ROOTFSTZ = $$(DEVICE_IMG_PREFIX)-rootfs.tar.gz
- KERNEL_PREFIX = $$(DEVICE_IMG_PREFIX)
- KERNEL_SUFFIX := -kernel.bin
- KERNEL_INITRAMFS_SUFFIX = $$(KERNEL_SUFFIX)
- @@ -568,7 +607,7 @@ define Device/Build/kernel
- endef
-
- define Device/Build/image
- - GZ_SUFFIX := $(if $(filter %dtb %gz,$(2)),,$(if $(and $(findstring ext4,$(1)),$(CONFIG_TARGET_IMAGES_GZIP)),.gz))
- + GZ_SUFFIX := $(if $(filter %dtb %gz,$(2)),,$(if $(and $(findstring ext4,$(1)),$(findstring img,$(2)),$(CONFIG_TARGET_IMAGES_GZIP)),.gz))
- $$(_TARGET): $(if $(CONFIG_JSON_OVERVIEW_IMAGE_INFO), \
- $(BUILD_DIR)/json_info_files/$(call DEVICE_IMG_NAME,$(1),$(2)).json, \
- $(BIN_DIR)/$(call DEVICE_IMG_NAME,$(1),$(2))$$(GZ_SUFFIX))
- @@ -606,6 +645,7 @@ define Device/Build/image
- FILE_TYPE=$(word 1,$(subst ., ,$(2))) \
- FILE_FILESYSTEM="$(1)" \
- DEVICE_IMG_PREFIX="$(DEVICE_IMG_PREFIX)" \
- + KERNEL_INITRAMFS_IMAGE="$(subst $(IMG_PREFIX_EXTRA),,$(KERNEL_INITRAMFS_IMAGE))" \
- DEVICE_VENDOR="$(DEVICE_VENDOR)" \
- DEVICE_MODEL="$(DEVICE_MODEL)" \
- DEVICE_VARIANT="$(DEVICE_VARIANT)" \
- @@ -678,6 +718,8 @@ define Device/Build
- $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Device/Build/initramfs,$(1)))
- $(call Device/Build/kernel,$(1))
-
- + $(if $(CONFIG_TARGET_ROOTFS_TARGZ),$(call Device/Build/targz,$(PROFILE_SANITIZED)))
- +
- $$(eval $$(foreach compile,$$(COMPILE), \
- $$(call Device/Build/compile,$$(compile),$(1))))
-
|
