فهرست منبع

ci(workflows): update kernel sub-level and OS patch levels

Add new sub-level and OS patch level configurations for Android 12 and 13, and adjust existing sub-levels for Android 14 and 16. Additionally, uncomment and enable SUSFS patch application in the build workflow to ensure compatibility with Android 13 5.15. This enhances the build process by ensuring all necessary patches and configurations are applied correctly.
TheWildJames 9 ماه پیش
والد
کامیت
9cbb901f32

+ 11 - 65
.github/workflows/build.yml

@@ -354,12 +354,12 @@ jobs:
 
               # Apply additional SUSFS patches for Android 13 5.15 compatibility
               #if [[ "${{ inputs.android_version }}" == "android13" && "${{ inputs.kernel_version }}" == "5.15" ]] && [[ ${{ inputs.sub_level }} -le 41 ]]; then
-                #cp $KERNEL_PATCHES/ksu/susfs_fix_patches/v${SUSFS_VERSION}/fix_fdinfo.c.patch ./
-                #patch -p1 < fix_fdinfo.c.patch || true
-                #cp $KERNEL_PATCHES/ksu/susfs_fix_patches/v${SUSFS_VERSION}/fix_namespace.c.patch ./
-                #patch -p1 < fix_namespace.c.patch || true
-                #cp $KERNEL_PATCHES/ksu/susfs_fix_patches/v${SUSFS_VERSION}/fix_open.c.patch ./
-                #patch -p1 < fix_open.c.patch || true
+                cp $KERNEL_PATCHES/ksu/susfs_fix_patches/v${SUSFS_VERSION}/fix_fdinfo.c.patch ./
+                patch -p1 < fix_fdinfo.c.patch || true
+                cp $KERNEL_PATCHES/ksu/susfs_fix_patches/v${SUSFS_VERSION}/fix_namespace.c.patch ./
+                patch -p1 < fix_namespace.c.patch || true
+                cp $KERNEL_PATCHES/ksu/susfs_fix_patches/v${SUSFS_VERSION}/fix_open.c.patch ./
+                patch -p1 < fix_open.c.patch || true
                 #sed -i 's/i_uid_into_mnt(i_user_ns(inode), inode)/i_uid_into_mnt(inode->i_sb->s_user_ns, inode)/g' fs/susfs.c
               #fi
               ;;
@@ -650,21 +650,21 @@ jobs:
       - name: Change Kernel Name
         working-directory: ${{ env.KERNEL_ROOT }}
         run: |
-          #Wild to Kernel Version
+          #Wild to Kernel Version (replace last instance only)
           if [[ "${{ inputs.kernel_version }}" == "5."* ]] || [[ "${{ inputs.kernel_version }}" == "6.1" ]]; then
             case ${{ matrix.build_type }} in
               TheWildJames)
-                sed -i '$s|echo "\$res"|echo "\$res-🟢-Wild-Exclusive"|' ./common/scripts/setlocalversion
+                perl -i -0777 -pe 's/(.*)echo "\$res"/$1echo "\$res-🟢-Wild-Exclusive"/s' ./common/scripts/setlocalversion
                 ;;
               MarionKernel)
-                sed -i '$s|echo "\$res"|echo "\$res-MarionKernel"|' ./common/scripts/setlocalversion
+                perl -i -0777 -pe 's/(.*)echo "\$res"/$1echo "\$res-MarionKernel"/s' ./common/scripts/setlocalversion
                 ;;
               *)
-                sed -i '$s|echo "\$res"|echo "\$res-Wild"|' ./common/scripts/setlocalversion
+                perl -i -0777 -pe 's/(.*)echo "\$res"/$1echo "\$res-Wild"/s' ./common/scripts/setlocalversion
                 ;;
             esac
           else
-            sed -i 's|echo "${KERNELVERSION}${file_localversion}${config_localversion}${LOCALVERSION}${scm_version}"|echo "${KERNELVERSION}${file_localversion}${config_localversion}${LOCALVERSION}-Wild${scm_version}"|' ./common/scripts/setlocalversion
+            perl -i -0777 -pe 's/(.*)echo "\$\{KERNELVERSION\}\$\{file_localversion\}\$\{config_localversion\}\$\{LOCALVERSION\}\$\{scm_version\}"/$1echo "\${KERNELVERSION}\${file_localversion}\${config_localversion}\${LOCALVERSION}-Wild\${scm_version}"/s' ./common/scripts/setlocalversion
           fi
           if [ -f "build/build.sh" ]; then
             #Remove Dirty Flag
@@ -719,60 +719,6 @@ jobs:
           cp "$KERNEL_ROOT/bazel-bin/common/kernel_aarch64/snd-aloop.ko" "$ANYKERNEL3/modules/data/adb/lkm/"
           cp "$KERNEL_ROOT/bazel-bin/common/kernel_aarch64/g_audio.ko" "$ANYKERNEL3/modules/data/adb/lkm/"
 
-      - name: Search for Kernel Modules
-        run: |
-          echo "Searching for kernel modules (.ko files)..."
-          
-          # Function to scan for modules (search only)
-          scan_modules() {
-            local search_dir="$1"
-            local module_count=0
-            
-            if [ -d "$search_dir" ]; then
-              echo "Scanning directory: $search_dir"
-              
-              # Find all .ko files and report their locations
-              while IFS= read -r -d '' module_file; do
-                if [ -f "$module_file" ]; then
-                  module_name=$(basename "$module_file")
-                  echo "Found module: $module_name in $(dirname "$module_file")"
-                  ((module_count++))
-                fi
-              done < <(find "$search_dir" -name "*.ko" -type f -print0 2>/dev/null)
-            fi
-            
-            return $module_count
-          }
-          
-          # Scan common build output directories
-          total_modules=0
-          
-          # Scan bazel-bin directory
-          if scan_modules "$KERNEL_ROOT/bazel-bin"; then
-            total_modules=$((total_modules + $?))
-          fi
-          
-          # Scan out directory
-          if scan_modules "$KERNEL_ROOT/out"; then
-            total_modules=$((total_modules + $?))
-          fi
-          
-          # Scan dist directory specifically
-          if scan_modules "$KERNEL_ROOT/out/${{ inputs.android_version }}-${{ inputs.kernel_version }}/dist"; then
-            total_modules=$((total_modules + $?))
-          fi
-          
-          # Look for snd-aloop.ko specifically
-          echo "Searching specifically for snd-aloop.ko..."
-          snd_aloop_found=$(find "$KERNEL_ROOT" -name "snd-aloop.ko" -type f 2>/dev/null | head -1)
-          if [ -n "$snd_aloop_found" ]; then
-            echo "Found snd-aloop.ko at: $snd_aloop_found"
-          else
-            echo "snd-aloop.ko not found"
-          fi
-          
-          echo "Total kernel modules found: $total_modules"
-
       - name: Create Bootimgs Folder and Copy Images for Android 12/13
         if: ${{ inputs.android_version == 'android12' || inputs.android_version == 'android13' }}
         run: |

+ 2 - 0
.github/workflows/kernel-a12-5-10.yml

@@ -93,6 +93,8 @@ jobs:
           os_patch_level: "2025-06"
         - sub_level: "240"
           os_patch_level: "2025-09"
+        - sub_level: "246"
+          os_patch_level: "2025-12"
         # LTS meta
         - sub_level: "X"
           os_patch_level: "lts"

+ 2 - 0
.github/workflows/kernel-a13-5-10.yml

@@ -93,6 +93,8 @@ jobs:
             os_patch_level: "2025-05"
           - sub_level: "238"
             os_patch_level: "2025-07"
+          - sub_level: "243"
+            os_patch_level: "2025-10"
           # LTS meta
           - sub_level: "X"
             os_patch_level: "lts"

+ 2 - 0
.github/workflows/kernel-a13-5-15.yml

@@ -89,6 +89,8 @@ jobs:
             os_patch_level: "2025-07"
           - sub_level: "189"
             os_patch_level: "2025-09"
+          - sub_level: "194"
+            os_patch_level: "2025-12"
           - sub_level: "X"
             os_patch_level: "lts"
     uses: ./.github/workflows/build.yml

+ 1 - 1
.github/workflows/kernel-a14-6-1.yml

@@ -77,7 +77,7 @@ jobs:
             os_patch_level: "2025-08"
           - sub_level: "145"
             os_patch_level: "2025-09"
-          - sub_level: "147"
+          - sub_level: "157"
             os_patch_level: "2025-12"
           - sub_level: "X"
             os_patch_level: "lts"

+ 2 - 0
.github/workflows/kernel-a16-612.yml

@@ -30,6 +30,8 @@ jobs:
             os_patch_level: "2025-08"
           - sub_level: "38"
             os_patch_level: "2025-09"
+          - sub_level: "58"
+            os_patch_level: "2025-12"
           - sub_level: "X"
             os_patch_level: "lts"
           # Add more sublevels/patch levels as needed

+ 5 - 5
.github/workflows/kernel-custom.yml

@@ -30,11 +30,11 @@ jobs:
             sub_level: "134"
             os_patch_level: "2025-05"
             variant: "TheWildJames"
-          - android_version: "android14"
-            kernel_version: "6.1"
-            sub_level: "147"
-            os_patch_level: "2025-12"
-            variant: "MarionKernel"
+          #- android_version: "android14"
+          #  kernel_version: "6.1"
+          #  sub_level: "147"
+          #  os_patch_level: "2025-12"
+          #  variant: "MarionKernel"
 
     uses: ./.github/workflows/build.yml
     secrets: inherit