Просмотр исходного кода

fix(action): add conditional step for fixing 5.10 kernel version and update revert condition for Android 16 6.12 Fake Patches

TheWildJames 4 месяцев назад
Родитель
Сommit
b4c13a43bc
2 измененных файлов с 8 добавлено и 1 удалено
  1. 7 0
      .github/actions/droidspaces/action.yml
  2. 1 1
      .github/actions/susfs/action.yml

+ 7 - 0
.github/actions/droidspaces/action.yml

@@ -56,3 +56,10 @@ runs:
         CONFIG_PID_NS=y
         CONFIG_DEVTMPFS=y
         EOF
+
+    - name: Fix 5.10
+      shell: bash
+      if: inputs.kernel_version == '5.10' && inputs.android_version == 'android12'
+      working-directory: ${{ github.workspace }}/kernel
+      run: |
+        sed -i '/#ifdef CONFIG_PID_NS/,/#else/s/static inline struct pid_namespace \*get_pid_ns(struct pid_namespace \*ns)/extern struct pid_namespace *get_pid_ns(struct pid_namespace *ns);/' common/include/linux/pid_namespace.h

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

@@ -271,7 +271,7 @@ runs:
 
     - name: Revert Android 16 6.12 Fake Patches
       shell: bash
-      if: inputs.kernel_version == '6.12' && inputs.android_version == 'android16' && false
+      if: inputs.kernel_version == '6.12' && inputs.android_version == 'android16'
       working-directory: ${{ github.workspace }}/kernel/common
       run: |
         echo "Reverting 6.12 Fake Patches"