Skip to content
This repository was archived by the owner on Jun 1, 2026. It is now read-only.

Revert "Gptimage will not be built by default" #133

Open
pchenthx1 wants to merge 1 commit into
base: celadon/s/mr0/stable
Choose a base branch
from
Open

Revert "Gptimage will not be built by default" #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions tasks/flashfiles.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ ifeq ($(tos_bin),none)
tos_image := none
endif

ifeq ($(BUILD_GPTIMAGE), true)
$(gpt_name):$(BUILT_RELEASE_FLASH_FILES_PACKAGE)
rm -rf $(GPT_DIR)
mkdir -p $(GPT_DIR)
Expand All @@ -63,10 +62,6 @@ $(gpt_name):$(BUILT_RELEASE_FLASH_FILES_PACKAGE)
$(hide) rm -f $@.gz
$(hide) gzip -f $@
$(hide) rm -rf $(GPT_DIR)
else
$(gpt_name):
@echo "skip build gptimages"
endif

$(BUILT_RELEASE_FLASH_FILES_PACKAGE):$(BUILT_RELEASE_SUPER_IMAGE) $(fftf) $(UEFI_ADDITIONAL_TOOLS)
$(hide) mkdir -p $(dir $@)
Expand Down Expand Up @@ -323,9 +318,7 @@ ifneq (,$(wildcard out/dist))
$(hide)rm -rf $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT)/Release/
$(hide)rm -rf $(PRODUCT_OUT)/RELEASE
$(hide)mkdir -p $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT)/Release/Release_Deb
ifeq ($(BUILD_GPTIMAGE), true)
$(hide)cp -r $(PRODUCT_OUT)/release_sign/caas*.img.gz $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT)/Release/Release_Deb
endif
$(hide)mkdir -p $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT)/Release/DEBIAN
$(hide)cp -r device/intel/mixins/groups/device-specific/caas_dev/addon/debian/* $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT)/Release/DEBIAN/
$(hide)cp -r $(PRODUCT_OUT)/scripts $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT)/Release/Release_Deb
Expand All @@ -343,7 +336,7 @@ else
$(hide)rm -rf $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT)/Release
endif
else
flashfiles: $(INTEL_FACTORY_FLASHFILES_TARGET) publish_gptimage_var publish_mkdir_dest publish_vertical host-pkg
flashfiles: $(INTEL_FACTORY_FLASHFILES_TARGET) publish_mkdir_dest publish_vertical host-pkg
@echo "Publishing Release files started"
$(hide) mkdir -p $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT)/Release_Files
$(hide) cp -r $(PRODUCT_OUT)/*-flashfiles-*.zip $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT)/Release_Files
Expand All @@ -370,9 +363,7 @@ ifneq (,$(wildcard out/dist))
$(hide)rm -rf $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT)/Release/
$(hide)rm -rf $(PRODUCT_OUT)/RELEASE
$(hide)mkdir -p $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT)/Release/Release_Deb
ifeq ($(BUILD_GPTIMAGE), true)
$(hide)cp -r $(PRODUCT_OUT)/caas*.img.gz $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT)/Release/Release_Deb
endif
$(hide)mkdir -p $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT)/Release/DEBIAN
$(hide)cp -r device/intel/mixins/groups/device-specific/caas_dev/addon/debian/* $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT)/Release/DEBIAN/
$(hide)cp -r $(PRODUCT_OUT)/scripts $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT)/Release/Release_Deb
Expand Down
13 changes: 2 additions & 11 deletions tasks/publish.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,6 @@ publish_gptimage:
@echo "Warning: Unable to fulfill publish_gptimage makefile request"
endif # GPTIMAGE_BIN

.PHONY: publish_gptimage_var
ifeq ($(BUILD_GPTIMAGE), true)
publish_gptimage_var: publish_gptimage
@echo "building gptimages ..."
else # GPTIMAGE_BIN is not defined
publish_gptimage_var:
@echo "skip build gptimage"
endif # GPTIMAGE_BIN

.PHONY: publish_androidia_image
ifdef ANDROID_IA_IMAGE
publish_androidia_image: publish_mkdir_dest $(ANDROID_IA_IMAGE)
Expand Down Expand Up @@ -234,7 +225,7 @@ publish_windows_tools: $(PLATFORM_RMA_TOOLS_CROSS_ZIP)
@$(hide) mkdir -p $(publish_tool_destw)
@$(hide) $(ACP) $(PLATFORM_RMA_TOOLS_CROSS_ZIP) $(publish_tool_destw)
else
publish_ci: publish_liveimage publish_ota_flashfile publish_gptimage_var publish_grubinstaller publish_ifwi publish_firmware_symbols $(PUB_OSAGNOSTIC_TAG) $(PUB_CMCC_ZIP)
publish_ci: publish_liveimage publish_ota_flashfile publish_gptimage publish_grubinstaller publish_ifwi publish_firmware_symbols $(PUB_OSAGNOSTIC_TAG) $(PUB_CMCC_ZIP)
$(if $(wildcard $(publish_dest)), \
$(foreach f,$(PUBLISH_CI_FILES), \
$(if $(wildcard $(f)),$(ACP) $(f) $(publish_dest);,)),)
Expand Down Expand Up @@ -286,6 +277,6 @@ publish: aic
$(hide) mkdir -p $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT)
$(hide) cp $(PRODUCT_OUT)/$(TARGET_AIC_FILE_NAME) $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT)
else # ANDROID_AS_GUEST
publish: publish_mkdir_dest $(PUBLISH_GOALS) publish_ifwi publish_gptimage_var publish_firmware_symbols $(PUB_OSAGNOSTIC_TAG) publish_kf4abl_symbols $(PUB_CMCC_ZIP) publish_androidia_image publish_grubinstaller
publish: publish_mkdir_dest $(PUBLISH_GOALS) publish_ifwi publish_gptimage publish_firmware_symbols $(PUB_OSAGNOSTIC_TAG) publish_kf4abl_symbols $(PUB_CMCC_ZIP) publish_androidia_image publish_grubinstaller
@$(ACP) out/dist/* $(publish_dest)
endif # ANDROID_AS_GUEST