Tweaks and Fixes

2024-12-24 15:09:34 -05:00 · 2017-12-15 16:42:36 -05:00 · 2017-12-15 16:42:36 -05:00 · fcc8ffc5bd
commit fcc8ffc5bd
parent f65bbb8ee0
6 changed files with 23 additions and 27 deletions
--- a/Manifests/Manifest_LAOS-14.1.xml
+++ b/Manifests/Manifest_LAOS-14.1.xml
@ -78,9 +78,8 @@
 	<project path="packages/apps/FakeStore" name="microg/android_packages_apps_FakeStore" remote="github" revision="master" />

 	<!-- UnifiedNLP Backends -->
+	<project path="packages/apps/DejaVu" name="n76/DejaVu" remote="github" revision="master" />
 	<project path="packages/apps/IchnaeaNlpBackend" name="microg/IchnaeaNlpBackend" remote="github" revision="master" />
-	<project path="packages/apps/LocalGsmNlpBackend" name="n76/Local-GSM-Backend" remote="github" revision="master" />
-	<project path="packages/apps/LocalWifiNlpBackend" name="n76/wifi_backend" remote="github" revision="master" />
 	<project path="packages/apps/NominatimGeocoderBackend" name="microg/NominatimGeocoderBackend" remote="github" revision="master" />

 	<!-- F-Droid -->
--- a/Misc/be3
+++ b/Misc/be3
@ -0,0 +1,13 @@
+../../../../../../kernel/google/msm/arch/arm/mm/rodata.c: In function 'set_page_attributes':
+../../../../../../kernel/google/msm/arch/arm/mm/rodata.c:91:4: warning: format '%lx' expects argument of type 'long unsigned int', but argument 4 has type 'pmd_t' [-Wformat=]
+error, forbidden warning: rodata.c:91
+  CC      arch/arm/kernel/smp.o
+make[2]: *** [/mnt/Drive-1/Development/Other/Android_ROMs/Build/LineageOS-14.1/kernel/google/msm/scripts/Makefile.build:307: arch/arm/mm/rodata.o] Error 1
+
+marlin
+../../../../../../kernel/google/marlin/mm/mmap.c:95:29: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__ro_after_init'
+ pgprot_t protection_map[16] __ro_after_init = {
+                             ^
+make[2]: *** [/mnt/Drive-1/Development/Other/Android_ROMs/Build/LineageOS-14.1/kernel/google/marlin/scripts/Makefile.build:257: mm/mmap.o] Error 1
+make[1]: *** [/mnt/Drive-1/Development/Other/Android_ROMs/Build/LineageOS-14.1/kernel/google/marlin/Makefile:951: mm] Error 2
+
--- a/Patches/LineageOS-14.1/android_packages_apps_FDroid/default_repos.xml
+++ b/Patches/LineageOS-14.1/android_packages_apps_FDroid/default_repos.xml
@ -99,7 +99,7 @@
        <!-- version -->
        <item>18</item>
        <!-- enabled -->
-        <item>0</item>
+        <item>1</item>
        <!-- priority -->
        <item>5</item>
        <!-- push requests -->
@ -189,26 +189,6 @@
 	308202d5308201bda0030201020204018cf0a4300d06092a864886f70d01010b0500301b31193017060355040a1310627269617270726f6a6563742e6f7267301e170d3137303732353134303630325a170d3232303732343134303630325a301b31193017060355040a1310627269617270726f6a6563742e6f726730820122300d06092a864886f70d01010105000382010f003082010a0282010100912fbe5333e85dc38a1ac8eca5d10e7e084459b3ef3ea84e72ad67758b63add64345ab2a26fef0a5be41c68461a69d1ae9f8652a98c181765f551776d3bfbcd2cfd6bb1222140566afd1cae791714ef56d6d137191d971404bdf9d93935adb0222de2df8718a6c5584dde5607da1249509fb5ed3cf2d14a0ff2962e942d1985ad3d1cd479c149caf71c98b54647d2953fbf60019df588c649598616e12c7ef7cd58cbea2ec42e067923b79be33ae4079736e521f9b4df5c1f670fbd2b55f1e4c86fb46f47a98e11f49007c8c0a390f36d8d363edf305d81be5b04d082f8c0b3a756cbc19a0ae51e3f241560457827638d8af97ac66fcb1e274d3575af17932bd0203010001a321301f301d0603551d0e04160414d16614bba270ddbbe7dfd75da361bd4e24dc3413300d06092a864886f70d01010b05000382010100573c98ccf56d9ec6644705995db1d03806c087d4be4b25061d1ce144a72e2c14c86845e6847cede6bd0c469ce610153c0c144412c8ab0171342e40acd8562c8de8032e4eb9fc6803cad0e2fd6b4da3cf0ce4148376b0b7d57bb74f1b7c55954eb184a1392fae2231aabf9705a9eace7795c99b1cd7b2e796ffc58b422e1e80b9cdec20ce352e10974c64270856e1aecf9febb8199239625692bbebc0236ecaf03f57ed70cc13057a33cbf2bd7ffa46704f530b0acbc8a0a2a05cc322704e340123aa4277e11946b35ae8c9174b9fac97e0c1207c6194856016202c94f1678a6f9911073bd46e513692274592a989d16181e02b423e89050b2704c7575b5d31f1
        </item>

-        <!-- name -->
-        <item>Retroarch</item>
-        <!-- address -->
-        <item>https://fdroid.libretro.com</item>
-        <!-- description -->
-        <item>This repository has bleeding edge builds of RetroArch
-        </item>
-        <!-- version -->
-        <item>15</item>
-        <!-- enabled -->
-        <item>0</item>
-        <!-- priority -->
-        <item>10</item>
-        <!-- push requests -->
-        <item>ignore</item>
-        <!-- pubkey -->
-        <item>
-            308204eb308202d3a0030201020204614ea0c8300d06092a864886f70d01010b050030263110300e060355040b1307462d44726f6964311230100603550403130977686f2d6361726573301e170d3135313032323230303133365a170d3433303330393230303133365a30263110300e060355040b1307462d44726f6964311230100603550403130977686f2d636172657330820222300d06092a864886f70d01010105000382020f003082020a02820201008ed37a3d5c4a384319203213fb2586de4f57b649922350f3cebeefed3247b9d8d4bff5c287db14bf13e7592d7cf84fbb1c07b7640bfb4a57b9d1851b8f723a8d0e0404dc156c0e97fddd18e84b2943413b084eaf062abf136c966723bd320e9fcb0abab156e7be8bc8da6f01c41db726b9f19a18c80cbaaed7f940bb9660f184854cadf1bf77585a2713f4f7a7419456b0c14b3c81259748970a09427015436370ff6f449728cc44defd9bbd707cebc5e4c195b7f04e9931fc25bac557762e33e8ef1d18e213e8ec83498038f7f6a215a82eb18bafdbdbb553fb184d6f44622376c7678cb70b9721e9f291264b5dbc76388e321cf436da538af530416c6c1ec9e77c0ceb2576ea31c609b6dbf70ae2e95829cf3b0139c80bd1a18ca8559830a243e933b948f6a51abaff0b6c602bb60fb39de3e94163efb4cd018b153e470c5486af72057354a17c8eeb3b6de981475b8f30258f9e64735e65d159a1a2673e2b6f0e76d6c2c102e41f00d53b54ca0ced16053e6305a64d5d77150095d1be6e38f29307aa1d008bb82330ef81bd928c5d2e75c37894b9f0408fe3fde22617f2612d50934c33638985518fe2dfe6b944846d41a5fcbd2d86d97e68c5bbb06653d0a6ddb751eff2cfcadf28e3272a615df14e2524a3b19edfee38eea04bca84ed6cbe23c5fb14b2e1f2f5b23ddc3016eceacf34689587c233580646163998f7eae50203010001a321301f301d0603551d0e04160414c5bb5ca27c47fe9b3439aae38cd06083f089f37f300d06092a864886f70d01010b0500038202010064a57cf460043d86df4ea0647fa41c2ac5a17796ca193c1afd72e2ac32df9986147f150c8da78c3fd0349b3afa86c44cc31793315f0ce74392264e35d0475a4718127aa6f6a2e9acd126731821ebea72cb0daf02a3518fb1aec16741604353acf667b74f291f3be926c7839419b868266f776d761adf232535a7f00c2372df190b8ebad1ab36d646c0790d002e48bc3f237b6ad6c973dc4fbb107559e1a683c664f129fae9681adef9ebcf0c3b7dbe16962a1824cc2a9e9c91e8b1a6e5fdfc5d03ddbdf94dfff5cc285bf50750b0a43569e8f9796ee0a755cded3bf6f08e92dcbd319aee9e96d4742750f4f8482427f7c55e4f690ce8508be6965960105109cf9b9c22084a4c24aff89766469a45908e81c87bd88a955c4894f9c3741e9039ef6fd96bbf26582d3a2dd1abc2b45f85d521df8f89dfae0a801642e18a61e3c280928002c7e95e1edd2d3318911a44c0d29af81be57f98e45c7abf36bb37968546e12fc3e07ff69f1acb1468f895490ff14f215587012429a081c96b241296f4d68950876935ce4214b64d0e59a997eafdbce7fa525ba57cd6d171e217db6173c8957451c05bfffa00e6fda5a67da239495dfdc5e4fce0a2a150010cf51722d1db211ca723b777c88dbcb40246d60654be89019d90dfadd127742a60a72c97b1ab68263d6ea3c2b4aa78bedb69cef39b41f15d46617843918568f82e2cfbd6d634
-        </item>
-
    </string-array>

 </resources>
--- a/Patches/LineageOS-14.1/android_vendor_cm/sce.mk
+++ b/Patches/LineageOS-14.1/android_vendor_cm/sce.mk
@ -2,7 +2,11 @@
 PRODUCT_PACKAGES += \
    GmsCore \
    GsfProxy \
-    FakeStore \
+    FakeStore
+
+# UnifiedNLP Backends
+PRODUCT_PACKAGES += \
+    DejaVu \
    IchnaeaNlpBackend \
    NominatimNlpBackend

--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh
@ -18,8 +18,8 @@ git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0033.patch
 git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0034.patch
 git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0035.patch
 git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0036.patch
-#git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0037.patch
-git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0038.patch
+git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0037.patch
+#git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0038.patch
 #git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0039.patch
 git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0040.patch
 git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0041.patch
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@ -16,7 +16,7 @@
 #along with this program.  If not, see <https://www.gnu.org/licenses/>.

 #Delete Everything and Sync
-#repo forall -c 'git add -A && git reset --hard' && rm -rf packages/apps/{FDroid,GmsCore,Silence} out && repo sync -j20 --force-sync && repopick -t n_asb_12-2017
+#repo forall -c 'git add -A && git reset --hard' && rm -rf packages/apps/{FDroid,GmsCore,Silence} out && repo sync -j20 --force-sync

 #Apply all of our changes
 #source ../../Scripts/LineageOS-14.1/00init.sh && source $scripts/Patch.sh && source $scripts/Defaults.sh && source $scripts/Optimize.sh && source $scripts/Rebrand.sh && source $scripts/Theme.sh && source $scripts/Deblob.sh && source $scripts/Patch_CVE.sh && source build/envsetup.sh