From 746b695d6ab40ad967aec47679ca64c3a4808769 Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 27 Jun 2018 08:43:12 -0400 Subject: [PATCH] Deduplicate updater patches --- .../0001-Server.patch | 0 .../0001-Server.patch | 35 ------------------- Scripts/LineageOS-14.1/Patch.sh | 2 +- Scripts/LineageOS-15.1/Functions.sh | 2 +- Scripts/LineageOS-15.1/Patch.sh | 2 +- 5 files changed, 3 insertions(+), 38 deletions(-) rename Patches/{LineageOS-14.1 => Common}/android_packages_apps_Updater/0001-Server.patch (100%) delete mode 100644 Patches/LineageOS-15.1/android_packages_apps_Updater/0001-Server.patch diff --git a/Patches/LineageOS-14.1/android_packages_apps_Updater/0001-Server.patch b/Patches/Common/android_packages_apps_Updater/0001-Server.patch similarity index 100% rename from Patches/LineageOS-14.1/android_packages_apps_Updater/0001-Server.patch rename to Patches/Common/android_packages_apps_Updater/0001-Server.patch diff --git a/Patches/LineageOS-15.1/android_packages_apps_Updater/0001-Server.patch b/Patches/LineageOS-15.1/android_packages_apps_Updater/0001-Server.patch deleted file mode 100644 index 3adaafc5..00000000 --- a/Patches/LineageOS-15.1/android_packages_apps_Updater/0001-Server.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4727712ba79e02a706735e0f01e094a0e4a8deb2 Mon Sep 17 00:00:00 2001 -From: Tad -Date: Fri, 6 Apr 2018 14:14:03 -0400 -Subject: [PATCH] Switch to our update server - -Change-Id: Ief2f6ae8952de1a5a8e3ca73989fab42ca22f622 ---- - src/org/lineageos/updater/misc/Utils.java | 10 +--------- - 1 file changed, 1 insertion(+), 9 deletions(-) - -diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java -index 67895da..d4d3379 100644 ---- a/src/org/lineageos/updater/misc/Utils.java -+++ b/src/org/lineageos/updater/misc/Utils.java -@@ -147,16 +147,8 @@ public class Utils { - String incrementalVersion = SystemProperties.get(Constants.PROP_BUILD_VERSION_INCREMENTAL); - String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE, - SystemProperties.get(Constants.PROP_DEVICE)); -- String type = SystemProperties.get(Constants.PROP_RELEASE_TYPE).toLowerCase(Locale.ROOT); - -- String serverUrl = SystemProperties.get(Constants.PROP_UPDATER_URI); -- if (serverUrl.trim().isEmpty()) { -- serverUrl = context.getString(R.string.updater_server_url); -- } -- -- return serverUrl.replace("{device}", device) -- .replace("{type}", type) -- .replace("{incr}", incrementalVersion); -+ return "0OTASERVER0?base=LineageOS&device=" + device + "&inc=" + incrementalVersion; - } - - public static String getChangelogURL(Context context) { --- -2.18.0 - diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 7b24de0d..8e8789c4 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -156,7 +156,7 @@ enterAndClear "packages/apps/Trebuchet"; cp -r "$patchesCommon/android_packages_apps_Trebuchet/default_workspace/." "res/xml/"; enterAndClear "packages/apps/Updater"; -patch -p1 < "$patches/android_packages_apps_Updater/0001-Server.patch"; #Switch to our server +patch -p1 < "$patchesCommon/android_packages_apps_Updater/0001-Server.patch"; #Switch to our server #TODO: Remove changelog enterAndClear "packages/apps/WallpaperPicker"; diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index aa9967ff..3f98d4e5 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -62,7 +62,7 @@ buildAll() { brunch lineage_flounder-user; brunch lineage_griffin-user; brunch lineage_h850-userdebug; - brunch lineage_hammerhead-user; #broken upstream - fatal error: 'linux/msm_audio_calibration.h' file not found + brunch lineage_hammerhead-user; brunch lineage_klte-user; brunch lineage_marlin-user; brunch lineage_m8-user; diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 5584a534..b845070b 100755 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -162,7 +162,7 @@ enterAndClear "packages/apps/Trebuchet"; cp -r "$patchesCommon/android_packages_apps_Trebuchet/default_workspace/." "res/xml/"; enterAndClear "packages/apps/Updater"; -patch -p1 < "$patches/android_packages_apps_Updater/0001-Server.patch"; #Switch to our server +patch -p1 < "$patchesCommon/android_packages_apps_Updater/0001-Server.patch"; #Switch to our server #TODO: Remove changelog enterAndClear "packages/apps/WallpaperPicker";