TheWildJames vor 3 Monaten
Ursprung
Commit
efadff2bc1

+ 1 - 1
.github/actions/bbg/action.yml

@@ -40,6 +40,6 @@ runs:
     - name: Enable Kernel Configs
       uses: ./.github/actions/set-kernel-config
       with:
-        fragment: ${{ github.workspace }}/wild_gki.fragment
+        config_file: ${{ github.workspace }}/kernel/common/arch/arm64/configs/gki_defconfig
         configs: |
           CONFIG_BBG

+ 1 - 1
.github/actions/droidspaces/action.yml

@@ -84,7 +84,7 @@ runs:
     - name: Enable Kernel Configs
       uses: ./.github/actions/set-kernel-config
       with:
-        fragment: ${{ github.workspace }}/wild_gki.fragment
+        config_file: ${{ github.workspace }}/kernel/common/arch/arm64/configs/gki_defconfig
         configs: |
           CONFIG_PID_NS
           CONFIG_SYSVIPC

+ 1 - 1
.github/actions/kernelsu/action.yml

@@ -66,6 +66,6 @@ runs:
     - name: Enable Kernel Configs
       uses: ./.github/actions/set-kernel-config
       with:
-        fragment: ${{ github.workspace }}/wild_gki.fragment
+        config_file: ${{ github.workspace }}/kernel/common/arch/arm64/configs/gki_defconfig
         configs: |
           CONFIG_KSU

+ 1 - 1
.github/actions/misc/action.yml

@@ -24,7 +24,7 @@ runs:
       uses: ./.github/actions/set-kernel-config
       with:
         
-        fragment: ${{ github.workspace }}/wild_gki.fragment
+        config_file: ${{ github.workspace }}/kernel/common/arch/arm64/configs/gki_defconfig
         configs: |
           CONFIG_OVERLAY_FS
           CONFIG_TMPFS_XATTR

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

@@ -22,7 +22,7 @@ runs:
     - name: Add IP SET & IPv6_NAT Support
       uses: ./.github/actions/set-kernel-config
       with:
-        fragment: ${{ github.workspace }}/wild_gki.fragment
+        config_file: ${{ github.workspace }}/kernel/common/arch/arm64/configs/gki_defconfig
         configs: |
           CONFIG_IP_SET
           CONFIG_IP_SET_MAX=65534
@@ -52,7 +52,7 @@ runs:
     - name: Apply TCP Congestion Control
       uses: ./.github/actions/set-kernel-config
       with:
-        fragment: ${{ github.workspace }}/wild_gki.fragment
+        config_file: ${{ github.workspace }}/kernel/common/arch/arm64/configs/gki_defconfig
         configs: |
           CONFIG_TCP_CONG_ADVANCED
           CONFIG_TCP_CONG_BBR

+ 27 - 11
.github/actions/set-kernel-config/action.yml

@@ -1,12 +1,13 @@
 # .github/actions/set-kernel-config/action.yml
 name: Set Kernel Config
-description: Writes kernel config values into a fragment (NO defconfig edits)
+description: Applies kernel config values directly using scripts/config (NO fragments)
 
 inputs:
   configs:
     required: true
-  fragment:
+  config_file:
     required: true
+    default: ${{ github.workspace }}/kernel/common/arch/arm64/configs/gki_defconfig
 
 runs:
   using: composite
@@ -16,15 +17,21 @@ runs:
       run: |
         set -euo pipefail
 
-        FRAGMENT="${{ inputs.fragment }}"
-        touch "${FRAGMENT}"
+        CONFIG_FILE="${{ inputs.config_file }}"
 
-        set_config() {
+        # ensure config tool exists
+        if [ ! -f scripts/config ]; then
+          echo "ERROR: scripts/config not found"
+          exit 1
+        fi
+
+        apply_config() {
           local input="$1"
 
           # trim whitespace
           input="$(echo "$input" | xargs)"
 
+          # skip empty or comments
           [[ -z "$input" || "$input" == \#* ]] && return
 
           if [[ "$input" == *"="* ]]; then
@@ -35,13 +42,22 @@ runs:
             local value="y"
           fi
 
-          # remove any existing entry (prevents duplicates/conflicts)
-          sed -i "/^${config}=/d" "${FRAGMENT}"
-
-          # write clean value
-          echo "${config}=${value}" >> "${FRAGMENT}"
+          echo "Setting: $config=$value"
+
+          case "$value" in
+            y|Y|yes|YES|1|true|TRUE)
+              ./scripts/config --file "$CONFIG_FILE" -e "$config"
+              ;;
+            n|N|no|NO|0|false|FALSE)
+              ./scripts/config --file "$CONFIG_FILE" -d "$config"
+              ;;
+            *)
+              # assume explicit value (string/int)
+              ./scripts/config --file "$CONFIG_FILE" --set-val "$config" "$value"
+              ;;
+          esac
         }
 
         while IFS= read -r line; do
-          set_config "$line"
+          apply_config "$line"
         done <<< "${{ inputs.configs }}"

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

@@ -46,7 +46,7 @@ runs:
     - name: Enable KernelSU SUSFS Config
       uses: ./.github/actions/set-kernel-config
       with:
-        fragment: ${{ github.workspace }}/wild_gki.fragment
+        config_file: ${{ github.workspace }}/kernel/common/arch/arm64/configs/gki_defconfig
         configs: |
           CONFIG_KSU_SUSFS
           CONFIG_KSU_SUSFS_SUS_PATH