add DS3622xs+

.github/workflows/test.yml

@@ -1,6 +1,18 @@
 name: 测试构建
 
-on: [push]
+on:
+  - push
+
+workflow_dispatch:
+  inputs:
+    days:
+      description: '保留天数'
+      required: true
+      default: 1
+    minimum_runs:
+      description: '最小保留数量.'
+      required: true
+      default: 6
 
 jobs:
   build:
@@ -23,10 +35,8 @@ jobs:
          - platform: apollolake
            version: 7.0.1-42218
          - platform: broadwell
-           version: 6.2.4-25556
-         - platform: broadwell
-           version: 6.2.4-25556u2
-         - platform: broadwell
+           version: 7.0.1-42218
+         - platform: broadwellnk
            version: 7.0.1-42218
     steps:
       - name: 检出项目文件
@@ -47,7 +57,14 @@ jobs:
       - name: 配置引导镜像
         run: |
           cp sample_user_config.json ${{matrix.platform}}_user_config.json
-          sed -i -e 's\0x0001\0x0002\g' -e 's\0x46f4\0x0002\g' -e 's\1234XXX123\0123456789\g' -e 's\XXYYXXYYXXYY\00AAAAAAAAAA\g' -e 's/00AAAAAAAAAA"/&,\n\t"mac2": "00BBBBBBBBBB",\n\t"netif_num": 2/' -e 's/"synoinfo": {},/"synoinfo": {\n\t"maxlanport": "2"\n    },/' ${{matrix.platform}}_user_config.json
+          # 调整VID和PID
+          sed -i -e 's\0x0001\0x0002\g' -e 's\0x46f4\0x0002\g' ${{matrix.platform}}_user_config.json
+          # 调整SN和MAC
+          sed -i -e 's\1234XXX123\0123456789\g' -e 's\XXYYXXYYXXYY\00AAAAAAAAAA\g' ${{matrix.platform}}_user_config.json
+          # 添加更多的MAC和调整synoinfo
+          -e 's/00AAAAAAAAAA"/&,\n\t"mac2": "00BBBBBBBBBB",\n\t"netif_num": 2/' -e 's/"synoinfo": {},/"synoinfo": {\n\t"maxlanport": "2"\n    },/' ${{matrix.platform}}_user_config.json
+          # 添加驱动
+          ./redpill_tool_chain.sh add https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/rpext-index.json
           ./redpill_tool_chain.sh add https://github.com/jumkey/redpill-load/raw/develop/redpill-virtio/rpext-index.json
 
       - name: 编译引导镜像
@@ -62,8 +79,10 @@ jobs:
           if-no-files-found: error
 
       - name: 删除旧的工作流
-        uses: GitRML/delete-workflow-runs@main
+        uses: Mattraks/delete-workflow-runs@v2
         with:
-          retain_days: 1
-          keep_minimum_runs: 7
+          token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          retain_days: 30
+          keep_minimum_runs: 6
 

README.md

@@ -111,6 +111,8 @@ bromolow-7.0.1-42218
 apollolake-6.2.4-25556
 apollolake-7.0-41890
 apollolake-7.0.1-42218
+broadwell-7.0.1-42218
+broadwellnk-7.0.1-42218
 
 Custom Extensions:
 ---------------------

docker/Makefile

@@ -36,13 +36,17 @@ build_redpill_load:
 		pushd $(REDPILL_LOAD_SRC) && \
 		./build-loader.sh 'DS3615xs' '$(TARGET_VERSION)-$(TARGET_REVISION)'; \
 	fi
+	@if [ "$(TARGET_PLATFORM)" == "apollolake" ]; then \
+		pushd $(REDPILL_LOAD_SRC) && \
+		./build-loader.sh 'DS918+' '$(TARGET_VERSION)-$(TARGET_REVISION)'; \
+	fi
 	@if [ "$(TARGET_PLATFORM)" == "broadwell" ]; then \
 		pushd $(REDPILL_LOAD_SRC) && \
 		./build-loader.sh 'DS3617xs' '$(TARGET_VERSION)-$(TARGET_REVISION)'; \
 	fi
-	@if [ "$(TARGET_PLATFORM)" == "apollolake" ]; then \
+	@if [ "$(TARGET_PLATFORM)" == "broadwellnk" ]; then \
 		pushd $(REDPILL_LOAD_SRC) && \
-		./build-loader.sh 'DS918+' '$(TARGET_VERSION)-$(TARGET_REVISION)'; \
+		./build-loader.sh 'DS3622xs+' '$(TARGET_VERSION)-$(TARGET_REVISION)'; \
 	fi
 
 .PHONY: build_all

global_config.json

@@ -200,6 +200,32 @@
         "source_url": "https://github.com/jimmyGALLAND/redpill-load.git",
         "branch": "develop"
       }
+    },
+    {
+      "id": "broadwellnk-7.0.1-42218",
+      "platform_version": "broadwellnk-7.0.1-42218",
+      "user_config_json": "broadwellnk_user_config.json",
+      "docker_base_image": "debian:10-slim",
+      "compile_with": "toolkit_dev",
+      "redpill_lkm_make_target": "dev-v7",
+      "downloads": {
+        "kernel": {
+          "url": "https://sourceforge.net/projects/dsgpl/files/Synology%20NAS%20GPL%20Source/25426branch/broadwellnk-source/linux-4.4.x.txz/download",
+          "sha256": "c485cd73aa66f8437f9deafa654be04a726e0a46a7b55a09c4f7cd2418e92cca"
+        },
+        "toolkit_dev": {
+          "url": "https://sourceforge.net/projects/dsgpl/files/toolkit/DSM7.0/ds.broadwellnk-7.0.dev.txz/download",
+          "sha256": "0d9edca67d9e7e14c2529bbb58341b623936124d5264f71f1e4acbacf3ea202d"
+        }
+      },
+      "redpill_lkm": {
+        "source_url": "https://github.com/jumkey/redpill-lkm.git",
+        "branch": "develop"
+      },
+      "redpill_load": {
+        "source_url": "https://github.com/jumkey/redpill-load.git",
+        "branch": "develop"
+      }
     }
   ]
 }