Merge "cm: remove tmp file on boot" into gingerbread
diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 15943a3..31edc53 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -34,6 +34,7 @@
* Blade (San Francisco, Sapo A5, others): Tom Giordano and Jacob Crawley
* Encore (Nook Color): dalingrin, cvpcs, nemith, cicada, fattire
* Speedy: toastcfh
+* Zeppelin (CLIQ XT/Quench): firesnatch, turl
Translators:
------------
diff --git a/products/cyanogen_bravo.mk b/products/cyanogen_bravo.mk
index d508c4c..b8ee7e9 100644
--- a/products/cyanogen_bravo.mk
+++ b/products/cyanogen_bravo.mk
@@ -46,10 +46,10 @@
else
ifdef CYANOGEN_RELEASE
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.0.2-Desire
+ ro.modversion=CyanogenMod-7.0.2.1-Desire
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.0.2-Desire-KANG
+ ro.modversion=CyanogenMod-7.0.2.1-Desire-KANG
endif
endif
diff --git a/products/cyanogen_bravoc.mk b/products/cyanogen_bravoc.mk
index 3206b48..dfc2afb 100644
--- a/products/cyanogen_bravoc.mk
+++ b/products/cyanogen_bravoc.mk
@@ -34,10 +34,10 @@
else
ifdef CYANOGEN_RELEASE
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.0.2-BravoC
+ ro.modversion=CyanogenMod-7.0.2.1-BravoC
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.0.2-BravoC-KANG
+ ro.modversion=CyanogenMod-7.0.2.1-BravoC-KANG
endif
endif
diff --git a/products/cyanogen_inc.mk b/products/cyanogen_inc.mk
index 68dac4e..8831237 100644
--- a/products/cyanogen_inc.mk
+++ b/products/cyanogen_inc.mk
@@ -33,10 +33,10 @@
else
ifdef CYANOGEN_RELEASE
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.0.2-Inc
+ ro.modversion=CyanogenMod-7.0.2.1-Inc
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.0.2-Inc-KANG
+ ro.modversion=CyanogenMod-7.0.2.1-Inc-KANG
endif
endif
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
index cf6fdbf..e9bea70 100644
--- a/products/cyanogen_passion.mk
+++ b/products/cyanogen_passion.mk
@@ -46,10 +46,10 @@
else
ifdef CYANOGEN_RELEASE
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.0.2-N1
+ ro.modversion=CyanogenMod-7.0.2.1-N1
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.0.2-N1-KANG
+ ro.modversion=CyanogenMod-7.0.2.1-N1-KANG
endif
endif
diff --git a/products/cyanogen_speedy.mk b/products/cyanogen_speedy.mk
index f9c1791..cffba9e 100644
--- a/products/cyanogen_speedy.mk
+++ b/products/cyanogen_speedy.mk
@@ -37,10 +37,10 @@
else
ifdef CYANOGEN_RELEASE
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.0.2-Speedy
+ ro.modversion=CyanogenMod-7.0.2.1-Speedy
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.0.2-Speedy-KANG
+ ro.modversion=CyanogenMod-7.0.2.1-Speedy-KANG
endif
endif
diff --git a/products/cyanogen_supersonic.mk b/products/cyanogen_supersonic.mk
index b70aa0f..d935cf0 100644
--- a/products/cyanogen_supersonic.mk
+++ b/products/cyanogen_supersonic.mk
@@ -37,10 +37,10 @@
else
ifdef CYANOGEN_RELEASE
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.0.2-Supersonic
+ ro.modversion=CyanogenMod-7.0.2.1-Supersonic
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.0.2-Supersonic-KANG
+ ro.modversion=CyanogenMod-7.0.2.1-Supersonic-KANG
endif
endif
diff --git a/products/cyanogen_zeppelin.mk b/products/cyanogen_zeppelin.mk
index 39536d5..af08337 100644
--- a/products/cyanogen_zeppelin.mk
+++ b/products/cyanogen_zeppelin.mk
@@ -26,10 +26,10 @@
else
ifdef CYANOGEN_RELEASE
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.0.2-RC0-CLIQXT
+ ro.modversion=CyanogenMod-7.0.2-RC1-CLIQXT
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.0.2-RC0-CLIQXT-KANG
+ ro.modversion=CyanogenMod-7.0.2-RC1-CLIQXT-KANG
endif
endif
@@ -39,9 +39,6 @@
PRODUCT_COPY_FILES += \
vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
-PRODUCT_COPY_FILES += \
- device/motorola/zeppelin/sysctl.conf:system/etc/sysctl.conf
-
PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/zeppelin
# Add the FM app