Преглед изворни кода

fix(action): add conditional patches and revert steps for Android 16 6.12 based on sublevel

TheWildJames пре 4 месеци
родитељ
комит
9acc0d152b
1 измењених фајлова са 9 додато и 1 уклоњено
  1. 9 1
      .github/actions/susfs/action.yml

+ 9 - 1
.github/actions/susfs/action.yml

@@ -181,6 +181,10 @@ runs:
           echo "Applying exec.c Android 16 6.12 Fake Patch"
           echo "Applying exec.c Android 16 6.12 Fake Patch"
           sed -i '/^#include <linux\/dma-buf.h>$/d' fs/exec.c
           sed -i '/^#include <linux\/dma-buf.h>$/d' fs/exec.c
         fi
         fi
+        if [ "${{ inputs.sublevel }}" -ge "69" ]; then
+          echo "Applying task_mmu.c Android 16 6.12 Fake Patch"
+          sed -i 's/vma_pages/vma_data_pages/g' fs/proc/task_mmu.c
+        fi
 
 
     - name: Apply Kernel SUSFS Patches
     - name: Apply Kernel SUSFS Patches
       shell: bash
       shell: bash
@@ -277,7 +281,11 @@ runs:
         echo "Reverting 6.12 Fake Patches"
         echo "Reverting 6.12 Fake Patches"
         if [ "${{ inputs.sublevel }}" -ge "58" ]; then
         if [ "${{ inputs.sublevel }}" -ge "58" ]; then
           echo "Reverting exec.c Android 16 6.12 Fake Patch"
           echo "Reverting exec.c Android 16 6.12 Fake Patch"
-          sed -i '/linux\/ksh.h/a #include <linux/dma-buf.h>' fs/exec.c
+          sed -i '/^#include /a #include <linux/dma-buf.h>' fs/exec.c
+        fi
+        if [ "${{ inputs.sublevel }}" -ge "69" ]; then
+          echo "Reverting task_mmu.c Android 16 6.12 Fake Patch"
+          sed -i 's/vma_pages/vma_data_pages/g' fs/proc/task_mmu.c
         fi
         fi
 
 
     - name: Apply Kernel SUSFS Patches
     - name: Apply Kernel SUSFS Patches