From 159e5ea194505635a9c82a04e79fd07278d5a8f4 Mon Sep 17 00:00:00 2001 From: Tad Date: Mon, 7 Oct 2019 23:47:11 -0400 Subject: [PATCH] Minor tweaks - Update cherry picks - Update copyright year - bacon: fix delta generation --- Patches/Linux | 2 +- Patches/Wallpapers | 2 +- PrebuiltApps | 2 +- Scripts/Common/Deblob.sh | 2 +- Scripts/Common/Functions.sh | 2 +- Scripts/Common/Optimize.sh | 2 +- Scripts/LineageOS-11.0/Functions.sh | 2 +- Scripts/LineageOS-11.0/Patch.sh | 2 +- Scripts/LineageOS-14.1/Functions.sh | 4 +++- Scripts/LineageOS-14.1/Patch.sh | 2 +- Scripts/LineageOS-15.1/Defaults.sh | 2 +- Scripts/LineageOS-15.1/Functions.sh | 6 ++++-- Scripts/LineageOS-15.1/Patch.sh | 2 +- Scripts/LineageOS-15.1/Rebrand.sh | 2 +- Scripts/LineageOS-16.0/Defaults.sh | 2 +- Scripts/LineageOS-16.0/Functions.sh | 4 +++- Scripts/LineageOS-16.0/Patch.sh | 5 ++++- Scripts/LineageOS-16.0/Rebrand.sh | 2 +- Scripts/init.sh | 2 +- TODO | 3 ++- 20 files changed, 31 insertions(+), 21 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 85b879c4..a3b4a64f 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 85b879c485f1be49051589d7f66fad98d9310a94 +Subproject commit a3b4a64f91413ef8fedcb81bf0b5f2e2ca8016bb diff --git a/Patches/Wallpapers b/Patches/Wallpapers index f0f7b5e0..e0e77cd4 160000 --- a/Patches/Wallpapers +++ b/Patches/Wallpapers @@ -1 +1 @@ -Subproject commit f0f7b5e041114405c617960c0e00762e377b8453 +Subproject commit e0e77cd40556ac965d351be39cc883827d39e3d1 diff --git a/PrebuiltApps b/PrebuiltApps index 7c4dabda..b79c32fa 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit 7c4dabda0e38d849db0f8997def6b841bbd02bc2 +Subproject commit b79c32faa82a6fef5ad49eb4e2ff3260dae99e94 diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh index 340c2334..d58ed875 100644 --- a/Scripts/Common/Deblob.sh +++ b/Scripts/Common/Deblob.sh @@ -1,6 +1,6 @@ #!/bin/bash #DivestOS: A privacy oriented Android distribution -#Copyright (c) 2017-2018 Divested Computing Group +#Copyright (c) 2017-2019 Divested Computing Group # #This program is free software: you can redistribute it and/or modify #it under the terms of the GNU General Public License as published by diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index 0e783088..08543ef6 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -1,6 +1,6 @@ #!/bin/bash #DivestOS: A privacy oriented Android distribution -#Copyright (c) 2017-2018 Divested Computing Group +#Copyright (c) 2017-2019 Divested Computing Group # #This program is free software: you can redistribute it and/or modify #it under the terms of the GNU General Public License as published by diff --git a/Scripts/Common/Optimize.sh b/Scripts/Common/Optimize.sh index 5bd8d569..c84daad1 100644 --- a/Scripts/Common/Optimize.sh +++ b/Scripts/Common/Optimize.sh @@ -1,6 +1,6 @@ #!/bin/bash #DivestOS: A privacy oriented Android distribution -#Copyright (c) 2017-2018 Divested Computing Group +#Copyright (c) 2017-2019 Divested Computing Group # #This program is free software: you can redistribute it and/or modify #it under the terms of the GNU General Public License as published by diff --git a/Scripts/LineageOS-11.0/Functions.sh b/Scripts/LineageOS-11.0/Functions.sh index 36c8d3d5..52ccf2a2 100644 --- a/Scripts/LineageOS-11.0/Functions.sh +++ b/Scripts/LineageOS-11.0/Functions.sh @@ -1,6 +1,6 @@ #!/bin/bash #DivestOS: A privacy oriented Android distribution -#Copyright (c) 2017-2018 Divested Computing Group +#Copyright (c) 2017-2019 Divested Computing Group # #This program is free software: you can redistribute it and/or modify #it under the terms of the GNU General Public License as published by diff --git a/Scripts/LineageOS-11.0/Patch.sh b/Scripts/LineageOS-11.0/Patch.sh index f1d9cd79..24dfe852 100644 --- a/Scripts/LineageOS-11.0/Patch.sh +++ b/Scripts/LineageOS-11.0/Patch.sh @@ -1,6 +1,6 @@ #!/bin/bash #DivestOS: A privacy oriented Android distribution -#Copyright (c) 2015-2018 Divested Computing Group +#Copyright (c) 2015-2019 Divested Computing Group # #This program is free software: you can redistribute it and/or modify #it under the terms of the GNU General Public License as published by diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 49a2f62b..2ff942cd 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -1,6 +1,6 @@ #!/bin/bash #DivestOS: A privacy oriented Android distribution -#Copyright (c) 2017-2018 Divested Computing Group +#Copyright (c) 2017-2019 Divested Computing Group # #This program is free software: you can redistribute it and/or modify #it under the terms of the GNU General Public License as published by @@ -126,6 +126,8 @@ patchWorkspace() { repopick 248599; #restrict SET_TIME_ZONE permission repopick 248600 248649; #/proc hardening repopick -it nougat-mr2-security-release-residue; + repopick -it n-tzdata-2019c; + repopick -it n-asb-2019-10; export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index db010af3..3fa375fc 100644 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -1,6 +1,6 @@ #!/bin/bash #DivestOS: A privacy oriented Android distribution -#Copyright (c) 2015-2018 Divested Computing Group +#Copyright (c) 2015-2019 Divested Computing Group # #This program is free software: you can redistribute it and/or modify #it under the terms of the GNU General Public License as published by diff --git a/Scripts/LineageOS-15.1/Defaults.sh b/Scripts/LineageOS-15.1/Defaults.sh index def1f6d4..0048142d 100644 --- a/Scripts/LineageOS-15.1/Defaults.sh +++ b/Scripts/LineageOS-15.1/Defaults.sh @@ -1,6 +1,6 @@ #!/bin/bash #DivestOS: A privacy oriented Android distribution -#Copyright (c) 2017-2018 Divested Computing Group +#Copyright (c) 2017-2019 Divested Computing Group # #This program is free software: you can redistribute it and/or modify #it under the terms of the GNU General Public License as published by diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 0848e447..4c80b0b3 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -1,6 +1,6 @@ #!/bin/bash #DivestOS: A privacy oriented Android distribution -#Copyright (c) 2017-2018 Divested Computing Group +#Copyright (c) 2017-2019 Divested Computing Group # #This program is free software: you can redistribute it and/or modify #it under the terms of the GNU General Public License as published by @@ -100,7 +100,9 @@ export -f buildAll; patchWorkspace() { if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; - #source build/envsetup.sh; + source build/envsetup.sh; + repopick -it tzdata-2019c-o; + repopick -it O_asb_2019-10; export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 02a0cfb2..e58af3c5 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -1,6 +1,6 @@ #!/bin/bash #DivestOS: A privacy oriented Android distribution -#Copyright (c) 2015-2018 Divested Computing Group +#Copyright (c) 2015-2019 Divested Computing Group # #This program is free software: you can redistribute it and/or modify #it under the terms of the GNU General Public License as published by diff --git a/Scripts/LineageOS-15.1/Rebrand.sh b/Scripts/LineageOS-15.1/Rebrand.sh index b51be511..945eef54 100644 --- a/Scripts/LineageOS-15.1/Rebrand.sh +++ b/Scripts/LineageOS-15.1/Rebrand.sh @@ -1,6 +1,6 @@ #!/bin/bash #DivestOS: A privacy oriented Android distribution -#Copyright (c) 2017-2018 Divested Computing Group +#Copyright (c) 2017-2019 Divested Computing Group # #This program is free software: you can redistribute it and/or modify #it under the terms of the GNU General Public License as published by diff --git a/Scripts/LineageOS-16.0/Defaults.sh b/Scripts/LineageOS-16.0/Defaults.sh index 5cbe9c98..a7ad1869 100644 --- a/Scripts/LineageOS-16.0/Defaults.sh +++ b/Scripts/LineageOS-16.0/Defaults.sh @@ -1,6 +1,6 @@ #!/bin/bash #DivestOS: A privacy oriented Android distribution -#Copyright (c) 2017-2018 Divested Computing Group +#Copyright (c) 2017-2019 Divested Computing Group # #This program is free software: you can redistribute it and/or modify #it under the terms of the GNU General Public License as published by diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index 18b3917b..df2233da 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -1,6 +1,6 @@ #!/bin/bash #DivestOS: A privacy oriented Android distribution -#Copyright (c) 2017-2018 Divested Computing Group +#Copyright (c) 2017-2019 Divested Computing Group # #This program is free software: you can redistribute it and/or modify #it under the terms of the GNU General Public License as published by @@ -110,6 +110,8 @@ patchWorkspace() { source build/envsetup.sh; repopick -f 254249; #g3 nfc + repopick -it tzdata-2019c-p; + repopick -it P_asb_2019-10; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Defaults.sh"; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index b45fe6df..e4246e50 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -1,6 +1,6 @@ #!/bin/bash #DivestOS: A privacy oriented Android distribution -#Copyright (c) 2015-2018 Divested Computing Group +#Copyright (c) 2015-2019 Divested Computing Group # #This program is free software: you can redistribute it and/or modify #it under the terms of the GNU General Public License as published by @@ -238,6 +238,9 @@ enterAndClear "device/moto/shamu"; #rm setup-makefiles.sh; #broken, deblobber will still function #XXX: remove atfwd and cne from vendor makefiles +enterAndClear "device/oppo/common"; +awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #disable releasetools to fix delta ota generation + enterAndClear "device/oppo/msm8974-common"; sed -i "s/TZ.BF.2.0-2.0.0134/TZ.BF.2.0-2.0.0134|TZ.BF.2.0-2.0.0137/" board-info.txt; #Suport new TZ firmware https://review.lineageos.org/#/c/178999/ diff --git a/Scripts/LineageOS-16.0/Rebrand.sh b/Scripts/LineageOS-16.0/Rebrand.sh index d77f79ff..a74d30e2 100644 --- a/Scripts/LineageOS-16.0/Rebrand.sh +++ b/Scripts/LineageOS-16.0/Rebrand.sh @@ -1,6 +1,6 @@ #!/bin/bash #DivestOS: A privacy oriented Android distribution -#Copyright (c) 2017-2018 Divested Computing Group +#Copyright (c) 2017-2019 Divested Computing Group # #This program is free software: you can redistribute it and/or modify #it under the terms of the GNU General Public License as published by diff --git a/Scripts/init.sh b/Scripts/init.sh index 1ccc4845..9d884659 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -1,6 +1,6 @@ #!/bin/bash #DivestOS: A privacy oriented Android distribution -#Copyright (c) 2017-2018 Divested Computing Group +#Copyright (c) 2017-2019 Divested Computing Group # #This program is free software: you can redistribute it and/or modify #it under the terms of the GNU General Public License as published by diff --git a/TODO b/TODO index 9b1b60ac..9b3a4457 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,4 @@ -Last updated: 2019-09-14 +Last updated: 2019-10-07 High Priority (Release blockers) Project @@ -18,6 +18,7 @@ High Priority (Release blockers) Medium Priority Build + - Add GrapheneOS as a better base for supported devices - Add support for more devices Design - Facelift of Extirpater