diff --git a/.gitmodules b/.gitmodules index 170e0562..9bed2548 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "Patches/DivestOS_Wallpapers"] path = Patches/Wallpapers - url = git@gitlab.com:divested-mobile/wallpapers.git + url = https://gitlab.com/divested-mobile/wallpapers.git [submodule "Patches/Linux"] path = Patches/Linux - url = git@gitlab.com:divested-mobile/kernel_patches.git + url = https://gitlab.com/divested-mobile/kernel_patches.git [submodule "PrebuiltApps"] path = PrebuiltApps - url = git@gitlab.com:divested-mobile/prebuilt_apps.git + url = https://code.ataraxiadev.com/AtaraxiaDev/prebuilt_apps.git diff --git a/PrebuiltApps b/PrebuiltApps index ef2c6cd5..0a1dd861 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit ef2c6cd5cf9ebf35f66422721262fde72e314085 +Subproject commit 0a1dd861728c85046bd9be2e2037b62d37d92e89 diff --git a/Scripts/Generate_Signing_Keys.sh b/Scripts/Generate_Signing_Keys.sh index 0464dbf8..1f945fcf 100644 --- a/Scripts/Generate_Signing_Keys.sh +++ b/Scripts/Generate_Signing_Keys.sh @@ -30,7 +30,7 @@ if [[ -d "$DOS_SIGNING_KEYS" ]]; then cd "$DOS_SIGNING_KEYS/NEW"; mkdir $1; cd $1; - desc="/O=Divested Computing Group/CN=DivestOS for $1/emailAddress=support@divestos.org"; + desc="/O=AtaraxiaDev/CN=DivestOS for $1/emailAddress=admin@ataraxiadev.com"; sed -i '/blank for none/,+1 d' "$DOS_BUILD_BASE"/development/tools/make_key; diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh index 7681f3c9..e9a04068 100644 --- a/Scripts/LineageOS-19.1/Patch.sh +++ b/Scripts/LineageOS-19.1/Patch.sh @@ -450,6 +450,7 @@ awk -i inplace '!/speed-profile/' build/target/product/lowram.mk; #breaks compil awk -i inplace '!/persist.traced.enable/' build/target/product/lowram.mk; #breaks compile due to duplicate sed -i 's/wifi,cell/internet/' overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml; #Use the modern quick tile sed -i 's|system/etc|$(TARGET_COPY_OUT_PRODUCT)/etc|' divestos.mk; +if [ "$DOS_MICROG_SUPPORT" = true ]; then echo "PRODUCT_PACKAGES += GmsCore GsfProxy FakeStore" >> packages.mk; fi; fi; # #END OF ROM CHANGES diff --git a/Scripts/init.sh b/Scripts/init.sh index 73cc1498..ddbe3ee6 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -21,11 +21,18 @@ #START OF USER CONFIGURABLE OPTIONS # #General -export DOS_WORKSPACE_ROOT="/mnt/dos/"; #XXX: THIS MUST BE CORRECT TO BUILD! -#export DOS_BUILDS=$DOS_WORKSPACE_ROOT"Builds/"; -export DOS_BUILDS="/mnt/backup-1/DivestOS/Builds/"; #XXX: THIS MUST BE CORRECT TO BUILD! -export DOS_SIGNING_KEYS="$DOS_WORKSPACE_ROOT/Signing_Keys/4096pro"; -export DOS_SIGNING_GPG="$DOS_WORKSPACE_ROOT/Signing_Keys/gnupg"; +if [[ -z $DOS_WORKSPACE_ROOT ]]; then + export DOS_WORKSPACE_ROOT="/mnt/dos/"; +fi +if [[ -z $DOS_BUILDS ]]; then + export DOS_BUILDS=$DOS_WORKSPACE_ROOT"/Builds/"; +fi +if [[ -z $DOS_SIGNING_KEYS ]]; then + export DOS_SIGNING_KEYS=$DOS_WORKSPACE_ROOT"Signing_Keys/4096pro"; +fi +if [[ -z $DOS_SIGNING_GPG ]]; then + export DOS_SIGNING_GPG=$DOS_WORKSPACE_ROOT"Signing_Keys/gnupg"; +fi #export USE_CCACHE=1; #export CCACHE_DIR=""; export CCACHE_COMPRESS=1; @@ -81,10 +88,18 @@ export DOS_GPS_SUPL_HOST="supl.google.com"; #Options: Any *valid* SUPL server export DOS_MALWARE_SCAN_BEFORE_SIGN=false; #Scan device files for malware before signing export DOS_GENERATE_DELTAS=true; #Creates deltas from existing target_files in $DOS_BUILDS export DOS_AUTO_ARCHIVE_BUILDS=true; #Copies files to $DOS_BUILDS after signing -export DOS_REMOVE_AFTER=true; #Removes device OUT directory after complete to reclaim space. Requires AUTO_ARCHIVE_BUILDS=true -export DOS_REMOVE_AFTER_FULL=false; #Removes the entire OUT directory -export DOS_GPG_SIGNING=true; -export DOS_GPG_SIGNING_KEY="B8744D67F9F1E14E145DFD8E7F627E920F316994"; +if [[ -z $DOS_REMOVE_AFTER ]]; then + export DOS_REMOVE_AFTER=true; #Removes device OUT directory after complete to reclaim space. Requires AUTO_ARCHIVE_BUILDS=true +fi +if [[ -z $DOS_REMOVE_AFTER_FULL ]]; then + export DOS_REMOVE_AFTER_FULL=false; #Removes the entire OUT directory +fi +if [[ -z $DOS_GPG_SIGNING ]]; then + export DOS_GPG_SIGNING=true; +fi +if [[ -z $DOS_GPG_SIGNING_KEY ]]; then + export DOS_GPG_SIGNING_KEY="922DA6E758A0FE4CFAB4E4B2FD266B810DF48DF2"; +fi #Branding export DOS_BRANDING_NAME="DivestOS"; @@ -95,8 +110,12 @@ export DOS_BRANDING_BOOTANIMATION_STYLE="plasma"; #Options: gradient, plasma export DOS_BRANDING_BOOTANIMATION_COLOR="#FF5722-#03A9F4"; #plasma export DOS_BRANDING_LINK_ABOUT="https://divestos.org/pages/about"; export DOS_BRANDING_LINK_PRIVACY="https://divestos.org/pages/privacy_policy"; -export DOS_BRANDING_SERVER_OTA="https://divestos.org/updater.php"; -export DOS_BRANDING_SERVER_OTA_ONION="$DOS_BRANDING_SERVER_OTA"; #TODO: need to handle allow cleartext +if [[ -z $DOS_BRANDING_SERVER_OTA ]]; then + export DOS_BRANDING_SERVER_OTA="https://ota.ataraxiadev.com/api"; +fi +if [[ -z $DOS_BRANDING_SERVER_OTA_ONION ]]; then + export DOS_BRANDING_SERVER_OTA_ONION=$DOS_BRANDING_SERVER_OTA; #TODO: need to handle allow cleartext +fi #Theme export DOS_THEME_50="FFCA28"; #Amber 400 @@ -146,12 +165,7 @@ fi; export DOS_TMP_DIR="/tmp/dos_tmp"; mkdir -p "$DOS_TMP_DIR"; export DOS_HOSTS_FILE="$DOS_TMP_DIR/hosts"; -export DOS_TMP_GNUPG="$DOS_TMP_DIR/gnupg-$RANDOM"; -mkdir -p "$DOS_TMP_GNUPG"; -export GNUPGHOME="$DOS_TMP_GNUPG"; -chmod 700 "$DOS_TMP_GNUPG"; -export DOS_VERIFICATION_KEYRING="$DOS_WORKSPACE_ROOT/Misc/pubring.kbx"; -cp "$DOS_VERIFICATION_KEYRING" "$DOS_TMP_GNUPG/"; +export DOS_TMP_GNUPG="$GNUPGHOME"; export DOS_PREBUILT_APPS="$DOS_WORKSPACE_ROOT/PrebuiltApps/"; export DOS_PATCHES_COMMON="$DOS_WORKSPACE_ROOT/Patches/Common/";