StrixOS/vendor_strix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cm: Rename modversion to cm.version

Browse Source 
Change-Id: I73da7816fec34e892ee54e1782a18ec1c42863b4
This commit is contained in:
Steve Kondik
2011-12-29 15:29:34 -08:00
parent da686aad18
commit 25d7ca1628
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/common.mk
View File

@@ -91,13 +91,13 @@ PRODUCT_BUILD_PROP_OVERRIDES += BUILD_DISPLAY_ID=IML74K
ifdef CM_NIGHTLY
PRODUCT_PROPERTY_OVERRIDES += \
ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR)-$(shell date +%m%d%Y)-NIGHTLY-$(PRODUCT_RELEASE_NAME)
ro.cm.version=$(PRODUCT_VERSION_MAJOR)-$(shell date +%m%d%Y)-NIGHTLY-$(PRODUCT_RELEASE_NAME)
else
ifdef CM_RELEASE
PRODUCT_PROPERTY_OVERRIDES += \
ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)
ro.cm.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)
else
PRODUCT_PROPERTY_OVERRIDES += \
ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)-KANG
ro.cm.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)-KANG
endif
endif

4
prebuilt/common/bin/backuptool.sh
View File

@@ -5,12 +5,12 @@
C=/tmp/backupdir
S=/system
V=CyanogenMod-9
V=9
PROCEED=1;
check_prereq() {
if ( ! grep -q "^ro.modversion=.*$V.*" /system/build.prop );
if ( ! grep -q "^ro.cm.version=$V.*" /system/build.prop );
then
echo "Not backing up files from incompatible version.";
PROCEED=0;

2
prebuilt/common/etc/init.d/00banner
View File

@@ -4,7 +4,7 @@
#
L="log -p i -t cm"
$L "Welcome to Android `getprop ro.build.version.release` / `getprop ro.modversion`";
$L "Welcome to Android `getprop ro.build.version.release` / CyanogenMod-`getprop ro.cm.version`";
$L " _ ";
$L " __ __ _ ___ _ _ __ ___ __ _ _ _ _ __ __))";
$L "((_ \\(/'((_( ((\\( ((_)((_( (('((\\( ((\`1( ((_)((_( ";

2
tools/squisher
View File

@@ -141,7 +141,7 @@ rm -rf $REPACK/ota/recovery
# 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/^.*=-//p' $REPACK/ota/system/build.prop`
: ${MODVERSION:=nightly}
OUTFILE=$OUT/update-cm-$MODVERSION-signed.zip
else