workflows

5kind · Nov 14, 2023 · d576795 · d576795
1 parent 167a060
commit d576795
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 17 deletions.
diff --git a/.github/workflows/zbuild-kernel.yml b/.github/workflows/zbuild-kernel.yml
@@ -19,6 +19,7 @@ jobs:
     - name: 工作配置
       run: |
         echo "LXC_DOCKER=$(cat config.env | grep -w "LXC_DOCKER" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
+        echo "ENABLE_NETHUNTER=$(cat config.env | grep -w "ENABLE_KERNELSU" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
         echo "METHOD_OK=$(cat config.env | grep -w "METHOD_OK" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
         echo "ENABLE_KVM=$(cat config.env | grep -w "ENABLE_KVM" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
         echo "LXC_PATCH=$(cat config.env | grep -w "LXC_PATCH" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
@@ -197,6 +198,23 @@ jobs:
             sh ../custom.sh android-kernel/arch/arm64/configs/${{ env.KERNEL_CONFIG }}
 
 
+    - name: Setup Kali-Nethunter  
+      if: env.ENABLE_NETHUNTER == 'true'
+      run: |
+              cd $GITHUB_WORKSPACE/kernel_workspace/android-kernel
+              git clone https://github.com/tomxi1997/kali-nethunter_patches.git
+              patch -p1 < kali-nethunter_patches/add-rtl88xxau-5.6.4.2-drivers.patch
+              patch -p1 < kali-nethunter_patches/add-wifi-injection-4.14.patch
+              #patch -p1 < kali-nethunter_patches/add-wifi-injection.patch
+              patch -p1 < kali-nethunter_patches/fix-ath9k-naming-conflict.patch
+              sleep 8
+              git clone https://github.com/Biohazardousrom/Kali-defconfig-checker.git kali
+              cd kali
+              chmod +x *.sh
+              chmod +x check-kernel-config
+              ./check-kernel-config $GITHUB_WORKSPACE/kernel_workspace/android-kernel/arch/${{ env.ARCH }}/configs/${{ env.KERNEL_CONFIG }} -w
+
+
     - name: 开启KSU
       if: env.ENABLE_KERNELSU == 'true'
       run: |
@@ -260,9 +278,21 @@ jobs:
             fi
         fi
         
-        
+    - name: 制作Anykernel3卡刷包
+      if: env.CHECK_FILE_IS_OK == 'true'
+      run: |
+          cd $GITHUB_WORKSPACE/kernel_workspace
+          git clone https://github.com/osm0sis/AnyKernel3
+          sed -i 's/do.devicecheck=1/do.devicecheck=0/g' AnyKernel3/anykernel.sh
+          sed -i 's!block=/dev/block/platform/omap/omap_hsmmc.0/by-name/boot;!block=auto;!g' AnyKernel3/anykernel.sh
+          sed -i 's/is_slot_device=0;/is_slot_device=auto;/g' AnyKernel3/anykernel.sh
+          cp android-kernel/out/arch/${{ env.ARCH }}/boot/${{ env.KERNEL_IMAGE_NAME }} AnyKernel3/
+          if [ ${{ env.CHECK_DTBO_IS_OK }} = true ]; then
+              cp android-kernel/out/arch/${{ env.ARCH }}/boot/dtbo.img AnyKernel3/
+          fi
+          rm -rf AnyKernel3/.git* AnyKernel3/README.md
   
-
+          
     - name: 检查编译内核生成文件
       run: |
        cd $GITHUB_WORKSPACE/kernel_workspace
@@ -280,22 +310,8 @@ jobs:
                exit 1
            fi
        fi
-       android-kernel/scripts/extract-ikconfig android-kernel/out/arch/${{ env.ARCH }}/boot/${{ env.KERNEL_IMAGE_NAME }}
+       android-kernel/scripts/extract-ikconfig android-kernel/out/arch/${{ env.ARCH }}/boot/${{ env.KERNEL_IMAGE_NAME }} | tee AnyKernel3/.config
   
-    - name: 制作Anykernel3卡刷包
-      if: env.CHECK_FILE_IS_OK == 'true'
-      run: |
-        cd $GITHUB_WORKSPACE/kernel_workspace
-        git clone https://github.com/osm0sis/AnyKernel3
-        sed -i 's/do.devicecheck=1/do.devicecheck=0/g' AnyKernel3/anykernel.sh
-        sed -i 's!block=/dev/block/platform/omap/omap_hsmmc.0/by-name/boot;!block=auto;!g' AnyKernel3/anykernel.sh
-        sed -i 's/is_slot_device=0;/is_slot_device=auto;/g' AnyKernel3/anykernel.sh
-        cp android-kernel/out/arch/${{ env.ARCH }}/boot/${{ env.KERNEL_IMAGE_NAME }} AnyKernel3/
-        if [ ${{ env.CHECK_DTBO_IS_OK }} = true ]; then
-            cp android-kernel/out/arch/${{ env.ARCH }}/boot/dtbo.img AnyKernel3/
-        fi
-        rm -rf AnyKernel3/.git* AnyKernel3/README.md
-
     - name: 制作合成新的内核镜像
       if: env.HAVE_SOURCE_BOOT_IMAGE == 'true' && env.CHECK_FILE_IS_OK == 'true'
       run: |

diff --git a/config.env b/config.env
@@ -52,6 +52,10 @@ CLANG_VERSION=clang-r416183b
 # 开启 LXC and DOCKER
 LXC_DOCKER=true
 
+#Kali-Nethunter支持，默认关闭，支持内核版本4.4-4.19。旧的内核版本或补丁失败的参考kali官方补丁https://gitlab.com/kalilinux/nethunter/build-scripts/kali-nethunter-kernel
+#仅Build kernel by clang-r383902b支持。https://www.kali.org/docs/nethunter/nethunter-kernel-2-config-1/
+ENABLE_NETHUNTER=true
+
 # 是否打入LXC补丁
 LXC_PATCH=false