More Pixel 6/7 work

compiles, but fails to generate release due to pvmfw failure

Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2022-12-15 18:00:23 -05:00
parent 3dba5193ae
commit ad5de60266
No known key found for this signature in database
GPG Key ID: B286E9F57A07424B
10 changed files with 319 additions and 25 deletions

View File

@ -103,23 +103,23 @@
<project path="device/google/barbet" name="LineageOS/android_device_google_barbet" remote="github" revision="lineage-20" /> <project path="device/google/barbet" name="LineageOS/android_device_google_barbet" remote="github" revision="lineage-20" />
<!-- uses redbull commons --> <!-- uses redbull commons -->
<!-- Google Pixel 6 (oriole/raven) <!-- Google Pixel 6 (oriole/raven) -->
<project path="device/google/oriole" name="LineageOS/android_device_google_oriole" remote="github" revision="lineage-20" /> <project path="device/google/oriole" name="LineageOS/android_device_google_oriole" remote="github" revision="lineage-20" />
<project path="device/google/raven" name="LineageOS/android_device_google_raven" remote="github" revision="lineage-20" /> <project path="device/google/raven" name="LineageOS/android_device_google_raven" remote="github" revision="lineage-20" />
<project path="device/google/raviole" name="LineageOS/android_device_google_raviole" remote="github" revision="lineage-20" /> <project path="device/google/raviole" name="LineageOS/android_device_google_raviole" remote="github" revision="lineage-20" />
<project path="device/google/gs101" name="LineageOS/android_device_google_gs101" remote="github" revision="lineage-20" /> <project path="device/google/gs101" name="LineageOS/android_device_google_gs101" remote="github" revision="lineage-20" />
<project path="kernel/google/gs101/private/gs-google" name="LineageOS/android_kernel_google_gs101" remote="github" revision="lineage-20" /> --> <project path="kernel/google/gs101/private/gs-google" name="LineageOS/android_kernel_google_gs101" remote="github" revision="lineage-20" />
<!-- Google Pixel 6a (bluejay) <!-- Google Pixel 6a (bluejay) -->
<project path="device/google/bluejay" name="LineageOS/android_device_google_bluejay" remote="github" revision="lineage-20" /> --> <project path="device/google/bluejay" name="LineageOS/android_device_google_bluejay" remote="github" revision="lineage-20" />
<!-- uses gs101 commons --> <!-- uses gs101 commons -->
<!-- Google Pixel 7 (panther/cheetah) <!-- Google Pixel 7 (panther/cheetah) -->
<project path="device/google/panther" name="LineageOS/android_device_google_panther" remote="github" revision="lineage-20" /> <project path="device/google/panther" name="LineageOS/android_device_google_panther" remote="github" revision="lineage-20" />
<project path="device/google/cheetah" name="LineageOS/android_device_google_cheetah" remote="github" revision="lineage-20" /> <project path="device/google/cheetah" name="LineageOS/android_device_google_cheetah" remote="github" revision="lineage-20" />
<project path="device/google/pantah" name="LineageOS/android_device_google_pantah" remote="github" revision="lineage-20" /> <project path="device/google/pantah" name="LineageOS/android_device_google_pantah" remote="github" revision="lineage-20" />
<project path="device/google/gs201" name="LineageOS/android_device_google_gs201" remote="github" revision="lineage-20" /> <project path="device/google/gs201" name="LineageOS/android_device_google_gs201" remote="github" revision="lineage-20" />
<project path="kernel/google/gs201/private/gs-google" name="LineageOS/android_kernel_google_gs201" remote="github" revision="lineage-20" /> --> <project path="kernel/google/gs201/private/gs-google" name="LineageOS/android_kernel_google_gs201" remote="github" revision="lineage-20" />
<!-- uses gs101 commons --> <!-- uses gs101 commons -->
<!-- OnePlus 5 (cheeseburger) --> <!-- OnePlus 5 (cheeseburger) -->

@ -1 +1 @@
Subproject commit 1f01b2aaa3910e757fef0257a4c13e2ce3c03f1c Subproject commit 78b682822ac70d44440edc73b72e2ea7939605f6

View File

@ -30,7 +30,7 @@ cat "$DOS_SIGNING_KEYS/avicii/verity.x509.pem" >> "kernel/oneplus/sm7250/certs/v
cat "$DOS_SIGNING_KEYS/barbet/verity.x509.pem" >> "kernel/google/redbull/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/barbet/verity.x509.pem" >> "kernel/google/redbull/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/beryllium/verity.x509.pem" >> "kernel/xiaomi/sdm845/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/beryllium/verity.x509.pem" >> "kernel/xiaomi/sdm845/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/bluejay/verity.x509.pem" >> "kernel/google/bluejay/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/bluejay/verity.x509.pem" >> "kernel/google/bluejay/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/bluejay/verity.x509.pem" >> "kernel/google/gs101/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/bluejay/verity.x509.pem" >> "kernel/google/gs101/private/gs-google/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/blueline/verity.x509.pem" >> "kernel/google/crosshatch/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/blueline/verity.x509.pem" >> "kernel/google/crosshatch/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/blueline/verity.x509.pem" >> "kernel/google/msm-4.9/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/blueline/verity.x509.pem" >> "kernel/google/msm-4.9/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/bonito/verity.x509.pem" >> "kernel/google/bonito/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/bonito/verity.x509.pem" >> "kernel/google/bonito/certs/verity.x509.pem";
@ -38,7 +38,7 @@ cat "$DOS_SIGNING_KEYS/bonito/verity.x509.pem" >> "kernel/google/msm-4.9/certs/v
cat "$DOS_SIGNING_KEYS/bramble/verity.x509.pem" >> "kernel/google/redbull/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/bramble/verity.x509.pem" >> "kernel/google/redbull/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/bullhead/verity.x509.pem" >> "kernel/lge/bullhead/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/bullhead/verity.x509.pem" >> "kernel/lge/bullhead/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/cheeseburger/verity.x509.pem" >> "kernel/oneplus/msm8998/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/cheeseburger/verity.x509.pem" >> "kernel/oneplus/msm8998/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/cheetah/verity.x509.pem" >> "kernel/google/gs201/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/cheetah/verity.x509.pem" >> "kernel/google/gs201/private/gs-google/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/cheryl/verity.x509.pem" >> "kernel/razer/msm8998/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/cheryl/verity.x509.pem" >> "kernel/razer/msm8998/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/coral/verity.x509.pem" >> "kernel/google/coral/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/coral/verity.x509.pem" >> "kernel/google/coral/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/crosshatch/verity.x509.pem" >> "kernel/google/crosshatch/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/crosshatch/verity.x509.pem" >> "kernel/google/crosshatch/certs/verity.x509.pem";
@ -68,13 +68,13 @@ cat "$DOS_SIGNING_KEYS/lmi/verity.x509.pem" >> "kernel/xiaomi/sm8250/certs/verit
cat "$DOS_SIGNING_KEYS/marlin/verity.x509.pem" >> "kernel/google/marlin/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/marlin/verity.x509.pem" >> "kernel/google/marlin/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/mata/verity.x509.pem" >> "kernel/essential/msm8998/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/mata/verity.x509.pem" >> "kernel/essential/msm8998/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/oneplus3/verity.x509.pem" >> "kernel/oneplus3/msm8996/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/oneplus3/verity.x509.pem" >> "kernel/oneplus3/msm8996/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/oriole/verity.x509.pem" >> "kernel/google/gs101/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/oriole/verity.x509.pem" >> "kernel/google/gs101/private/gs-google/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/oriole/verity.x509.pem" >> "kernel/google/raviole/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/oriole/verity.x509.pem" >> "kernel/google/raviole/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/panther/verity.x509.pem" >> "kernel/google/gs201/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/panther/verity.x509.pem" >> "kernel/google/gs201/private/gs-google/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/pioneer/verity.x509.pem" >> "kernel/sony/sdm660/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/pioneer/verity.x509.pem" >> "kernel/sony/sdm660/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/pro1/verity.x509.pem" >> "kernel/fxtec/msm8998/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/pro1/verity.x509.pem" >> "kernel/fxtec/msm8998/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/raphael/verity.x509.pem" >> "kernel/xiaomi/sm8150/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/raphael/verity.x509.pem" >> "kernel/xiaomi/sm8150/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/raven/verity.x509.pem" >> "kernel/google/gs101/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/raven/verity.x509.pem" >> "kernel/google/gs101/private/gs-google/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/raven/verity.x509.pem" >> "kernel/google/raviole/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/raven/verity.x509.pem" >> "kernel/google/raviole/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/redfin/verity.x509.pem" >> "kernel/google/redbull/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/redfin/verity.x509.pem" >> "kernel/google/redbull/certs/verity.x509.pem";
cat "$DOS_SIGNING_KEYS/sailfish/verity.x509.pem" >> "kernel/google/marlin/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/sailfish/verity.x509.pem" >> "kernel/google/marlin/certs/verity.x509.pem";
@ -102,7 +102,7 @@ cp -v "$DOS_SIGNING_KEYS/avicii/verifiedboot_relkeys.der.x509" "kernel/oneplus/s
cp -v "$DOS_SIGNING_KEYS/barbet/verifiedboot_relkeys.der.x509" "kernel/google/redbull/verifiedboot_barbet_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/barbet/verifiedboot_relkeys.der.x509" "kernel/google/redbull/verifiedboot_barbet_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/beryllium/verifiedboot_relkeys.der.x509" "kernel/xiaomi/sdm845/verifiedboot_beryllium_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/beryllium/verifiedboot_relkeys.der.x509" "kernel/xiaomi/sdm845/verifiedboot_beryllium_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/bluejay/verifiedboot_relkeys.der.x509" "kernel/google/bluejay/verifiedboot_bluejay_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/bluejay/verifiedboot_relkeys.der.x509" "kernel/google/bluejay/verifiedboot_bluejay_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/bluejay/verifiedboot_relkeys.der.x509" "kernel/google/gs101/verifiedboot_bluejay_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/bluejay/verifiedboot_relkeys.der.x509" "kernel/google/gs101/private/gs-google/verifiedboot_bluejay_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/blueline/verifiedboot_relkeys.der.x509" "kernel/google/crosshatch/verifiedboot_blueline_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/blueline/verifiedboot_relkeys.der.x509" "kernel/google/crosshatch/verifiedboot_blueline_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/blueline/verifiedboot_relkeys.der.x509" "kernel/google/msm-4.9/verifiedboot_blueline_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/blueline/verifiedboot_relkeys.der.x509" "kernel/google/msm-4.9/verifiedboot_blueline_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/bonito/verifiedboot_relkeys.der.x509" "kernel/google/bonito/verifiedboot_bonito_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/bonito/verifiedboot_relkeys.der.x509" "kernel/google/bonito/verifiedboot_bonito_dos_relkeys.der.x509";
@ -110,7 +110,7 @@ cp -v "$DOS_SIGNING_KEYS/bonito/verifiedboot_relkeys.der.x509" "kernel/google/ms
cp -v "$DOS_SIGNING_KEYS/bramble/verifiedboot_relkeys.der.x509" "kernel/google/redbull/verifiedboot_bramble_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/bramble/verifiedboot_relkeys.der.x509" "kernel/google/redbull/verifiedboot_bramble_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/bullhead/verifiedboot_relkeys.der.x509" "kernel/lge/bullhead/verifiedboot_bullhead_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/bullhead/verifiedboot_relkeys.der.x509" "kernel/lge/bullhead/verifiedboot_bullhead_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/cheeseburger/verifiedboot_relkeys.der.x509" "kernel/oneplus/msm8998/verifiedboot_cheeseburger_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/cheeseburger/verifiedboot_relkeys.der.x509" "kernel/oneplus/msm8998/verifiedboot_cheeseburger_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/cheetah/verifiedboot_relkeys.der.x509" "kernel/google/gs201/verifiedboot_cheetah_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/cheetah/verifiedboot_relkeys.der.x509" "kernel/google/gs201/private/gs-google/verifiedboot_cheetah_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/cheryl/verifiedboot_relkeys.der.x509" "kernel/razer/msm8998/verifiedboot_cheryl_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/cheryl/verifiedboot_relkeys.der.x509" "kernel/razer/msm8998/verifiedboot_cheryl_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/coral/verifiedboot_relkeys.der.x509" "kernel/google/coral/verifiedboot_coral_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/coral/verifiedboot_relkeys.der.x509" "kernel/google/coral/verifiedboot_coral_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/crosshatch/verifiedboot_relkeys.der.x509" "kernel/google/crosshatch/verifiedboot_crosshatch_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/crosshatch/verifiedboot_relkeys.der.x509" "kernel/google/crosshatch/verifiedboot_crosshatch_dos_relkeys.der.x509";
@ -140,13 +140,13 @@ cp -v "$DOS_SIGNING_KEYS/lmi/verifiedboot_relkeys.der.x509" "kernel/xiaomi/sm825
cp -v "$DOS_SIGNING_KEYS/marlin/verifiedboot_relkeys.der.x509" "kernel/google/marlin/verifiedboot_marlin_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/marlin/verifiedboot_relkeys.der.x509" "kernel/google/marlin/verifiedboot_marlin_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/mata/verifiedboot_relkeys.der.x509" "kernel/essential/msm8998/verifiedboot_mata_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/mata/verifiedboot_relkeys.der.x509" "kernel/essential/msm8998/verifiedboot_mata_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/oneplus3/verifiedboot_relkeys.der.x509" "kernel/oneplus/msm8996/verifiedboot_oneplus3_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/oneplus3/verifiedboot_relkeys.der.x509" "kernel/oneplus/msm8996/verifiedboot_oneplus3_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/oriole/verifiedboot_relkeys.der.x509" "kernel/google/gs101/verifiedboot_oriole_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/oriole/verifiedboot_relkeys.der.x509" "kernel/google/gs101/private/gs-google/verifiedboot_oriole_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/oriole/verifiedboot_relkeys.der.x509" "kernel/google/raviole/verifiedboot_oriole_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/oriole/verifiedboot_relkeys.der.x509" "kernel/google/raviole/verifiedboot_oriole_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/panther/verifiedboot_relkeys.der.x509" "kernel/google/gs201/verifiedboot_panther_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/panther/verifiedboot_relkeys.der.x509" "kernel/google/gs201/private/gs-google/verifiedboot_panther_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/pioneer/verifiedboot_relkeys.der.x509" "kernel/sony/sdm660/verifiedboot_pioneer_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/pioneer/verifiedboot_relkeys.der.x509" "kernel/sony/sdm660/verifiedboot_pioneer_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/pro1/verifiedboot_relkeys.der.x509" "kernel/fxtec/msm8998/verifiedboot_pro1_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/pro1/verifiedboot_relkeys.der.x509" "kernel/fxtec/msm8998/verifiedboot_pro1_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/raphael/verifiedboot_relkeys.der.x509" "kernel/xiaomi/sm8150/verifiedboot_raphael_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/raphael/verifiedboot_relkeys.der.x509" "kernel/xiaomi/sm8150/verifiedboot_raphael_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/raven/verifiedboot_relkeys.der.x509" "kernel/google/gs101/verifiedboot_raven_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/raven/verifiedboot_relkeys.der.x509" "kernel/google/gs101/private/gs-google/verifiedboot_raven_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/raven/verifiedboot_relkeys.der.x509" "kernel/google/raviole/verifiedboot_raven_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/raven/verifiedboot_relkeys.der.x509" "kernel/google/raviole/verifiedboot_raven_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/redfin/verifiedboot_relkeys.der.x509" "kernel/google/redbull/verifiedboot_redfin_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/redfin/verifiedboot_relkeys.der.x509" "kernel/google/redbull/verifiedboot_redfin_dos_relkeys.der.x509";
cp -v "$DOS_SIGNING_KEYS/sailfish/verifiedboot_relkeys.der.x509" "kernel/google/marlin/verifiedboot_sailfish_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/sailfish/verifiedboot_relkeys.der.x509" "kernel/google/marlin/verifiedboot_sailfish_dos_relkeys.der.x509";

View File

@ -191,7 +191,7 @@ echo "Deblobbing...";
blobs=$blobs"|smc_pa.ift|drmserver.samsung"; #Samsung blobs=$blobs"|smc_pa.ift|drmserver.samsung"; #Samsung
blobs=$blobs"|provision_device"; blobs=$blobs"|provision_device";
#blobs=$blobs"|libasfparser.so|libsavsff.so"; #Parsers #blobs=$blobs"|libasfparser.so|libsavsff.so"; #Parsers
makes=$makes"|android.hardware.drm.*"; makes=$makes"|android.hardware.drm.*|liboemcrypto";
manifests=$manifests"|android.hardware.drm"; manifests=$manifests"|android.hardware.drm";
#makes=$makes"|libdrmframework.*"; #necessary to compile #makes=$makes"|libdrmframework.*"; #necessary to compile
#makes=$makes"|mediadrmserver|com.android.mediadrm.signer.*|drmserver"; #Works but causes long boot times #makes=$makes"|mediadrmserver|com.android.mediadrm.signer.*|drmserver"; #Works but causes long boot times
@ -278,7 +278,7 @@ echo "Deblobbing...";
#EUICC (Virtual SIM) [Google] #EUICC (Virtual SIM) [Google]
if [ "$DOS_DEBLOBBER_REMOVE_IMS" = true ] || [ "$DOS_DEBLOBBER_REMOVE_EUICC" = true ]; then if [ "$DOS_DEBLOBBER_REMOVE_IMS" = true ] || [ "$DOS_DEBLOBBER_REMOVE_EUICC" = true ]; then
blobs=$blobs"|EuiccGoogle.apk|EuiccSupportPixel.apk|EuiccSupportPixelPermissions.apk"; #EUICC is useless without GMS blobs=$blobs"|EuiccGoogle.apk|EuiccSupportPixel.apk|EuiccSupportPixelPermissions.apk|EuiccGoogleOverlay.apk"; #EUICC is useless without GMS
blobs=$blobs"|esim0.img|esim-v1.img|esim-full-v0.img|esim-a1.img|esim-a2.img"; blobs=$blobs"|esim0.img|esim-v1.img|esim-full-v0.img|esim-a1.img|esim-a2.img";
blobs=$blobs"|com.google.euiccpixel.xml|com.google.euiccpixel.permissions.xml"; blobs=$blobs"|com.google.euiccpixel.xml|com.google.euiccpixel.permissions.xml";
makes=$makes"|android.hardware.telephony.euicc.*|GoogleParts"; makes=$makes"|android.hardware.telephony.euicc.*|GoogleParts";
@ -373,6 +373,7 @@ echo "Deblobbing...";
blobs=$blobs"|rcsimssettings.jar|rcsservice.jar"; blobs=$blobs"|rcsimssettings.jar|rcsservice.jar";
blobs=$blobs"|rcsimssettings.xml|rcsservice.xml"; blobs=$blobs"|rcsimssettings.xml|rcsservice.xml";
blobs=$blobs"|RCSBootstraputil.apk|RcsImsBootstraputil.apk|uceShimService.apk"; blobs=$blobs"|RCSBootstraputil.apk|RcsImsBootstraputil.apk|uceShimService.apk";
blobs=$blobs"|ShannonRcs.apk";
#blobs=$blobs"|vendor.qti.ims.rcsconfig.*"; #blobs=$blobs"|vendor.qti.ims.rcsconfig.*";
blobs=$blobs"|com.qualcomm.qti.uceservice.*"; blobs=$blobs"|com.qualcomm.qti.uceservice.*";
manifests=$manifests"|uceservice"; manifests=$manifests"|uceservice";

View File

@ -57,7 +57,11 @@ enableAVB() {
sed -i '/\/system_ext/{s|avb=vbmeta_system|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true; sed -i '/\/system_ext/{s|avb=vbmeta_system|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
sed -i '/\/system_ext/{s|avb=vbmeta|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true; sed -i '/\/system_ext/{s|avb=vbmeta|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
sed -i '/\/vendor/{s|avb=vbmeta_system|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true; sed -i '/\/vendor/{s|avb=vbmeta_system|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
sed -i '/\/vendor/{s|avb=vbmeta_vendor|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
sed -i '/\/vendor/{s|avb=vbmeta|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true; sed -i '/\/vendor/{s|avb=vbmeta|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
sed -i '/\/pvmfw/{s|avb=pvmfw|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
sed -i '/\/boot/{s|avb=boot|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
sed -i '/\/init_boot/{s|avb=init_boot|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
sed -i '/\/product/{s|avb=vbmeta_system|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true; sed -i '/\/product/{s|avb=vbmeta_system|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
sed -i '/\/product/{s|avb=vbmeta|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true; sed -i '/\/product/{s|avb=vbmeta|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
#TODO: remove avb_keys=.*? #TODO: remove avb_keys=.*?

View File

@ -51,6 +51,8 @@ commentPatches android_kernel_google_bonito.sh "CVE-2020-0067";
commentPatches android_kernel_google_coral.sh "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2021-30324"; commentPatches android_kernel_google_coral.sh "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2021-30324";
commentPatches android_kernel_google_dragon.sh "0006-AndroidHardening-Kernel_Hardening/3.18/0026.patch" "0008-Graphene-Kernel_Hardening/4.9/0053.patch" "0008-Graphene-Kernel_Hardening/4.9/0055.patch" "CVE-2015-4167" "CVE-2017-15951" "CVE-2016-1237" "CVE-2016-6198" "CVE-2017-7374" "CVE-2018-17972" "CVE-2019-2214" "CVE-2021-39715/ANY/0001.patch"; commentPatches android_kernel_google_dragon.sh "0006-AndroidHardening-Kernel_Hardening/3.18/0026.patch" "0008-Graphene-Kernel_Hardening/4.9/0053.patch" "0008-Graphene-Kernel_Hardening/4.9/0055.patch" "CVE-2015-4167" "CVE-2017-15951" "CVE-2016-1237" "CVE-2016-6198" "CVE-2017-7374" "CVE-2018-17972" "CVE-2019-2214" "CVE-2021-39715/ANY/0001.patch";
commentPatches android_kernel_google_crosshatch.sh "CVE-2020-0067"; commentPatches android_kernel_google_crosshatch.sh "CVE-2020-0067";
commentPatches android_kernel_google_gs101_private_gs-google.sh "CVE-2021-29648/^5.11/0001.patch";
commentPatches android_kernel_google_gs201_private_gs-google.sh "CVE-2021-29648/^5.11/0001.patch";
commentPatches android_kernel_google_marlin.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "0006-AndroidHardening-Kernel_Hardening/3.18/0048.patch" "0006-AndroidHardening-Kernel_Hardening/3.18/0049.patch" "CVE-2017-13162/3.18/0001.patch" "CVE-2017-14883" "CVE-2017-15951" "CVE-2018-17972" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166" "CVE-2021-39715/ANY/0001.patch"; commentPatches android_kernel_google_marlin.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "0006-AndroidHardening-Kernel_Hardening/3.18/0048.patch" "0006-AndroidHardening-Kernel_Hardening/3.18/0049.patch" "CVE-2017-13162/3.18/0001.patch" "CVE-2017-14883" "CVE-2017-15951" "CVE-2018-17972" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166" "CVE-2021-39715/ANY/0001.patch";
commentPatches android_kernel_google_msm.sh "CVE-2017-11015/prima" "CVE-2021-Misc2/ANY/0031.patch"; commentPatches android_kernel_google_msm.sh "CVE-2017-11015/prima" "CVE-2021-Misc2/ANY/0031.patch";
commentPatches android_kernel_google_msm-4.9.sh "CVE-2019-19319" "CVE-2020-0067" "CVE-2020-1749" "CVE-2020-8992" "CVE-2021-30324" "CVE-2021-45469"; commentPatches android_kernel_google_msm-4.9.sh "CVE-2019-19319" "CVE-2020-0067" "CVE-2020-1749" "CVE-2020-8992" "CVE-2021-30324" "CVE-2021-45469";

View File

@ -783,14 +783,16 @@ editKernelLocalversion() {
export -f editKernelLocalversion; export -f editKernelLocalversion;
getDefconfig() { getDefconfig() {
if ls arch/arm/configs/lineage*defconfig 1> /dev/null 2>&1; then if ls private/gs-google/arch/arm64/configs/*_gki_defconfig 1> /dev/null 2>&1; then
local defconfigPath="arch/arm/configs/lineage*defconfig"; local defconfigPath="private/gs-google/arch/arm64/configs/cloudripper_gki_defconfig private/gs-google/arch/arm64/configs/slider_gki_defconfig";
elif ls arch/arm64/configs/lineage*defconfig 1> /dev/null 2>&1; then elif ls arch/arm64/configs/lineage*defconfig 1> /dev/null 2>&1; then
local defconfigPath="arch/arm64/configs/lineage*defconfig"; local defconfigPath="arch/arm64/configs/lineage*defconfig";
elif ls arch/arm/configs/lineage*defconfig 1> /dev/null 2>&1; then
local defconfigPath="arch/arm/configs/lineage*defconfig";
else else
#grep TARGET_KERNEL_CONFIG Build/*/device/ -Rih | sed 's|TARGET_KERNEL_CONFIG .= |arch/arm\*/configs/|' | grep -v lineage | sort -u #grep TARGET_KERNEL_CONFIG Build/*/device/ -Rih | sed 's|TARGET_KERNEL_CONFIG .= |arch/arm\*/configs/|' | grep -v lineage | sort -u
#grep TARGET_KERNEL_VARIANT_CONFIG Build/*/device/ -Rih | sed 's|TARGET_KERNEL_VARIANT_CONFIG .= |arch/arm\*/configs/|' | grep -v lineage | sort -u #grep TARGET_KERNEL_VARIANT_CONFIG Build/*/device/ -Rih | sed 's|TARGET_KERNEL_VARIANT_CONFIG .= |arch/arm\*/configs/|' | grep -v lineage | sort -u
local defconfigPath="arch/arm*/configs/lineage*defconfig arch/arm*/configs/vendor/lineage*defconfig arch/arm*/configs/apollo_defconfig arch/arm*/configs/apq8084_sec_defconfig arch/arm*/configs/apq8084_sec_kccat6_eur_defconfig arch/arm*/configs/apq8084_sec_lentislte_skt_defconfig arch/arm*/configs/aura_defconfig arch/arm*/configs/b1c1_defconfig arch/arm*/configs/beryllium_defconfig arch/arm*/configs/bonito_defconfig arch/arm*/configs/clark_defconfig arch/arm*/configs/discovery_defconfig arch/arm*/configs/enchilada_defconfig arch/arm*/configs/exynos8890-hero2lte_defconfig arch/arm*/configs/exynos8890-herolte_defconfig arch/arm*/configs/exynos9810-star2lte_defconfig arch/arm*/configs/exynos9810-starlte_defconfig arch/arm*/configs/floral_defconfig arch/arm*/configs/FP4_defconfig arch/arm*/configs/griffin_defconfig arch/arm*/configs/grouper_defconfig arch/arm*/configs/harpia_defconfig arch/arm*/configs/jf_att_defconfig arch/arm*/configs/jf_eur_defconfig arch/arm*/configs/jf_spr_defconfig arch/arm*/configs/jf_vzw_defconfig arch/arm*/configs/lavender_defconfig arch/arm*/configs/m1s1_defconfig arch/arm*/configs/m7_defconfig arch/arm*/configs/m8_defconfig arch/arm*/configs/m8dug_defconfig arch/arm*/configs/merlin_defconfig arch/arm*/configs/msm8930_serrano_eur_3g_defconfig arch/arm*/configs/msm8930_serrano_eur_lte_defconfig arch/arm*/configs/msm8974-hdx_defconfig arch/arm*/configs/msm8974-hdx-perf_defconfig arch/arm*/configs/oneplus2_defconfig arch/arm*/configs/osprey_defconfig arch/arm*/configs/pioneer_defconfig arch/arm*/configs/redbull_defconfig arch/arm*/configs/samsung_serrano_defconfig arch/arm*/configs/samsung_serrano_usa_defconfig arch/arm*/configs/shamu_defconfig arch/arm*/configs/sunfish_defconfig arch/arm*/configs/surnia_defconfig arch/arm*/configs/tama_akari_defconfig arch/arm*/configs/tama_apollo_defconfig arch/arm*/configs/tama_aurora_defconfig arch/arm*/configs/thor_defconfig arch/arm*/configs/tuna_defconfig arch/arm*/configs/twrp_defconfig arch/arm*/configs/vendor/alioth_defconfig arch/arm*/configs/vendor/kona-perf_defconfig arch/arm*/configs/vendor/lahaina-qgki_defconfig arch/arm*/configs/vendor/lito-perf_defconfig arch/arm*/configs/vendor/lmi_defconfig arch/arm*/configs/vendor/raphael_defconfig arch/arm*/configs/vendor/sm8150-perf_defconfig arch/arm*/configs/vendor/vayu_defconfig arch/arm*/configs/vendor/xiaomi/beryllium.config arch/arm*/configs/vendor/xiaomi/mi845_defconfig arch/arm*/configs/voyager_defconfig arch/arm*/configs/yellowstone_defconfig arch/arm*/configs/Z00T_defconfig arch/arm*/configs/z2_plus_defconfig arch/arm*/configs/zenfone3-perf_defconfig"; local defconfigPath="arch/arm*/configs/lineage*defconfig arch/arm*/configs/vendor/lineage*defconfig arch/arm*/configs/apollo_defconfig arch/arm*/configs/apq8084_sec_defconfig arch/arm*/configs/apq8084_sec_kccat6_eur_defconfig arch/arm*/configs/apq8084_sec_lentislte_skt_defconfig arch/arm*/configs/aura_defconfig arch/arm*/configs/b1c1_defconfig arch/arm*/configs/beryllium_defconfig arch/arm*/configs/bonito_defconfig arch/arm*/configs/clark_defconfig arch/arm*/configs/cloudripper_gki_defconfig arch/arm*/configs/discovery_defconfig arch/arm*/configs/enchilada_defconfig arch/arm*/configs/exynos8890-hero2lte_defconfig arch/arm*/configs/exynos8890-herolte_defconfig arch/arm*/configs/exynos9810-star2lte_defconfig arch/arm*/configs/exynos9810-starlte_defconfig arch/arm*/configs/floral_defconfig arch/arm*/configs/FP4_defconfig arch/arm*/configs/griffin_defconfig arch/arm*/configs/grouper_defconfig arch/arm*/configs/harpia_defconfig arch/arm*/configs/jf_att_defconfig arch/arm*/configs/jf_eur_defconfig arch/arm*/configs/jf_spr_defconfig arch/arm*/configs/jf_vzw_defconfig arch/arm*/configs/lavender_defconfig arch/arm*/configs/m1s1_defconfig arch/arm*/configs/m7_defconfig arch/arm*/configs/m8_defconfig arch/arm*/configs/m8dug_defconfig arch/arm*/configs/merlin_defconfig arch/arm*/configs/msm8930_serrano_eur_3g_defconfig arch/arm*/configs/msm8930_serrano_eur_lte_defconfig arch/arm*/configs/msm8974-hdx_defconfig arch/arm*/configs/msm8974-hdx-perf_defconfig arch/arm*/configs/oneplus2_defconfig arch/arm*/configs/osprey_defconfig arch/arm*/configs/pioneer_defconfig arch/arm*/configs/redbull_defconfig arch/arm*/configs/samsung_serrano_defconfig arch/arm*/configs/samsung_serrano_usa_defconfig arch/arm*/configs/shamu_defconfig arch/arm*/configs/slider_gki_defconfig arch/arm*/configs/sunfish_defconfig arch/arm*/configs/surnia_defconfig arch/arm*/configs/tama_akari_defconfig arch/arm*/configs/tama_apollo_defconfig arch/arm*/configs/tama_aurora_defconfig arch/arm*/configs/thor_defconfig arch/arm*/configs/tuna_defconfig arch/arm*/configs/twrp_defconfig arch/arm*/configs/vendor/alioth_defconfig arch/arm*/configs/vendor/kona-perf_defconfig arch/arm*/configs/vendor/lahaina-qgki_defconfig arch/arm*/configs/vendor/lito-perf_defconfig arch/arm*/configs/vendor/lmi_defconfig arch/arm*/configs/vendor/raphael_defconfig arch/arm*/configs/vendor/sm8150-perf_defconfig arch/arm*/configs/vendor/vayu_defconfig arch/arm*/configs/vendor/xiaomi/beryllium.config arch/arm*/configs/vendor/xiaomi/mi845_defconfig arch/arm*/configs/voyager_defconfig arch/arm*/configs/yellowstone_defconfig arch/arm*/configs/Z00T_defconfig arch/arm*/configs/z2_plus_defconfig arch/arm*/configs/zenfone3-perf_defconfig ";
fi; fi;
echo $defconfigPath; echo $defconfigPath;
} }

View File

@ -0,0 +1,141 @@
#!/bin/bash
cd "$DOS_BUILD_BASE""kernel/google/gs101/private/gs-google"
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/5.10/5.10.0115-0116.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/5.10/5.10.0122-0123.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/5.10/5.10.0125-0126.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/5.10/5.10.0138-0139.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/5.10/5.10.0150-0151.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9892/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3695/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/ANY/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9444/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11301/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3669/^5.14/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3759/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4034/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4037/5.10/0002.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29648/^5.11/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33061/^5.17/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33655/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33655/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33655/5.10/0007.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33656/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0171/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0480/4.9-^5.14/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0494/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1012/5.10/0028.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1016/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1158/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/5.10/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/^5.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1198/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/5.10/0016.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/5.10/0017.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/5.10/0018.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/5.10/0019.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/5.10/0020.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1280/^5.13/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1280/^5.14/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1353/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1508/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1516/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1652/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1729/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1836/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1966/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1972/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1974/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1975/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/5.10/0011.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/5.10/0012.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/5.10/0013.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2209/5.10/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2318/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2380/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2586/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2588/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2602/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2639/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2663/5.10/0007.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2663/5.10/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2905/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2977/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2978/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2991/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3078/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3169/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3202/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3239/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3303/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3344/^6.1/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3521/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3524/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3535/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3542/3.8-^6.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3545/^5.19/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3564/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3565/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3577/5.10/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3577/5.10/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3577/^6.0/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3586/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3594/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3621/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3625/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3628/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3629/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3633/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3635/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3646/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3649/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3903/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4095/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/^5.15/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-21505/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26365/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26373/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26490/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28389/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28893/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-32981/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33740/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33741/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33742/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33743/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33744/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-34918/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36123/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/5.10/0007.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40768/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41674/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41849/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41850/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41858/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42719/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42721/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42722/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42896/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/^6.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-MiscWireless/^6.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-MiscWireless/^6.0/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-MiscWireless/^6.0/0004.patch
editKernelLocalversion "-dos.p137"
cd "$DOS_BUILD_BASE"

View File

@ -0,0 +1,141 @@
#!/bin/bash
cd "$DOS_BUILD_BASE""kernel/google/gs201/private/gs-google"
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/5.10/5.10.0115-0116.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/5.10/5.10.0122-0123.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/5.10/5.10.0125-0126.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/5.10/5.10.0138-0139.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/5.10/5.10.0150-0151.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9892/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3695/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/ANY/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9444/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11301/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3669/^5.14/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3759/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4034/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4037/5.10/0002.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29648/^5.11/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33061/^5.17/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33655/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33655/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33655/5.10/0007.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33656/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0171/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0480/4.9-^5.14/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0494/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1012/5.10/0028.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1016/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1158/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/5.10/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/^5.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1198/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/5.10/0016.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/5.10/0017.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/5.10/0018.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/5.10/0019.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/5.10/0020.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1280/^5.13/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1280/^5.14/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1353/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1508/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1516/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1652/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1729/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1836/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1966/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1972/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1974/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1975/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/5.10/0011.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/5.10/0012.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/5.10/0013.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2209/5.10/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2318/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2380/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2586/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2588/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2602/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2639/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2663/5.10/0007.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2663/5.10/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2905/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2977/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2978/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2991/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3078/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3169/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3202/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3239/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3303/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3344/^6.1/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3521/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3524/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3535/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3542/3.8-^6.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3545/^5.19/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3564/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3565/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3577/5.10/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3577/5.10/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3577/^6.0/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3586/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3594/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3621/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3625/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3628/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3629/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3633/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3635/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3646/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3649/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3903/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4095/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/^5.15/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-21505/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26365/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26373/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26490/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28389/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28893/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-32981/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33740/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33741/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33742/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33743/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33744/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-34918/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36123/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/5.10/0007.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40768/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41674/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41849/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41850/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41858/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42719/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42721/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42722/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42896/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/^6.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-MiscWireless/^6.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-MiscWireless/^6.0/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-MiscWireless/^6.0/0004.patch
editKernelLocalversion "-dos.p137"
cd "$DOS_BUILD_BASE"

View File

@ -19,7 +19,7 @@ umask 0022;
#Last verified: 2022-10-15 #Last verified: 2022-10-15
patchAllKernels() { patchAllKernels() {
startPatcher "kernel_fairphone_sm7225 kernel_fxtec_msm8998 kernel_google_msm-4.9 kernel_google_msm-4.14 kernel_google_redbull kernel_google_wahoo kernel_oneplus_msm8998 kernel_oneplus_sdm845 kernel_oneplus_sm8150 kernel_oneplus_sm8250 kernel_oneplus_sm8350 kernel_razer_sdm845 kernel_xiaomi_sdm845"; startPatcher "kernel_fairphone_sm7225 kernel_fxtec_msm8998 kernel_google_gs101_private_gs-google kernel_google_gs201_private_gs-google kernel_google_msm-4.9 kernel_google_msm-4.14 kernel_google_redbull kernel_google_wahoo kernel_oneplus_msm8998 kernel_oneplus_sdm845 kernel_oneplus_sm8150 kernel_oneplus_sm8250 kernel_oneplus_sm8350 kernel_razer_sdm845 kernel_xiaomi_sdm845";
} }
export -f patchAllKernels; export -f patchAllKernels;
@ -87,8 +87,11 @@ buildAll() {
buildDevice bonito avb; buildDevice bonito avb;
buildDevice sargo avb; buildDevice sargo avb;
#Tensor #Tensor
#TODO: oriole, raven, bluejay #buildDevice oriole avb;
#TODO: panther, cheetah #buildDevice raven avb;
#buildDevice bluejay avb;
#buildDevice panther avb;
#buildDevice cheetah avb;
} }
export -f buildAll; export -f buildAll;