diff options
| author | Koushik Dutta <koushd@gmail.com> | 2012-02-24 01:19:34 -0800 |
|---|---|---|
| committer | Koushik Dutta <koushd@gmail.com> | 2012-02-24 01:19:34 -0800 |
| commit | 8d6be8e55c359397e8fe5c4b7d0fe35935616d10 (patch) | |
| tree | 689ba77c4d78d4d48557d4aa95be067bb9c02350 | |
| parent | ffd51b2af8ea24bedd37489c7261916183f4b011 (diff) | |
| download | vendor_replicant-8d6be8e55c359397e8fe5c4b7d0fe35935616d10.zip vendor_replicant-8d6be8e55c359397e8fe5c4b7d0fe35935616d10.tar.gz vendor_replicant-8d6be8e55c359397e8fe5c4b7d0fe35935616d10.tar.bz2 | |
fix up ota package filename for new buidl system
Change-Id: I8c5008e438286952f2e58957b24387d1a99d3670
| -rw-r--r-- | products/common_versions.mk | 15 | ||||
| -rwxr-xr-x | tools/squisher | 6 |
2 files changed, 10 insertions, 11 deletions
diff --git a/products/common_versions.mk b/products/common_versions.mk index 7c19fbf..d8e2db1 100644 --- a/products/common_versions.mk +++ b/products/common_versions.mk @@ -5,15 +5,18 @@ PRODUCT_VERSION_MAINTENANCE = 0-RC0 PRODUCT_BUILD_PROP_OVERRIDES += BUILD_DISPLAY_ID=GWK74 ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR)-$(shell date +%m%d%Y)-NIGHTLY-$(PRODUCT_RELEASE_NAME) + 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) else ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME) + 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 - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)-KANG + 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 diff --git a/tools/squisher b/tools/squisher index c82443f..5ae0879 100755 --- a/tools/squisher +++ b/tools/squisher @@ -138,13 +138,9 @@ 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 -if [ -z "$CYANOGEN_NIGHTLY" ]; then - MODVERSION=`sed -n -e'/ro\.modversion/s/^.*CyanogenMod-//p' $REPACK/ota/system/build.prop` + MODVERSION=`sed -n -e'/ro\.cm\.version/s/^.*CyanogenMod-//p' $REPACK/ota/system/build.prop` : ${MODVERSION:=nightly} OUTFILE=$OUT/update-cm-$MODVERSION-signed.zip -else - OUTFILE=$OUT/update-squished.zip -fi # Pack it up and sign printf "Zipping package..." |