Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2025-05-02 06:26:20 -04:00
Code Issues Projects Releases Packages Wiki Activity

More fixes

Browse source 
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2021-10-16 16:28:41 -04:00
parent 256b1db98b
commit 042b9063d1
30 changed files with 84 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Scripts/Common/Functions.sh
View file

@ -57,8 +57,7 @@ applyPatchReal() {
currentWorkingPatch=$1;
firstLine=$(head -n1 "$currentWorkingPatch");
if [[ "$firstLine" = *"Mon Sep 17 00:00:00 2001"* ]] || [[ "$firstLine" = *"Thu Jan 1 00:00:00 1970"* ]]; then
git am "$@";
if [ "$?" -eq 0 ]; then
if git am "$@"; then
if [ "$DOS_REFRESH_PATCHES" = true ]; then
if [[ "$currentWorkingPatch" == $DOS_PATCHES* ]]; then
git format-patch -1 HEAD --zero-commit --output="$currentWorkingPatch";
@ -75,16 +74,13 @@ export -f applyPatchReal;
applyPatch() {
currentWorkingPatch=$1;
if [ -f "$currentWorkingPatch" ]; then
git apply --check "$@" &> /dev/null;
if [ "$?" -eq 0 ]; then
if git apply --check "$@" &> /dev/null; then
applyPatchReal "$@";
else
git apply --reverse --check "$@" &> /dev/null;
if [ "$?" -eq 0 ]; then
if git apply --reverse --check "$@" &> /dev/null; then
echo "Already applied: $currentWorkingPatch";
else
git apply --check "$@" --3way &> /dev/null;
if [ "$?" -eq 0 ]; then
if git apply --check "$@" --3way &> /dev/null; then
applyPatchReal "$@" --3way;
echo "Applied (as 3way): $currentWorkingPatch";
else
@ -101,8 +97,7 @@ export -f applyPatch;
gpgVerifyDirectory() {
if [ -r "$HOME/.gnupg" ]; then
for sig in $1/*.asc; do
gpg --verify $sig &>/dev/null;
if [ "$?" -eq "0" ]; then
if gpg --verify $sig &>/dev/null; then
echo -e "\e[0;32mGPG Verified Successfully: $sig\e[0m";
else
echo -e "\e[0;31mWARNING: GPG Verification Failed: $sig\e[0m";
@ -300,8 +295,7 @@ processRelease() {
if [ "$DOS_GPG_SIGNING" = true ]; then
for checksum in $OUT_DIR/*.sha512sum; do
echo -e "\e[0;32mGPG signing $checksum\e[0m";
gpg --homedir "$DOS_SIGNING_GPG" --sign --local-user "$DOS_GPG_SIGNING_KEY" --clearsign "$checksum";
if [ "$?" -eq "0" ]; then
if gpg --homedir "$DOS_SIGNING_GPG" --sign --local-user "$DOS_GPG_SIGNING_KEY" --clearsign "$checksum"; then
mv -f "$checksum.asc" "$checksum";
fi;
done;

2
Scripts/Common/Optimize.sh
View file

@ -17,7 +17,7 @@
set -euo pipefail;
#Attempts to increase performance and battery life
#Last verified: 2018-04-27
#Last verified: 2021-10-16
echo "Optimizing...";

2
Scripts/LineageOS-14.1/Defaults.sh
View file

@ -17,7 +17,7 @@
set -euo pipefail;
#Changes various default settings
#Last verified: 2018-04-27
#Last verified: 2021-10-16
#Useful commands
#nano $(find . -name "config.xml" | grep "values/" | grep -v "device" | grep -v "tests")

2
Scripts/LineageOS-14.1/Functions.sh
View file

@ -15,7 +15,7 @@
#You should have received a copy of the GNU General Public License
#along with this program. If not, see <https://www.gnu.org/licenses/>.
#Last verified: 2018-04-27
#Last verified: 2021-10-16
patchAllKernels() {
startPatcher "kernel_amazon_hdx-common kernel_asus_grouper kernel_htc_msm8960 kernel_htc_msm8994 kernel_lge_msm8992 kernel_motorola_msm8992 kernel_samsung_exynos5420 kernel_samsung_manta kernel_samsung_smdk4412 kernel_samsung_tuna kernel_samsung_universal8890";

3
Scripts/LineageOS-14.1/Patch.sh
View file

@ -16,7 +16,7 @@
#along with this program. If not, see <https://www.gnu.org/licenses/>.
set -euo pipefail;
#Last verified: 2018-04-27
#Last verified: 2021-10-16
#Initialize aliases
#source ../../Scripts/init.sh
@ -428,6 +428,7 @@ awk -i inplace '!/TARGET_RECOVERY_UPDATER_LIBS/' device/samsung/toro*/BoardConfi
awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' device/samsung/toro*/BoardConfig.mk;
sed -i 's/^YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer.l*; #Fix builds with GCC 10
rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk || true;
#
#END OF DEVICE CHANGES
#

2
Scripts/LineageOS-14.1/Rebrand.sh
View file

@ -17,7 +17,7 @@
set -euo pipefail;
#Updates select user facing strings
#Last verified: 2018-04-27
#Last verified: 2021-10-16
echo "Rebranding...";

2
Scripts/LineageOS-14.1/Theme.sh
View file

@ -17,7 +17,7 @@
set -euo pipefail;
#Replaces teal accents with orange/yellow ones
#Last verified: 2018-04-27
#Last verified: 2021-10-16
echo "Applying theme...";

2
Scripts/LineageOS-15.1/Defaults.sh
View file

@ -17,7 +17,7 @@
set -euo pipefail;
#Changes various default settings
#Last verified: 2018-04-27
#Last verified: 2021-10-16
#Useful commands
#nano $(find . -name "config.xml" | grep "values/" | grep -v "device" | grep -v "tests")

2
Scripts/LineageOS-15.1/Functions.sh
View file

@ -15,7 +15,7 @@
#You should have received a copy of the GNU General Public License
#along with this program. If not, see <https://www.gnu.org/licenses/>.
#Last verified: 2018-04-27
#Last verified: 2021-10-16
patchAllKernels() {
startPatcher "kernel_asus_fugu kernel_asus_msm8916 kernel_google_dragon kernel_google_msm kernel_htc_flounder kernel_htc_msm8994 kernel_huawei_angler kernel_lge_bullhead kernel_lge_hammerhead kernel_lge_msm8996 kernel_moto_shamu kernel_nextbit_msm8992 kernel_oneplus_msm8994 kernel_zte_msm8996";

4
Scripts/LineageOS-15.1/Patch.sh
View file

@ -16,7 +16,7 @@
#along with this program. If not, see <https://www.gnu.org/licenses/>.
set -euo pipefail;
#Last verified: 2018-04-27
#Last verified: 2021-10-16
#Initialize aliases
#source ../../Scripts/init.sh
@ -318,7 +318,7 @@ sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" ker
sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/zte/msm8996/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile
sed -i 's/^YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer.l*; #Fix builds with GCC 10
rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk;
rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk || true;
#
#END OF DEVICE CHANGES
#

2
Scripts/LineageOS-15.1/Rebrand.sh
View file

@ -17,7 +17,7 @@
set -euo pipefail;
#Updates select user facing strings
#Last verified: 2018-04-27
#Last verified: 2021-10-16
echo "Rebranding...";

2
Scripts/LineageOS-16.0/Defaults.sh
View file

@ -17,7 +17,7 @@
set -euo pipefail;
#Changes various default settings
#Last verified: 2019-03-04
#Last verified: 2021-10-16
#Useful commands
#nano $(find . -name "config.xml" | grep "values/" | grep -v "device" | grep -v "tests")

2
Scripts/LineageOS-16.0/Functions.sh
View file

@ -15,7 +15,7 @@
#You should have received a copy of the GNU General Public License
#along with this program. If not, see <https://www.gnu.org/licenses/>.
#Last verified: 2018-04-27
#Last verified: 2021-10-16
patchAllKernels() {
startPatcher "kernel_asus_fugu kernel_asus_msm8953 kernel_cyanogen_msm8916 kernel_cyanogen_msm8974 kernel_google_yellowstone kernel_lge_hammerhead";

4
Scripts/LineageOS-16.0/Patch.sh
View file

@ -16,7 +16,7 @@
#along with this program. If not, see <https://www.gnu.org/licenses/>.
set -euo pipefail;
#Last verified: 2019-03-04
#Last verified: 2021-10-16
#Initialize aliases
#source ../../Scripts/init.sh
@ -316,7 +316,7 @@ sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" ker
sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/google/yellowstone/arch/arm*/configs/*_defconfig; #Breaks on compile
sed -i 's/^YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer.l*; #Fix builds with GCC 10
rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk;
rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk || true;
#
#END OF DEVICE CHANGES
#

2
Scripts/LineageOS-16.0/Rebrand.sh
View file

@ -17,7 +17,7 @@
set -euo pipefail;
#Updates select user facing strings
#Last verified: 2019-03-04
#Last verified: 2021-10-16
echo "Rebranding...";

2
Scripts/LineageOS-17.1/Defaults.sh
View file

@ -17,7 +17,7 @@
set -euo pipefail;
#Changes various default settings
#Last verified: 2020-04-14
#Last verified: 2021-10-16
#Useful commands
#nano $(find . -name "config.xml" | grep "values/" | grep -v "device" | grep -v "tests")

2
Scripts/LineageOS-17.1/Functions.sh
View file

@ -15,7 +15,7 @@
#You should have received a copy of the GNU General Public License
#along with this program. If not, see <https://www.gnu.org/licenses/>.
#Last verified: 2020-04-14
#Last verified: 2021-10-16
patchAllKernels() {
startPatcher "kernel_asus_fugu kernel_cyanogen_msm8916 kernel_google_marlin kernel_google_msm-4.9 kernel_google_yellowstone kernel_htc_msm8974 kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_motorola_msm8996 kernel_oneplus_msm8994 kernel_oneplus_sm7250 kernel_oneplus_sm8150 kernel_xiaomi_sm6150 kernel_yandex_sdm660 kernel_zuk_msm8996";

4
Scripts/LineageOS-17.1/Patch.sh
View file

@ -16,7 +16,7 @@
#along with this program. If not, see <https://www.gnu.org/licenses/>.
set -euo pipefail;
#Last verified: 2020-04-14
#Last verified: 2021-10-16
#Initialize aliases
#source ../../Scripts/init.sh
@ -379,7 +379,7 @@ sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/google
sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/motorola/msm8996/arch/arm64/configs/*_defconfig; #Breaks on compile
sed -i 's/^YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer.l*; #Fix builds with GCC 10
rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk;
rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk || true;
#
#END OF DEVICE CHANGES
#

2
Scripts/LineageOS-17.1/Rebrand.sh
View file

@ -17,7 +17,7 @@
set -euo pipefail;
#Updates select user facing strings
#Last verified: 2020-04-14
#Last verified: 2021-10-16
echo "Rebranding...";

2
Scripts/LineageOS-18.1/Defaults.sh
View file

@ -17,7 +17,7 @@
set -euo pipefail;
#Changes various default settings
#Last verified: 2021-03-22
#Last verified: 2021-10-16
#Useful commands
#nano $(find . -name "config.xml" | grep "values/" | grep -v "device" | grep -v "tests")

2
Scripts/LineageOS-18.1/Functions.sh
View file

@ -15,7 +15,7 @@
#You should have received a copy of the GNU General Public License
#along with this program. If not, see <https://www.gnu.org/licenses/>.
#Last verified: 2021-03-22
#Last verified: 2021-10-16
patchAllKernels() {
startPatcher "kernel_essential_msm8998 kernel_fairphone_msm8974 kernel_fairphone_sdm632 kernel_fxtec_msm8998 kernel_google_coral kernel_google_msm kernel_google_msm-4.9 kernel_google_redbull kernel_google_sunfish kernel_google_wahoo kernel_htc_msm8974 kernel_lge_g3 kernel_lge_mako kernel_lge_msm8974 kernel_lge_msm8996 kernel_moto_shamu kernel_motorola_msm8974 kernel_nextbit_msm8992 kernel_oneplus_msm8996 kernel_oneplus_msm8998 kernel_oneplus_sdm845 kernel_oneplus_sm8150 kernel_oppo_msm8974 kernel_razer_msm8998 kernel_razer_sdm845 kernel_samsung_jf kernel_samsung_msm8930-common kernel_samsung_msm8974 kernel_xiaomi_sdm845 kernel_xiaomi_sm8150 kernel_xiaomi_sm8250";

4
Scripts/LineageOS-18.1/Patch.sh
View file

@ -16,7 +16,7 @@
#along with this program. If not, see <https://www.gnu.org/licenses/>.
set -euo pipefail;
#Last verified: 2021-03-22
#Last verified: 2021-10-16
#Initialize aliases
#source ../../Scripts/init.sh
@ -463,7 +463,7 @@ sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/motoro
sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/oneplus/msm8996/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile
sed -i 's/^YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer.l*; #Fix builds with GCC 10
rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk;
rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk || true;
#
#END OF DEVICE CHANGES
#

2
Scripts/LineageOS-18.1/Rebrand.sh
View file

@ -17,7 +17,7 @@
set -euo pipefail;
#Updates select user facing strings
#Last verified: 2021-03-22
#Last verified: 2021-10-16
echo "Rebranding...";

3
Scripts/init.sh
View file

@ -107,8 +107,7 @@ umask 0022;
gpgVerifyGitHead() {
if [ -r "$HOME/.gnupg" ]; then
git -C $1 verify-commit HEAD;
if [ "$?" -eq "0" ]; then
if git -C $1 verify-commit HEAD; then
echo -e "\e[0;32mGPG Verified Git HEAD Successfully: $1\e[0m";
else
echo -e "\e[0;31mWARNING: GPG Verification of Git HEAD Failed: $1\e[0m";