Ver Fonte

fix(action): ensure SKIP_MRPROPER is set in build script and update condition for reverting Android 16 6.12 Fake Patches

TheWildJames há 4 meses atrás
pai
commit
aecaa2e06d

+ 1 - 0
.github/actions/build-kernel/action.yml

@@ -13,6 +13,7 @@ runs:
         SKIP_VENDOR_BOOT=1 \
         SKIP_EXT_MODULES=1 \
         SKIP_CP_KERNEL_HDR=1 \
+        SKIP_MRPROPER=1 \
         LTO=thin \
         GKI_DEFCONFIG_FRAGMENT="${{ github.workspace }}/wild_gki.fragment" \
         BUILD_CONFIG=common/build.config.gki.aarch64 \

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

@@ -271,13 +271,13 @@ runs:
 
     - name: Revert Android 16 6.12 Fake Patches
       shell: bash
-      if: inputs.kernel_version == '6.12' && inputs.android_version == 'android16'
+      if: inputs.kernel_version == '6.12' && inputs.android_version == 'android16' && false
       working-directory: ${{ github.workspace }}/kernel/common
       run: |
         echo "Reverting 6.12 Fake Patches"
         if [ "${{ inputs.sublevel }}" -ge "58" ]; then
           echo "Reverting exec.c Android 16 6.12 Fake Patch"
-          sed -i '/^#include <linux\/ksh.h>$/a #include <linux/dma-buf.h>' fs/exec.c
+          sed -i '/linux\/ksh.h/a #include <linux/dma-buf.h>' fs/exec.c
         fi
 
     - name: Apply Kernel SUSFS Patches