Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3855c43 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Revert "bacon: name the package correctly" 

This reverts commit 724feedb.

This breaks package naming, since a build.prop from a previous build
can be present before the cleanup rules apply, and this is variable
is generated before the build actually begins.
Most notably, this happens in jenkins with consecutive builds, even if
from different projects and tags.
parent 004fbded

core/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -1326,11 +1326,7 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) 
	   --override_device=$(override_device) \

	   $(BUILT_TARGET_FILES_PACKAGE) $@



MODVERSION := $(shell sed -n -e'/ro\.cm\.version/s/^.*=//p' $(INSTALLED_BUILD_PROP_TARGET))

ifeq ($(MODVERSION),)

	MODVERSION := $(CM_VERSION)

endif

CM_TARGET_PACKAGE := $(PRODUCT_OUT)/cm-$(MODVERSION).zip

CM_TARGET_PACKAGE := $(PRODUCT_OUT)/cm-$(CM_VERSION).zip



.PHONY: otapackage bacon

otapackage: $(INTERNAL_OTA_PACKAGE_TARGET)