Explorar el Código

ci(workflow): simplify kernel config application in build workflow

Remove wrapper function for applying kernel configurations and clean up commented-out commands to make the workflow more straightforward
TheWildJames hace 1 año
padre
commit
b739c6b5a9
Se han modificado 1 ficheros con 76 adiciones y 83 borrados
  1. 76 83
      .github/workflows/build.yml

+ 76 - 83
.github/workflows/build.yml

@@ -216,94 +216,87 @@ jobs:
           cp "../../../kernel_patches/samsung/min_kdp/min_kdp.c" min_kdp.c
           echo "obj-y += min_kdp.o" >> Makefile
 
-
       - name: Apply Kernel Configuration
         run: |
           cd "$CONFIG"
           
-          # Function to apply kernel configurations
-          apply_kernel_configs() {
-            local defconfig="./common/arch/arm64/configs/gki_defconfig"
-            
-            echo "Applying kernel configurations..."
-            
-            # KernelSU Core Configuration
-            cat >> "$defconfig" << 'EOF'
-            # === KernelSU Configuration ===
-            CONFIG_KSU=y
-            CONFIG_KSU_KPROBES_HOOK=n
-
-            # Mountify Support
-            CONFIG_TMPFS_XATTR=y
-            CONFIG_TMPFS_POSIX_ACL=y
-
-            # === Networking Configuration ===
-            # Netfilter TTL/HL support
-            CONFIG_IP_NF_TARGET_TTL=y
-            CONFIG_IP6_NF_TARGET_HL=y
-            CONFIG_IP6_NF_MATCH_HL=y
-
-            # BBR TCP Congestion Control
-            CONFIG_TCP_CONG_ADVANCED=y
-            CONFIG_TCP_CONG_BBR=y
-            CONFIG_NET_SCH_FQ=y
-            CONFIG_TCP_CONG_BIC=n
-            CONFIG_TCP_CONG_WESTWOOD=n
-            CONFIG_TCP_CONG_HTCP=n
-
-            # IPSet support
-            CONFIG_IP_SET=y
-            CONFIG_IP_SET_MAX=256
-            CONFIG_IP_SET_BITMAP_IP=y
-            CONFIG_IP_SET_BITMAP_IPMAC=y
-            CONFIG_IP_SET_BITMAP_PORT=y
-            CONFIG_IP_SET_HASH_IP=y
-            CONFIG_IP_SET_HASH_IPPORT=y
-            CONFIG_IP_SET_HASH_IPPORTIP=y
-            CONFIG_IP_SET_HASH_IPPORTNET=y
-            CONFIG_IP_SET_HASH_NET=y
-            CONFIG_IP_SET_HASH_NETNET=y
-            CONFIG_IP_SET_HASH_NETPORT=y
-            CONFIG_IP_SET_HASH_NETIFACE=y
-
-            # === SUSFS Configuration ===
-            # SUSFS Core
-            CONFIG_KSU_SUSFS=y
-            CONFIG_KSU_SUSFS_HAS_MAGIC_MOUNT=y
-            CONFIG_KSU_SUSFS_SUS_PATH=y
-            CONFIG_KSU_SUSFS_SUS_MOUNT=y
-
-            # SUSFS Auto Mount Features
-            CONFIG_KSU_SUSFS_AUTO_ADD_SUS_KSU_DEFAULT_MOUNT=y
-            CONFIG_KSU_SUSFS_AUTO_ADD_SUS_BIND_MOUNT=y
-            CONFIG_KSU_SUSFS_TRY_UMOUNT=y
-            CONFIG_KSU_SUSFS_AUTO_ADD_TRY_UMOUNT_FOR_BIND_MOUNT=y
-
-            # SUSFS Advanced Features
-            CONFIG_KSU_SUSFS_SUS_KSTAT=y
-            CONFIG_KSU_SUSFS_SUS_OVERLAYFS=n
-            CONFIG_KSU_SUSFS_SPOOF_UNAME=y
-            CONFIG_KSU_SUSFS_SPOOF_CMDLINE_OR_BOOTCONFIG=y
-            CONFIG_KSU_SUSFS_OPEN_REDIRECT=y
-
-            # SUSFS Debugging and Security
-            CONFIG_KSU_SUSFS_ENABLE_LOG=y
-            CONFIG_KSU_SUSFS_HIDE_KSU_SUSFS_SYMBOLS=y
-            CONFIG_KSU_SUSFS_SUS_SU=n
-
-            # === Build Optimization Configuration ===
-            CONFIG_LTO_CLANG_THIN=y
-            CONFIG_LTO_CLANG=y
-            CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-            CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3=n
-            EOF
-          }
-          
-          # Apply all configurations
-          apply_kernel_configs
+          defconfig="./common/arch/arm64/configs/gki_defconfig"
+          
+          echo "Applying kernel configurations..."
+          
+          # KernelSU Core Configuration
+          cat >> "$defconfig" << 'EOF'
+          # === KernelSU Configuration ===
+          CONFIG_KSU=y
+          CONFIG_KSU_KPROBES_HOOK=n
+
+          # Mountify Support
+          CONFIG_TMPFS_XATTR=y
+          CONFIG_TMPFS_POSIX_ACL=y
+
+          # === Networking Configuration ===
+          # Netfilter TTL/HL support
+          CONFIG_IP_NF_TARGET_TTL=y
+          CONFIG_IP6_NF_TARGET_HL=y
+          CONFIG_IP6_NF_MATCH_HL=y
+
+          # BBR TCP Congestion Control
+          CONFIG_TCP_CONG_ADVANCED=y
+          CONFIG_TCP_CONG_BBR=y
+          CONFIG_NET_SCH_FQ=y
+          CONFIG_TCP_CONG_BIC=n
+          CONFIG_TCP_CONG_WESTWOOD=n
+          CONFIG_TCP_CONG_HTCP=n
+
+          # IPSet support
+          CONFIG_IP_SET=y
+          CONFIG_IP_SET_MAX=256
+          CONFIG_IP_SET_BITMAP_IP=y
+          CONFIG_IP_SET_BITMAP_IPMAC=y
+          CONFIG_IP_SET_BITMAP_PORT=y
+          CONFIG_IP_SET_HASH_IP=y
+          CONFIG_IP_SET_HASH_IPPORT=y
+          CONFIG_IP_SET_HASH_IPPORTIP=y
+          CONFIG_IP_SET_HASH_IPPORTNET=y
+          CONFIG_IP_SET_HASH_NET=y
+          CONFIG_IP_SET_HASH_NETNET=y
+          CONFIG_IP_SET_HASH_NETPORT=y
+          CONFIG_IP_SET_HASH_NETIFACE=y
+
+          # === SUSFS Configuration ===
+          # SUSFS Core
+          CONFIG_KSU_SUSFS=y
+          CONFIG_KSU_SUSFS_HAS_MAGIC_MOUNT=y
+          CONFIG_KSU_SUSFS_SUS_PATH=y
+          CONFIG_KSU_SUSFS_SUS_MOUNT=y
+
+          # SUSFS Auto Mount Features
+          CONFIG_KSU_SUSFS_AUTO_ADD_SUS_KSU_DEFAULT_MOUNT=y
+          CONFIG_KSU_SUSFS_AUTO_ADD_SUS_BIND_MOUNT=y
+          CONFIG_KSU_SUSFS_TRY_UMOUNT=y
+          CONFIG_KSU_SUSFS_AUTO_ADD_TRY_UMOUNT_FOR_BIND_MOUNT=y
+
+          # SUSFS Advanced Features
+          CONFIG_KSU_SUSFS_SUS_KSTAT=y
+          CONFIG_KSU_SUSFS_SUS_OVERLAYFS=n
+          CONFIG_KSU_SUSFS_SPOOF_UNAME=y
+          CONFIG_KSU_SUSFS_SPOOF_CMDLINE_OR_BOOTCONFIG=y
+          CONFIG_KSU_SUSFS_OPEN_REDIRECT=y
+
+          # SUSFS Debugging and Security
+          CONFIG_KSU_SUSFS_ENABLE_LOG=y
+          CONFIG_KSU_SUSFS_HIDE_KSU_SUSFS_SYMBOLS=y
+          CONFIG_KSU_SUSFS_SUS_SU=n
+
+          # === Build Optimization Configuration ===
+          CONFIG_LTO_CLANG_THIN=y
+          CONFIG_LTO_CLANG=y
+          CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+          CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3=n
+          EOF
           
           # Remove check_defconfig
-          sed -i 's/check_defconfig//' ./common/build.config.gki
+          #sed -i 's/check_defconfig//' ./common/build.config.gki
 
       - name: Change Kernel Name
         run: |
@@ -326,7 +319,7 @@ jobs:
               
           #Remove Abi Exports and Error
           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
+          #perl -pi -e 's/^\s*"protected_exports_list"\s*:\s*"android\/abi_gki_protected_exports_aarch64",\s*$//;' ./common/BUILD.bazel
 
       - name: Detect Clang Version from Configs
         run: |