TheWildJames преди 5 месеца
родител
ревизия
16fa4b4146

+ 4 - 7
.github/actions/clean-kernel-flags/action.yml

@@ -1,5 +1,5 @@
 name: 'Clean Kernel Flags'
-description: 'Clean dirty flags and ABI exports to prevent build errors'
+description: 'Clean dirty flags'
 
 runs:
   using: "composite"
@@ -11,14 +11,11 @@ runs:
         # Clean dirty flags and ABI exports based on build system
         if [ -f "build/build.sh" ]; then
           # Old build system (5.10, 5.15, early 6.1)
-          sed -i 's/-dirty//' ./common/scripts/setlocalversion
+          sed -i 's/-dirty//' common/scripts/setlocalversion
         else
           # Bazel build system (newer kernels)
-          sed -i "/stable_scmversion_cmd/s/-maybe-dirty//g" ./build/kernel/kleaf/impl/stamp.bzl
-          sed -i 's/-dirty//' ./common/scripts/setlocalversion
-          # Remove ABI protected exports to prevent build errors
-          rm -rf ./common/android/abi_gki_protected_exports_*
-          perl -pi -e 's/^\s*"protected_exports_list"\s*:\s*"android\/abi_gki_protected_exports_aarch64",\s*$//;' ./common/BUILD.bazel
+          sed -i "/stable_scmversion_cmd/s/-maybe-dirty//g" build/kernel/kleaf/impl/stamp.bzl
+          sed -i 's/-dirty//' common/scripts/setlocalversion
         fi
 
         # Commit changes to avoid dirty state during build

+ 0 - 21
.github/actions/hakan/action.yml

@@ -1,21 +0,0 @@
-name: Setup RFKILL Modules
-description: Configure WiFi/Bluetooth RFKILL modules for Hakan variant
-
-runs:
-  using: composite
-  steps:
-    - name: Configure RFKILL for WiFi/Bluetooth
-      shell: bash
-      working-directory: ${{ github.workspace }}/kernel
-      run: |
-        cat >> "${{ github.workspace }}/wild_gki.fragment" << 'EOF'
-        CONFIG_RFKILL=y
-        CONFIG_CFG80211=y
-        CONFIG_MAC80211=y
-        EOF
-
-        # Remove libarc4.ko and rfkill.ko from modules list
-        sed -i \
-          -e '/_COMMON_GKI_MODULES_LIST = \[/,/^[[:space:]]*\]/{/^[[:space:]]*"lib\/crypto\/libarc4\.ko",[[:space:]]*$/d}' \
-          -e '/_COMMON_GKI_MODULES_LIST = \[/,/^[[:space:]]*\]/{/^[[:space:]]*"net\/rfkill\/rfkill\.ko",[[:space:]]*$/d}' \
-          common/modules.bzl

+ 4 - 2
.github/actions/wksu/action.yml

@@ -14,7 +14,9 @@ runs:
       working-directory: ${{ github.workspace }}/kernel
       run: |
         # Clone the repository
-        curl -LSs "https://raw.githubusercontent.com/WildKernels/Wild_KSU/stable/kernel/setup.sh" | bash -s ${{ inputs.ksu_commit }}
+        #curl -LSs "https://raw.githubusercontent.com/WildKernels/Wild_KSU/stable/kernel/setup.sh" | bash -s ${{ inputs.ksu_commit }}
+        #curl -LSs "https://raw.githubusercontent.com/KernelSU-Next/KernelSU-Next/dev/kernel/setup.sh" | bash -s dev
+        curl -LSs "https://raw.githubusercontent.com/pershoot/KernelSU-Next/dev-susfs/kernel/setup.sh" | bash -s dev-susfs
 
     - name: Enable KernelSU Config
       shell: bash
@@ -28,7 +30,7 @@ runs:
     - name: Extract KSU Version Info
       id: ksu-version
       shell: bash
-      working-directory: ${{ github.workspace }}/kernel/Wild_KSU
+      working-directory: ${{ github.workspace }}/kernel/KernelSU-Next
       run: |
         # Extract and export KSU version info
         KSU_GIT_VERSION=$(git rev-list --count HEAD 2>/dev/null)

+ 2 - 1
.github/kernel-config/a12-5.10.json

@@ -35,6 +35,7 @@
     {"kernel_version": "5.10.236-android12-2025-05"},
     {"kernel_version": "5.10.237-android12-2025-06"},
     {"kernel_version": "5.10.240-android12-2025-09"},
-    {"kernel_version": "5.10.246-android12-2025-12"}
+    {"kernel_version": "5.10.246-android12-2025-12"},
+    {"kernel_version": "5.10.X-android12-lts"}
   ]
 }

+ 2 - 1
.github/kernel-config/a13-5.10.json

@@ -36,6 +36,7 @@
     {"kernel_version": "5.10.236-android13-2025-05"},
     {"kernel_version": "5.10.238-android13-2025-07"},
     {"kernel_version": "5.10.243-android13-2025-10"},
-    {"kernel_version": "5.10.246-android13-2026-01"}
+    {"kernel_version": "5.10.246-android13-2026-01"},
+    {"kernel_version": "5.10.X-android13-lts"}
   ]
 }

+ 2 - 1
.github/kernel-config/a13-5.15.json

@@ -35,6 +35,7 @@
     {"kernel_version": "5.15.185-android13-2025-07"},
     {"kernel_version": "5.15.189-android13-2025-09"},
     {"kernel_version": "5.15.194-android13-2025-12"},
-    {"kernel_version": "5.15.197-android13-2026-03"}
+    {"kernel_version": "5.15.197-android13-2026-03"},
+    {"kernel_version": "5.15.X-android13-lts"}
   ]
 }

+ 3 - 1
.github/kernel-config/a14-5.15.json

@@ -19,6 +19,8 @@
     {"kernel_version": "5.15.180-android14-2025-05"},
     {"kernel_version": "5.15.185-android14-2025-07"},
     {"kernel_version": "5.15.192-android14-2025-10"},
-    {"kernel_version": "5.15.196-android14-2026-01"}
+    {"kernel_version": "5.15.196-android14-2026-01"},
+    {"kernel_version": "5.15.202-android14-2026-04"},
+    {"kernel_version": "5.15.X-android14-lts"}
   ]
 }

+ 2 - 1
.github/kernel-config/a14-6.1.json

@@ -29,6 +29,7 @@
     {"kernel_version": "6.1.145-android14-2025-08"},
     {"kernel_version": "6.1.145-android14-2025-09"},
     {"kernel_version": "6.1.157-android14-2025-12"},
-    {"kernel_version": "6.1.162-android14-2026-03"}
+    {"kernel_version": "6.1.162-android14-2026-03"},
+    {"kernel_version": "6.1.X-android14-lts"}
   ]
 }

+ 3 - 1
.github/kernel-config/a15-6.6.json

@@ -16,6 +16,8 @@
     {"kernel_version": "6.6.98-android15-2025-08"},
     {"kernel_version": "6.6.98-android15-2025-09"},
     {"kernel_version": "6.6.102-android15-2025-10"},
-    {"kernel_version": "6.6.118-android15-2026-01"}
+    {"kernel_version": "6.6.118-android15-2026-01"},
+    {"kernel_version": "6.6.127-android15-2026-04"},
+    {"kernel_version": "6.6.X-android15-lts"}
   ]
 }

+ 3 - 1
.github/kernel-config/a16-6.12.json

@@ -5,6 +5,8 @@
     {"kernel_version": "6.12.30-android16-2025-07"},
     {"kernel_version": "6.12.38-android16-2025-08"},
     {"kernel_version": "6.12.38-android16-2025-09"},
-    {"kernel_version": "6.12.58-android16-2025-12"}
+    {"kernel_version": "6.12.58-android16-2025-12"},
+    {"kernel_version": "6.12.69-android16-2025-03"},
+    {"kernel_version": "6.12.X-android16-lts"}
   ]
 }

+ 0 - 11
.github/kernel-config/bypass.json

@@ -1,11 +0,0 @@
-{
-  "include": [
-    {"kernel_version": "5.10.X-android12-lts", "variant": "Bypass"},
-    {"kernel_version": "5.10.X-android13-lts", "variant": "Bypass"},
-    {"kernel_version": "5.15.X-android13-lts", "variant": "Bypass"},
-    {"kernel_version": "5.15.X-android14-lts", "variant": "Bypass"},
-    {"kernel_version": "6.1.X-android14-lts", "variant": "Bypass"},
-    {"kernel_version": "6.6.X-android15-lts", "variant": "Bypass"},
-    {"kernel_version": "6.12.X-android16-lts", "variant": "Bypass" }
-  ]
-}

+ 0 - 9
.github/kernel-config/custom.json

@@ -1,9 +0,0 @@
-{
-  "include": [
-    {"kernel_version": "5.10.226-android12-2024-11", "variant": "vTomsonek"},
-    {"kernel_version": "6.1.145-android14-2025-09", "variant": "TheWildJames"},
-    {"kernel_version": "6.1.157-android14-2025-12", "variant": "MarionKernel"},
-    {"kernel_version": "6.1.128-android14-2025-03", "variant": "Hakan"},
-    {"kernel_version": "5.10.226-android12-2024-11", "variant": "Neyugn"}
-  ]
-}

+ 0 - 11
.github/kernel-config/lts.json

@@ -1,11 +0,0 @@
-{
-  "include": [
-    {"kernel_version": "5.10.X-android12-lts"},
-    {"kernel_version": "5.10.X-android13-lts"},
-    {"kernel_version": "5.15.X-android13-lts"},
-    {"kernel_version": "5.15.X-android14-lts"},
-    {"kernel_version": "6.1.X-android14-lts"},
-    {"kernel_version": "6.6.X-android15-lts"},
-    {"kernel_version": "6.12.X-android16-lts"}
-  ]
-}

+ 0 - 5
.github/kernel-config/testing.json

@@ -1,5 +0,0 @@
-{
-  "include": [
-    {"kernel_version": "6.1.145-android14-2025-08", "variant": "Placeholder"}
-  ]
-}

+ 21 - 3
.github/workflows/build.yml

@@ -31,6 +31,10 @@ on:
 jobs:
   build-gki:
     name: "${{ inputs.kernel_version }}${{ inputs.variant && format('-{0}', inputs.variant) || '' }}"
+    strategy:
+      fail-fast: false
+      matrix:
+        variant: ['Normal', 'Bypass']
     runs-on: ubuntu-latest
     timeout-minutes: 60
 
@@ -83,7 +87,6 @@ jobs:
         remove_dotnet: true
         remove_haskell: true
         remove_tool_cache: true
-        remove_swap: true
         remove_packages: "azure-cli google-cloud-cli microsoft-edge-stable google-chrome-stable firefox postgresql* temurin-* *llvm* mysql* dotnet-sdk-*"
         remove_packages_one_command: true
         remove_folders: "/usr/share/swift /usr/share/miniconda /usr/share/az* /usr/local/lib/node_modules /usr/local/share/chromium /usr/local/share/powershell /usr/local/julia /usr/local/aws-cli /usr/local/aws-sam-cli /usr/share/gradle"
@@ -91,6 +94,12 @@ jobs:
         rmz_version: "3.1.1"  # Required when rm_cmd is 'rmz'
         testing: false
 
+    - name: Setup more Swap (for LTO)
+      uses: thejerrybao/setup-swap-space@v1   # or pierotofy/set-swap-space
+      with:
+        swap-size-gb: 25          # 10-24 GB is common for heavy LTO
+        # swap-space-path: /mnt/swapfile   # optional
+
     - name: Setup Build Environment
       run: |
         mkdir -p "$GITHUB_WORKSPACE/kernel"
@@ -209,7 +218,7 @@ jobs:
       uses: ./.github/actions/bbg
 
     - name: Apply Module Check Bypass
-      if: ${{ inputs.variant == 'Bypass' || inputs.variant == 'Hakan' }}
+      if: ${{ inputs.variant == 'Bypass' }}
       run: |
         if [[ "$KERNEL_VERSION" == "6.1" || "$KERNEL_VERSION" == "6.6" || "$KERNEL_VERSION" == "6.12" ]]; then
           TARGET_FILE="$GITHUB_WORKSPACE/kernel/common/kernel/module/version.c"
@@ -319,7 +328,16 @@ jobs:
       working-directory: ${{ github.workspace }}/kernel
       run: |
         set -ex
-        #make -C common mrproper
+        if [ -f "build/build.sh" ]; then
+          # SKIP NOT NEEDED
+        else
+          # Bazel build system (newer kernels)
+          # Remove ABI protected exports to prevent build errors
+          rm -rf common/android/abi_gki_protected_exports_*
+          perl -pi -e 's/^\s*"protected_exports_list"\s*:\s*"android\/abi_gki_protected_exports_aarch64",\s*$//;' common/BUILD.bazel
+          sed -i 's/protected_modules = \[.*\]/protected_modules = []/' common/modules.bzl || true
+        fi
+
         if [ -f "build/build.sh" ]; then
           SKIP_MRPROPER=1 GKI_DEFCONFIG_FRAGMENT="$GITHUB_WORKSPACE/wild_gki.fragment" LTO=thin BUILD_CONFIG=common/build.config.gki.aarch64 build/build.sh || exit 1
         else

+ 0 - 62
.github/workflows/main.yml

@@ -24,10 +24,6 @@ on:
           - a14-6-1
           - a15-6-6
           - a16-6-12
-          - lts
-          - custom
-          - testing
-          - bypass
         default: custom
       feature_set:
         description: "Feature Set"
@@ -156,58 +152,6 @@ jobs:
       feature_set: ${{ inputs.feature_set || 'WKSU+SUSFS+BBG' }}
     secrets: inherit
 
-  build-lts:
-    if: ${{ inputs.kernel_build_version == 'all' || inputs.kernel_build_version == 'lts' || github.event_name == 'push' }}
-    needs: fetch-commits
-    uses: ./.github/workflows/prepare.yml
-    with:
-      config_file: .github/kernel-config/lts.json
-      ksu_commit: ${{ inputs.ksu_commit || needs.fetch-commits.outputs.ksu_commit }}
-      anykernel_commit: ${{ needs.fetch-commits.outputs.anykernel_commit }}
-      patches_commit: ${{ needs.fetch-commits.outputs.patches_commit }}
-      susfs_commit: ${{ needs.fetch-commits.outputs.susfs_commit }}
-      feature_set: ${{ inputs.feature_set || 'WKSU+SUSFS+BBG' }}
-    secrets: inherit
-
-  build-custom:
-    if: ${{ inputs.kernel_build_version == 'all' || inputs.kernel_build_version == 'custom' }}
-    needs: fetch-commits
-    uses: ./.github/workflows/prepare.yml
-    with:
-      config_file: .github/kernel-config/custom.json
-      ksu_commit: ${{ inputs.ksu_commit || needs.fetch-commits.outputs.ksu_commit }}
-      anykernel_commit: ${{ needs.fetch-commits.outputs.anykernel_commit }}
-      patches_commit: ${{ needs.fetch-commits.outputs.patches_commit }}
-      susfs_commit: ${{ needs.fetch-commits.outputs.susfs_commit }}
-      feature_set: ${{ inputs.feature_set || 'WKSU+SUSFS+BBG' }}
-    secrets: inherit
-
-  build-testing:
-    if: ${{ inputs.kernel_build_version == 'all' || inputs.kernel_build_version == 'testing' || github.event_name == 'push' }}
-    needs: fetch-commits
-    uses: ./.github/workflows/prepare.yml
-    with:
-      config_file: .github/kernel-config/testing.json
-      ksu_commit: ${{ inputs.ksu_commit || needs.fetch-commits.outputs.ksu_commit }}
-      anykernel_commit: ${{ needs.fetch-commits.outputs.anykernel_commit }}
-      patches_commit: ${{ needs.fetch-commits.outputs.patches_commit }}
-      susfs_commit: ${{ needs.fetch-commits.outputs.susfs_commit }}
-      feature_set: ${{ inputs.feature_set || 'WKSU+SUSFS+BBG' }}
-    secrets: inherit
-
-  build-bypass:
-    if: ${{ inputs.kernel_build_version == 'all' || inputs.kernel_build_version == 'bypass' }}
-    needs: fetch-commits
-    uses: ./.github/workflows/prepare.yml
-    with:
-      config_file: .github/kernel-config/bypass.json
-      ksu_commit: ${{ inputs.ksu_commit || needs.fetch-commits.outputs.ksu_commit }}
-      anykernel_commit: ${{ needs.fetch-commits.outputs.anykernel_commit }}
-      patches_commit: ${{ needs.fetch-commits.outputs.patches_commit }}
-      susfs_commit: ${{ needs.fetch-commits.outputs.susfs_commit }}
-      feature_set: ${{ inputs.feature_set || 'WKSU+SUSFS+BBG' }}
-    secrets: inherit
-
   rej:
     if: always()
     runs-on: ubuntu-latest
@@ -291,9 +235,6 @@ jobs:
     - build-a14-6-1
     - build-a15-6-6
     - build-a16-6-12
-    - build-lts
-    - build-custom
-    - build-bypass
 
     env:
       GH_TOKEN: ${{ github.token }}
@@ -329,9 +270,6 @@ jobs:
         check_selected "a14-6-1" "build-a14-6-1" "${{ needs.build-a14-6-1.result }}"
         check_selected "a15-6-6" "build-a15-6-6" "${{ needs.build-a15-6-6.result }}"
         check_selected "a16-6-12" "build-a16-6-12" "${{ needs.build-a16-6-12.result }}"
-        check_selected "custom" "build-custom" "${{ needs.build-custom.result }}"
-        check_selected "lts" "build-lts" "${{ needs.build-lts.result }}"
-        check_selected "bypass" "build-bypass" "${{ needs.build-bypass.result }}"
 
         if [[ "$failed" -ne 0 ]]; then
           exit 1