瀏覽代碼

Remove protected_module_names_list for 6.12+ kernels in action.yml and comment out device-specific patches in build.yml

TheWildJames 3 月之前
父節點
當前提交
0f7da5e520
共有 2 個文件被更改,包括 20 次插入5 次删除
  1. 15 0
      .github/actions/remove-protected-exports/action.yml
  2. 5 5
      .github/workflows/build.yml

+ 15 - 0
.github/actions/remove-protected-exports/action.yml

@@ -49,3 +49,18 @@ runs:
             exit 1
           fi
         fi
+
+        # Remove protected_module_names_list for 6.12+ kernels (Bazel build system)
+        if grep -q 'protected_module_names_list' common/BUILD.bazel; then
+          BEFORE_BUILD_BAZEL_SHA="$(sha256sum common/BUILD.bazel | awk '{print $1}')"
+          perl -pi -e 's/^\s*protected_module_names_list\s*=\s*":gki_(?:aarch64|x86_64)_protected_module_names",\s*$//;' common/BUILD.bazel
+          AFTER_BUILD_BAZEL_SHA="$(sha256sum common/BUILD.bazel | awk '{print $1}')"
+          if [ "$BEFORE_BUILD_BAZEL_SHA" = "$AFTER_BUILD_BAZEL_SHA" ]; then
+            echo "Warning: common/BUILD.bazel was not modified for protected_module_names_list (may not be present)"
+          fi
+          if grep -q 'protected_module_names_list' common/BUILD.bazel; then
+            echo "Error: protected_module_names_list reference still present in common/BUILD.bazel"
+            grep -n 'protected_module_names_list' common/BUILD.bazel || true
+            exit 1
+          fi
+        fi

+ 5 - 5
.github/workflows/build.yml

@@ -142,11 +142,11 @@ jobs:
       with:
         kernel_version: ${{ inputs.kernel_version }}
 
-    - name: Apply Device-Specific Patches
-      uses: ./.github/actions/apply-device-patches
-      with:
-        version: ${{ inputs.version }}
-        kernel_version: ${{ inputs.kernel_version }}
+    # - name: Apply Device-Specific Patches
+    #   uses: ./.github/actions/apply-device-patches
+    #   with:
+    #     version: ${{ inputs.version }}
+    #     kernel_version: ${{ inputs.kernel_version }}
 
     - name: Apply ABI Compare Bypass
       if: false