TheWildJames hai 3 meses
pai
achega
7540110036

+ 0 - 5
.github/actions/apply-kernel-branding/action.yml

@@ -24,11 +24,6 @@ runs:
       shell: bash
       shell: bash
       working-directory: ${{ github.workspace }}/kernel/common
       working-directory: ${{ github.workspace }}/kernel/common
       run: |
       run: |
-        CONFIG_FRAGMENT="${{ github.workspace }}/wild_gki.fragment"
-        touch "$CONFIG_FRAGMENT"
-
-        DEFCONFIG="${{ github.workspace }}/kernel/common/arch/arm64/configs/gki_defconfig"
-
         VERSION="${{ inputs.version }}"
         VERSION="${{ inputs.version }}"
         ANDROID_PART=$(echo "$VERSION" | cut -d- -f1)
         ANDROID_PART=$(echo "$VERSION" | cut -d- -f1)
         KERNEL_PART=$(echo "$VERSION" | cut -d- -f2)
         KERNEL_PART=$(echo "$VERSION" | cut -d- -f2)

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

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

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

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

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

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

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

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

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

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

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

@@ -7,13 +7,14 @@ inputs:
     required: true
     required: true
   config_file:
   config_file:
     required: true
     required: true
-    default: ${{ github.workspace }}/kernel/common/arch/arm64/configs/gki_defconfig
+    default: common/arch/arm64/configs/gki_defconfig
 
 
 runs:
 runs:
   using: composite
   using: composite
   steps:
   steps:
     - name: Apply configs
     - name: Apply configs
       shell: bash
       shell: bash
+      working-directory: ${{ github.workspace }}/kernel
       run: |
       run: |
         set -euo pipefail
         set -euo pipefail
 
 
@@ -46,14 +47,14 @@ runs:
 
 
           case "$value" in
           case "$value" in
             y|Y|yes|YES|1|true|TRUE)
             y|Y|yes|YES|1|true|TRUE)
-              ./scripts/config --file "$CONFIG_FILE" -e "$config"
+              common/scripts/config --file "$CONFIG_FILE" -e "$config"
               ;;
               ;;
             n|N|no|NO|0|false|FALSE)
             n|N|no|NO|0|false|FALSE)
-              ./scripts/config --file "$CONFIG_FILE" -d "$config"
+              common/scripts/config --file "$CONFIG_FILE" -d "$config"
               ;;
               ;;
             *)
             *)
               # assume explicit value (string/int)
               # assume explicit value (string/int)
-              ./scripts/config --file "$CONFIG_FILE" --set-val "$config" "$value"
+              common/scripts/config --file "$CONFIG_FILE" --set-val "$config" "$value"
               ;;
               ;;
           esac
           esac
         }
         }

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

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