Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2025-08-23 13:15:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

Reconcile picks + Fixup

Browse source 
Fixes https://github.com/Divested-Mobile/DivestOS-Build/issues/313

Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi 2024-06-22 20:45:00 -04:00
parent d09584417e
commit 3e2b2e0c4f
No known key found for this signature in database
GPG key ID: E599F62ECBAEAF2E
5 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Scripts/LineageOS-20.0/Functions.sh
View file

@ -162,8 +162,7 @@ patchWorkspaceReal() {
verifyAllPlatformTags;
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
source build/envsetup.sh;
repopick -it T_asb_2024-06 -e 394238,394253;
#source build/envsetup.sh;
sh "$DOS_SCRIPTS/Patch.sh";
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";

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

@ -395,10 +395,6 @@ if enterAndClear "system/extras"; then
applyPatch "$DOS_PATCHES/android_system_extras/0001-ext4_pad_filenames.patch"; #FBE: pad filenames more (GrapheneOS)
fi;
if enterAndClear "system/libfmq"; then
git fetch https://github.com/LineageOS/android_system_libfmq refs/changes/53/394253/1 && git cherry-pick FETCH_HEAD; #T_asb_2024-06
fi;
if enterAndClear "system/sepolicy"; then
applyPatch "$DOS_PATCHES/android_system_sepolicy/0002-protected_files.patch"; #Label protected_{fifos,regular} as proc_security (GrapheneOS)
applyPatch "$DOS_PATCHES/android_system_sepolicy/0003-ptrace_scope-1.patch"; #Allow init to control kernel.yama.ptrace_scope (GrapheneOS)