Merge "add Xoom wifi menu option" into ics
diff --git a/config/common.mk b/config/common.mk
index c23ee9c..95572aa 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -91,13 +91,13 @@
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
diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index 4c393fb..c3c3748 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -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;
diff --git a/prebuilt/common/etc/init.d/00banner b/prebuilt/common/etc/init.d/00banner
index 70b8a9f..ed2f4b7 100644
--- a/prebuilt/common/etc/init.d/00banner
+++ b/prebuilt/common/etc/init.d/00banner
@@ -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( ((_)((_( ";
diff --git a/tools/squisher b/tools/squisher
index b511936..cbd154f 100755
--- a/tools/squisher
+++ b/tools/squisher
@@ -141,7 +141,7 @@
# 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