From 747af2bc1c4f81787e228f6940c81e1055826e53 Mon Sep 17 00:00:00 2001 From: Tad Date: Sat, 2 Jun 2018 17:56:21 -0400 Subject: [PATCH] Add option to disable inclusion of our HOSTS file --- Scripts/LineageOS-14.1/Patch.sh | 8 ++++---- Scripts/LineageOS-15.1/Patch.sh | 8 ++++---- Scripts/init.sh | 11 ++++++++--- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 99f72439..6c6060b6 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -42,7 +42,7 @@ #Download some (non-executable) out-of-tree files for use later on mkdir /tmp/ar; cd /tmp/ar; -wget https://spotco.us/hosts -N; #XXX: /hosts is built from non-commercial use files, switch to /hsc for release +if [ "$HOSTS_BLOCKING" = true ]; then wget https://spotco.us/hosts -N; fi; #XXX: /hosts is built from non-commercial use files, switch to /hsc for release #Accept all SDK licences, not normally needed but Gradle managed apps fail without it mkdir -p "$ANDROID_HOME/licenses"; @@ -166,7 +166,7 @@ enterAndClear "packages/services/Telephony"; if [ "$NON_COMMERCIAL_USE_PATCHES" = true ]; then patch -p1 < $patches"android_packages_services_Telephony/Copperhead/0001-LTE_Only.patch"; fi; #LTE only preferred network mode choice (Copperhead CC BY-NC-SA) enterAndClear "system/core"; -cat /tmp/ar/hosts >> rootdir/etc/hosts; #Merge in our HOSTS file +if [ "$HOSTS_BLOCKING" = true ]; then cat /tmp/ar/hosts >> rootdir/etc/hosts; fi; #Merge in our HOSTS file git revert 0217dddeb5c16903c13ff6c75213619b79ea622b d7aa1231b6a0631f506c0c23816f2cd81645b15f; #Always update recovery XXX: This doesn't seem to work patch -p1 < $patches"android_system_core/0001-Harden_Mounts.patch"; #Harden mounts with nodev/noexec/nosuid (CopperheadOS-13.0) @@ -190,8 +190,8 @@ cp -r $patches"android_vendor_cm/firmware_deblobber" .; cp $patches"android_vendor_cm/firmware_deblobber.mk" build/tasks/firmware_deblobber.mk; sed -i 's/CM_BUILDTYPE := UNOFFICIAL/CM_BUILDTYPE := dos/' config/common.mk; #Change buildtype sed -i 's/messaging/Silence/' config/telephony.mk; #Replace AOSP Messaging app with Silence -cp $patches"android_vendor_cm/dns66.json" prebuilt/common/etc/dns66.json; -sed -i '4iPRODUCT_COPY_FILES += vendor/cm/prebuilt/common/etc/dns66.json:system/etc/dns66/settings.json' config/common.mk; #Include DNS66 default config +if [ "$HOSTS_BLOCKING" = false ]; then cp $patches"android_vendor_cm/dns66.json" prebuilt/common/etc/dns66.json; fi; +if [ "$HOSTS_BLOCKING" = false ]; then sed -i '4iPRODUCT_COPY_FILES += vendor/cm/prebuilt/common/etc/dns66.json:system/etc/dns66/settings.json' config/common.mk; fi; #Include DNS66 default config enterAndClear "vendor/cmsdk"; awk -i inplace '!/WeatherManagerServiceBroker/' cm/res/res/values/config.xml; #Disable Weather diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 34007772..89ea94e1 100755 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -42,7 +42,7 @@ #Download some (non-executable) out-of-tree files for use later on mkdir /tmp/ar; cd /tmp/ar; -wget https://spotco.us/hosts -N; #XXX: /hosts is built from non-commercial use files, switch to /hsc for release +if [ "$HOSTS_BLOCKING" = true ]; then wget https://spotco.us/hosts -N; fi; #XXX: /hosts is built from non-commercial use files, switch to /hsc for release #Accept all SDK licences, not normally needed but Gradle managed apps fail without it mkdir -p "$ANDROID_HOME/licenses"; @@ -181,7 +181,7 @@ patch -p1 < $patches"android_system_vold/0001-AES256.patch"; #Add a variable for enterAndClear "vendor/lineage"; rm -rf overlay/common/vendor/lineage-sdk/packages; #Remove analytics -awk -i inplace '!/50-lineage.sh/' config/common.mk; #Make sure our hosts is always used +if [ "$HOSTS_BLOCKING" = true ]; then awk -i inplace '!/50-lineage.sh/' config/common.mk; fi; #Make sure our hosts is always used awk -i inplace '!/PRODUCT_EXTRA_RECOVERY_KEYS/' config/common.mk; #Remove extra keys awk -i inplace '!/security\/lineage/' config/common.mk; #Remove extra keys patch -p1 < $patches"android_vendor_lineage/0001-SCE.patch"; #Include our extras such as MicroG and F-Droid @@ -191,8 +191,8 @@ cp -r $patches"android_vendor_lineage/firmware_deblobber" .; cp $patches"android_vendor_lineage/firmware_deblobber.mk" build/tasks/firmware_deblobber.mk; sed -i 's/LINEAGE_BUILDTYPE := UNOFFICIAL/LINEAGE_BUILDTYPE := dos/' config/common.mk; #Change buildtype sed -i 's/messaging/Silence/' config/telephony.mk; #Replace AOSP Messaging app with Silence -cp $patches"android_vendor_lineage/dns66.json" prebuilt/common/etc/dns66.json; -sed -i '4iPRODUCT_COPY_FILES += vendor/lineage/prebuilt/common/etc/dns66.json:system/etc/dns66/settings.json' config/common.mk; #Include DNS66 default config +if [ "$HOSTS_BLOCKING" = false ]; then cp $patches"android_vendor_lineage/dns66.json" prebuilt/common/etc/dns66.json; fi; +if [ "$HOSTS_BLOCKING" = false ]; then sed -i '4iPRODUCT_COPY_FILES += vendor/lineage/prebuilt/common/etc/dns66.json:system/etc/dns66/settings.json' config/common.mk; fi; #Include DNS66 default config # #END OF ROM CHANGES # diff --git a/Scripts/init.sh b/Scripts/init.sh index 8a6bdcf0..55c4665b 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -18,12 +18,17 @@ #Sets settings used by all other scripts #START OF USER CONFIGURABLE OPTIONS +export androidWorkspace="/mnt/Drive-3/"; #XXX: THIS MUST BE CORRECT TO BUILD! + + export MALWARE_SCAN_ENABLED=true; #Set true to perform a fast scan on patchWorkspace() and a through scan on buildAll() export MALWARE_SCAN_SETTING="quick"; #buildAll() scan speed. Options are quick, extra, slow, full -export MICROG_INCLUDED=true; #Switch to false to prevent inclusion of microG -export NON_COMMERCIAL_USE_PATCHES=false; #Switch to false to prevent inclusion of non-commercial use patches -export androidWorkspace="/mnt/Drive-3/"; #XXX: THIS MUST BE CORRECT TO BUILD! +export MICROG_INCLUDED=true; #Switch to false to prevent inclusion of microG + +export HOSTS_BLOCKING=true; #Switch to false to prevent inclusion of our HOSTS file + +export NON_COMMERCIAL_USE_PATCHES=false; #Switch to false to prevent inclusion of non-commercial use patches #END OF USER CONFIGURABLE OPTIONS BUILD_WORKING_DIR=${PWD##*/};