diff options
| author | Koushik Dutta <koushd@gmail.com> | 2012-02-25 14:45:55 -0800 |
|---|---|---|
| committer | Koushik Dutta <koushd@gmail.com> | 2012-02-25 14:45:55 -0800 |
| commit | 85d72a011e8b89c3713db0f9fd48fa23f20948e1 (patch) | |
| tree | fa1c086ff496211b0961769e923d831866d88612 | |
| parent | 8d6be8e55c359397e8fe5c4b7d0fe35935616d10 (diff) | |
| download | vendor_replicant-85d72a011e8b89c3713db0f9fd48fa23f20948e1.zip vendor_replicant-85d72a011e8b89c3713db0f9fd48fa23f20948e1.tar.gz vendor_replicant-85d72a011e8b89c3713db0f9fd48fa23f20948e1.tar.bz2 | |
use CMVERSION exclusively. Does not matter if it changes, as the modversion/incremental handles OTAs.
Change-Id: I027703da972487425b0fdf4b083a32f55b3424f7
| -rw-r--r-- | products/common_versions.mk | 8 | ||||
| -rwxr-xr-x | tools/squisher | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/products/common_versions.mk b/products/common_versions.mk index d8e2db1..2d226b5 100644 --- a/products/common_versions.mk +++ b/products/common_versions.mk @@ -5,18 +5,14 @@ PRODUCT_VERSION_MAINTENANCE = 0-RC0 PRODUCT_BUILD_PROP_OVERRIDES += BUILD_DISPLAY_ID=GWK74 ifdef CYANOGEN_NIGHTLY - MODVERSION := CyanogenMod-$(PRODUCT_VERSION_MAJOR)-$(shell date +%m%d%Y)-NIGHTLY-$(PRODUCT_RELEASE_NAME) - CMVERSION := CyanogenMod-$(PRODUCT_VERSION_MAJOR)-$(shell date +%m%d%Y)-NIGHTLY-$(CM_BUILD) + CMVERSION := CyanogenMod-$(PRODUCT_VERSION_MAJOR)-$(shell date +%Y%m%d)-NIGHTLY-$(CM_BUILD) else ifdef CYANOGEN_RELEASE - MODVERSION := CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME) CMVERSION := CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD) else - MODVERSION := CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)-KANG CMVERSION := CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD)-KANG endif endif PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=$(MODVERSION) \ - ro.cm.version=$(CMVERSION)
\ No newline at end of file + ro.modversion=$(CMVERSION)
\ No newline at end of file diff --git a/tools/squisher b/tools/squisher index 5ae0879..8323c0d 100755 --- a/tools/squisher +++ b/tools/squisher @@ -138,7 +138,7 @@ rm -rf $REPACK/ota/recovery find $REPACK/ota/system/lib/modules -name "*.ko" -print0 | xargs -0 arm-eabi-strip --strip-unneeded # Determine what to name the new signed package - MODVERSION=`sed -n -e'/ro\.cm\.version/s/^.*CyanogenMod-//p' $REPACK/ota/system/build.prop` + MODVERSION=`sed -n -e'/ro\.modversion/s/^.*CyanogenMod-//p' $REPACK/ota/system/build.prop` : ${MODVERSION:=nightly} OUTFILE=$OUT/update-cm-$MODVERSION-signed.zip |