From 731a28dd731574fe5bef399a088b04104aed469b Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Mon, 15 Apr 2024 08:38:14 +0000
Subject: [PATCH] Mon Apr 15 08:37:26 UTC 2024 Kernel update

---
 .github/workflows/CI-Linux-5.10-Build.yml | 32 ++++++++++
 .github/workflows/merge-linux.yml         | 73 +++++++++++++++--------
 2 files changed, 81 insertions(+), 24 deletions(-)
 create mode 100644 .github/workflows/CI-Linux-5.10-Build.yml

diff --git a/.github/workflows/CI-Linux-5.10-Build.yml b/.github/workflows/CI-Linux-5.10-Build.yml
new file mode 100644
index 0000000000..5722cf59e9
--- /dev/null
+++ b/.github/workflows/CI-Linux-5.10-Build.yml
@@ -0,0 +1,32 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI-Build-Test-Linux-5.10
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the "main" branch
+  push:
+    branches: [ "linux-5.10" ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v4
+        with:
+          ref: linux-5.10
+
+      - name: Setup env
+        run: sudo apt-get update && sudo apt-get install -y gcc-aarch64-linux-gnu build-essential libncurses5-dev zlib1g-dev gawk flex bison quilt libssl-dev xsltproc libxml-parser-perl mercurial bzr ecj cvs unzip lsof
+      
+      - name: Build Linux 5.10 Kernel Test
+        run: |
+          make CROSS_COMPILE=aarch64-linux-gnu- ARCH=arm64 sun55i_t527_bsp_defconfig
+          make CROSS_COMPILE=aarch64-linux-gnu- ARCH=arm64 -j$(nproc)
+      
diff --git a/.github/workflows/merge-linux.yml b/.github/workflows/merge-linux.yml
index e4e76ace9f..59f36996a8 100644
--- a/.github/workflows/merge-linux.yml
+++ b/.github/workflows/merge-linux.yml
@@ -10,30 +10,30 @@ permissions:
   contents: write
 
 jobs:
-  # linux-5_10:
-  #   runs-on: ubuntu-latest
-  #   env:
-  #     KERNEL_URL: https://cdn.kernel.org/pub/linux/kernel/v5.x/
-  #     KERNEL_VERSION: linux-5.10.214
-  #     KERNEL_BRANCH: linux-5.10
-  #   steps:
-  #   - uses: actions/checkout@v3
-  #   - name: Set id
-  #     run: |
-  #       git config --global user.name "GitHub Actions"
-  #       git config --global user.email "actions@github.com"
-
-  #   - name: Merge ${{env.KERNEL_BRANCH}}
-  #     continue-on-error: true
-  #     run: ./init.sh -u  ${{env.KERNEL_URL}} -v  ${{env.KERNEL_VERSION}} -b  ${{env.KERNEL_BRANCH}}
-
-  #   - name: Push changes ${{env.KERNEL_BRANCH}}
-  #     uses: ad-m/github-push-action@master
-  #     with:
-  #       github_token: ${{ secrets.SY_PAT }}
-  #       branch: ${{env.KERNEL_BRANCH}}
-  #       directory: kernel/dst/${{env.KERNEL_BRANCH}}/${{env.KERNEL_BRANCH}}
-  #       force: true
+  linux-5_10:
+    runs-on: ubuntu-latest
+    env:
+      KERNEL_URL: https://cdn.kernel.org/pub/linux/kernel/v5.x/
+      KERNEL_VERSION: linux-5.10.214
+      KERNEL_BRANCH: linux-5.10
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set id
+      run: |
+        git config --global user.name "GitHub Actions"
+        git config --global user.email "actions@github.com"
+
+    - name: Merge ${{env.KERNEL_BRANCH}}
+      continue-on-error: true
+      run: ./init.sh -u  ${{env.KERNEL_URL}} -v  ${{env.KERNEL_VERSION}} -b  ${{env.KERNEL_BRANCH}}
+
+    - name: Push changes ${{env.KERNEL_BRANCH}}
+      uses: ad-m/github-push-action@master
+      with:
+        github_token: ${{ secrets.SY_PAT }}
+        branch: ${{env.KERNEL_BRANCH}}
+        directory: kernel/dst/${{env.KERNEL_BRANCH}}/${{env.KERNEL_BRANCH}}
+        force: true
   
   linux-5_15:
     runs-on: ubuntu-latest
@@ -59,3 +59,28 @@ jobs:
         branch: ${{env.KERNEL_BRANCH}}
         directory: kernel/dst/${{env.KERNEL_BRANCH}}/${{env.KERNEL_BRANCH}}
         force: true
+
+  linux-6_1_aosp:
+    runs-on: ubuntu-latest
+    env:
+      KERNEL_URL: https://android.googlesource.com/kernel/common.git/+archive/refs/heads/
+      KERNEL_VERSION: android14-6.1-2023-10
+      KERNEL_BRANCH: linux-6.1-aosp
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set id
+      run: |
+        git config --global user.name "GitHub Actions"
+        git config --global user.email "actions@github.com"
+        
+    - name: Merge ${{env.KERNEL_BRANCH}}
+      continue-on-error: true
+      run: ./init.sh -u  ${{env.KERNEL_URL}} -v ${{env.KERNEL_VERSION}} -b ${{env.KERNEL_BRANCH}} -t AOSP
+
+    - name: Push changes ${{env.KERNEL_BRANCH}}
+      uses: ad-m/github-push-action@master
+      with:
+        github_token: ${{ secrets.SY_PAT }}
+        branch: ${{env.KERNEL_BRANCH}}
+        directory: kernel/dst/${{env.KERNEL_BRANCH}}/${{env.KERNEL_BRANCH}}
+        force: true