Merge "Add AT&T broadband apn" into cm-10.1
diff --git a/jenkins-build-targets b/jenkins-build-targets
deleted file mode 100644
index 873122a..0000000
--- a/jenkins-build-targets
+++ /dev/null
@@ -1,74 +0,0 @@
-cm_a700-userdebug
-cm_anzu-userdebug
-cm_captivatemtd-userdebug
-cm_crespo-userdebug
-cm_crespo4g-userdebug
-cm_coconut-userdebug
-cm_d2att-userdebug
-cm_d2mtr-userdebug
-cm_d2spr-userdebug
-cm_d2tmo-userdebug
-cm_d2usc-userdebug
-cm_d2vzw-userdebug
-cm_encore-userdebug
-cm_endeavoru-userdebug
-cm_epicmtd-userdebug
-cm_everest-userdebug
-cm_evita-userdebug
-cm_fascinatemtd-userdebug
-cm_galaxysbmtd-userdebug
-cm_galaxysmtd-userdebug
-cm_grouper-userdebug
-cm_haida-userdebug
-cm_hallon-userdebug
-cm_hercules-userdebug
-cm_i777-userdebug
-cm_i9100-userdebug
-cm_i9100g-userdebug
-cm_i9300-userdebug
-cm_iyokan-userdebug
-cm_jewel-userdebug
-cm_maguro-userdebug
-cm_mango-userdebug
-cm_manta-userdebug
-cm_mesmerizemtd-userdebug
-cm_mint-userdebug
-cm_n7000-userdebug
-cm_n7100-userdebug
-cm_n8000-userdebug
-cm_n8013-userdebug
-cm_p1c-userdebug
-cm_p1l-userdebug
-cm_p1n-userdebug
-cm_p1-userdebug
-cm_p3-userdebug
-cm_p3100-userdebug
-cm_p3110-userdebug
-cm_p4-userdebug
-cm_p4tmo-userdebug
-cm_p4vzw-userdebug
-cm_p4wifi-userdebug
-cm_p5100-userdebug
-cm_p5110-userdebug
-cm_p930-userdebug
-cm_p970-userdebug
-cm_p990-userdebug
-cm_quincyatt-userdebug
-cm_quincytmo-userdebug
-cm_satsuma-userdebug
-cm_skyrocket-userdebug
-cm_smultron-userdebug
-cm_stingray-userdebug
-cm_su640-userdebug
-cm_tilapia-userdebug
-cm_t769-userdebug
-cm_tf101-userdebug
-cm_tf201-userdebug
-cm_tf300t-userdebug
-cm_tf700t-userdebug
-cm_toroplus-userdebug
-cm_toro-userdebug
-cm_urushi-userdebug
-cm_vibrantmtd-userdebug
-cm_ville-userdebug
-cm_wingray-userdebug
diff --git a/prebuilt/common/bin/backuptool.functions b/prebuilt/common/bin/backuptool.functions
index 833460f..ef8479a 100644
--- a/prebuilt/common/bin/backuptool.functions
+++ b/prebuilt/common/bin/backuptool.functions
@@ -5,7 +5,7 @@
export C=/tmp/backupdir
export S=/system
-export V=9
+export V=10.1
backup_file() {
if [ -e "$1" ]; then
diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index 6ba1323..68b1ff8 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -5,7 +5,7 @@
export C=/tmp/backupdir
export S=/system
-export V=10
+export V=10.1
# Preserve /system/addon.d in /tmp/addon.d
preserve_addon_d() {
@@ -20,10 +20,10 @@
rm -rf /tmp/addon.d/
}
-# Proceed only if /system is the expected major version
+# Proceed only if /system is the expected major and minor version
check_prereq() {
if ( ! grep -q "^ro.cm.version=$V.*" /system/build.prop ); then
- echo "Not backing up files from incompatible version."
+ echo "Not backing up files from incompatible version: $V"
exit 127
fi
}
diff --git a/vendorsetup.sh b/vendorsetup.sh
index aede0f6..529b661 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,4 +1,4 @@
-for combo in $(cat vendor/cm/jenkins-build-targets)
+for combo in $(wget -o /dev/null -O - https://raw.github.com/CyanogenMod/hudson/master/cm-daily-build-targets | grep cm-10.1 | awk {'print $1'})
do
add_lunch_combo $combo
done