summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-04-19 16:51:43 (GMT)
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-04-19 16:55:20 (GMT)
commite3855c4324a156ef0064f1a0ebbe577efda5e2de (patch)
tree0dea041059064f5f03fb26e6ad76cc3b794d05f7
parent004fbdedd1e3ed75747d8a1ef27b2494834c4c8d (diff)
downloadbuild-e3855c4324a156ef0064f1a0ebbe577efda5e2de.zip
build-e3855c4324a156ef0064f1a0ebbe577efda5e2de.tar.gz
build-e3855c4324a156ef0064f1a0ebbe577efda5e2de.tar.bz2
Revert "bacon: name the package correctly"
This reverts commit 724feedbd9e668e239e827b974437da85c140313. 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.
-rw-r--r--core/Makefile6
1 files changed, 1 insertions, 5 deletions
diff --git a/core/Makefile b/core/Makefile
index 8f1e600..94b5561 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -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)