TheWildJames 3 miesięcy temu
rodzic
commit
5d5294ff4e

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

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

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

@@ -13,7 +13,7 @@ runs:
   steps:
   - name: 'Build Kernel'
     shell: bash
-    working-directory: ${{ github.workspace }}/kernel
+    working-directory: ${{ github.workspace }}/kernel/common
     run: |
       set -euo pipefail
       if [ "${{ inputs.bypass }}" = "true" ]; then
@@ -34,6 +34,12 @@ runs:
         echo "Bypass hack not applied as per input parameter."
       fi
   
+      make O=/home/runner/out savedefconfig
+      echo "Before patching, defconfig content:"
+      cat arch/arm64/configs/gki_defconfig
+      cp /home/runner/out/defconfig arch/arm64/configs/gki_defconfig
+      echo "After patching, defconfig content:"
+      cat arch/arm64/configs/gki_defconfig
       rm -rf /home/runner/out
       mkdir -p /home/runner/out
 

+ 7 - 1
.github/actions/download-kernel/action.yml

@@ -146,4 +146,10 @@ runs:
         COMMIT_MSG=$(git log -1 --format=%s)
 
         echo "Kernel common commit date: $COMMIT_DATE"
-        echo "Kernel common commit msg: $COMMIT_MSG"
+        echo "Kernel common commit msg: $COMMIT_MSG"
+
+    - name: Generate .config
+      shell: bash
+      working-directory: ${{ github.workspace }}/kernel/common
+      run: |
+        make O=/home/runner/out gki_defconfig AARCH=arm64

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

@@ -69,7 +69,6 @@ runs:
     - name: Enable Kernel Configs
       uses: ./.github/actions/set-kernel-config
       with:
-        config_file: common/arch/arm64/configs/gki_defconfig
         configs: |
           CONFIG_PID_NS
           CONFIG_SYSVIPC

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

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

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

@@ -23,7 +23,6 @@ runs:
     - name: Enable Kernel Configs
       uses: ./.github/actions/set-kernel-config
       with:
-        config_file: common/arch/arm64/configs/gki_defconfig
         configs: |
           CONFIG_OVERLAY_FS
           CONFIG_TMPFS_XATTR

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

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

+ 1 - 4
.github/actions/set-kernel-config/action.yml

@@ -5,9 +5,6 @@ description: Applies kernel config values directly using scripts/config (NO frag
 inputs:
   configs:
     required: true
-  config_file:
-    required: true
-    default: common/arch/arm64/configs/gki_defconfig
 
 runs:
   using: composite
@@ -18,7 +15,7 @@ runs:
       run: |
         set -euo pipefail
 
-        CONFIG_FILE="${{ inputs.config_file }}"
+        CONFIG_FILE="/home/runner/out/.config "
 
         # ensure config tool exists
         if [ ! -f common/scripts/config ]; then

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

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