try

eslee85 · Apr 9, 2022 · e49a60f · e49a60f
1 parent fc81f3e
commit e49a60f
Show file tree

Hide file tree

Showing 4 changed files with 219 additions and 31 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -21,8 +21,6 @@ jobs:
         #  两行一组，删除不需要的版本
          - platform: ds3615xs
            version: 6.2.4-25556
-         - platform: ds3615xs
-           version: 7.0-41222
          - platform: ds3615xs
            version: 7.0.1-42218
          - platform: ds918p
@@ -97,11 +95,11 @@ jobs:
           ./redpill_tool_chain.sh add https://github.com/tossp/redpill-tool-chain/raw/master/extensions/redpill-misc.json
 
       - name: 添加 jumkey.dtb !!!Create your own device tree binary!!!
-        if: matrix.platform == 'ds920p' || matrix.platform == 'ds1621p'
+        if: matrix.platform == 'ds920p' || matrix.platform == 'ds1621p' || matrix.platform == 'ds2422p'
         run: |
-          ./redpill_tool_chain.sh add https://github.com/pocopico/redpill-load/raw/develop/redpill-dtb/rpext-index.json
+          ./redpill_tool_chain.sh add https://github.com/tossp/redpill-tool-chain/raw/master/extensions/redpill-dtb.json
           echo '!!!Create your own device tree binary!!!'
-          echo 'see https://github.com/pocopico/redpill-load/blob/develop/redpill-dtb/README.md'
+          echo 'see https://github.com/jumkey/redpill-load/blob/develop/redpill-dtb/README.md'
 
       - name: 编译引导镜像
         run: |

diff --git a/extensions/redpill-dtb.json b/extensions/redpill-dtb.json
@@ -0,0 +1,23 @@
+{
+  "id": "redpill-dtb",
+  "url": "https://github.com/tossp/redpill-tool-chain/raw/master/extensions/redpill-dtb.json",
+  "info": {
+    "name": "Device tree binary",
+    "description": "Create your own device tree binary",
+    "author_url": "https://github.com/jumkey/redpill-load/raw/develop/redpill-dtb",
+    "packer_url": "https://github.com/jumkey/redpill-load/raw/develop/redpill-dtb",
+    "help_url": "https://github.com/jumkey/redpill-load/raw/develop/redpill-dtb"
+  },
+  "releases": {
+    "ds920p_42218": "https://github.com/pocopico/redpill-load/raw/develop/redpill-dtb/recipes/universal.json",
+    "ds920p_42550": "https://github.com/pocopico/redpill-load/raw/develop/redpill-dtb/recipes/universal.json",
+    "ds920p_42621": "https://github.com/pocopico/redpill-load/raw/develop/redpill-dtb/recipes/universal.json",
+    "ds920p_42661": "https://github.com/pocopico/redpill-load/raw/develop/redpill-dtb/recipes/universal.json",
+    "ds1621p_42218": "https://github.com/pocopico/redpill-load/raw/develop/redpill-dtb/recipes/universal.json",
+    "ds1621p_42621": "https://github.com/pocopico/redpill-load/raw/develop/redpill-dtb/recipes/universal.json",
+    "ds1621p_42661": "https://github.com/pocopico/redpill-load/raw/develop/redpill-dtb/recipes/universal.json",
+    "ds2422p_42218": "https://github.com/pocopico/redpill-load/raw/develop/redpill-dtb/recipes/universal.json",
+    "ds2422p_42621": "https://github.com/pocopico/redpill-load/raw/develop/redpill-dtb/recipes/universal.json",
+    "ds2422p_42661": "https://github.com/pocopico/redpill-load/raw/develop/redpill-dtb/recipes/universal.json"
+  }
+}
diff --git a/extensions/redpill-misc.json b/extensions/redpill-misc.json
@@ -9,30 +9,35 @@
     "help_url": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc"
   },
   "releases": {
-    "ds3615xs_25556": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds3615xs_41222": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds3615xs_42218": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds3615xs_42621": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds3615xs_42661": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds3617xs_42218": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds3617xs_42621": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds3617xs_42661": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds3622xsp_42218": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds3622xsp_42621": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds3622xsp_42661": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds1621p_42218": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds1621p_42621": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds1621p_42661": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "dva3221_42218": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "dva3221_42621": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "dva3221_42661": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds918p_25556": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds918p_41890": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds918p_42218": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds918p_42621": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds918p_42661": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds920p_42218": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds920p_42621": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds920p_42661": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json"
+    "ds3615xs_25556": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds3615xs_41222": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds3615xs_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds3615xs_42550": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds3615xs_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds3615xs_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds3617xs_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds3617xs_42550": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds3617xs_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds3617xs_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds3622xsp_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds3622xsp_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds3622xsp_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds1621p_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds1621p_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds1621p_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "dva3221_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "dva3221_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "dva3221_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds918p_25556": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds918p_41890": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds918p_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds918p_42550": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds918p_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds918p_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds920p_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds920p_42550": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds920p_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds920p_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds2422p_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json"
   }
 }
diff --git a/global_config.json b/global_config.json
@@ -100,6 +100,33 @@
         "branch": "42218-20211021"
       }
     },
+    {
+      "id": "ds3615xs-7.1.0-42661",
+      "platform_name": "DS3615xs",
+      "platform_version": "bromolow-7.1.0-42661",
+      "user_config_json": "ds3615xs_user_config.json",
+      "docker_base_image": "debian:8-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/bromolow-source/linux-3.10.x.txz/download",
+          "sha256": "18aecead760526d652a731121d5b8eae5d6e45087efede0da057413af0b489ed"
+        },
+        "toolkit_dev": {
+          "url": "https://sourceforge.net/projects/dsgpl/files/toolkit/DSM7.0/ds.bromolow-7.0.dev.txz/download",
+          "sha256": "a5fbc3019ae8787988c2e64191549bfc665a5a9a4cdddb5ee44c10a48ff96cdd"
+        }
+      },
+      "redpill_lkm": {
+        "source_url": "https://github.com/pocopico/redpill-lkm.git",
+        "branch": "master"
+      },
+      "redpill_load": {
+        "source_url": "https://github.com/pocopico/redpill-load.git",
+        "branch": "develop"
+      }
+    },
     {
       "id": "ds918p-6.2.4-25556",
       "platform_name": "DS918+",
@@ -186,7 +213,7 @@
       "platform_name": "DS918+",
       "platform_version": "apollolake-7.1.0-42661",
       "user_config_json": "ds918p_user_config.json",
-      "docker_base_image": "debian:10-slim",
+      "docker_base_image": "debian:8-slim",
       "compile_with": "toolkit_dev",
       "redpill_lkm_make_target": "test-v7",
       "downloads": {
@@ -235,6 +262,33 @@
         "branch": "develop"
       }
     },
+    {
+      "id": "ds3617xs-7.1.0-42661",
+      "platform_name": "DS3617xs",
+      "platform_version": "broadwell-7.1.0-42661",
+      "user_config_json": "ds3617xs_user_config.json",
+      "docker_base_image": "debian:8-slim",
+      "redpill_lkm_make_target": "dev-v7",
+      "compile_with": "toolkit_dev",
+      "downloads": {
+        "kernel": {
+          "url": "https://sourceforge.net/projects/dsgpl/files/Synology%20NAS%20GPL%20Source/25426branch/broadwell-source/linux-3.10.x.txz/download",
+          "sha256": "d3e85eb80f16a83244fcae6016ab6783cd8ac55e3af2b4240455261396e1e1be"
+        },
+        "toolkit_dev": {
+          "url": "https://sourceforge.net/projects/dsgpl/files/toolkit/DSM7.0/ds.broadwell-7.0.dev.txz/download",
+          "sha256": "e050987fbbab0c246aff2af935b1d8a4140ce490915aa4c92f3c8d163eea970c"
+        }
+      },
+      "redpill_lkm": {
+        "source_url": "https://github.com/jimmyGALLAND/redpill-lkm.git",
+        "branch": "develop"
+      },
+      "redpill_load": {
+        "source_url": "https://github.com/pocopico/redpill-load.git",
+        "branch": "develop"
+      }
+    },
     {
       "id": "ds3622xsp-7.0.1-42218",
       "platform_name": "DS3622xs+",
@@ -262,6 +316,33 @@
         "branch": "develop"
       }
     },
+    {
+      "id": "ds3622xsp-7.1.0-42661",
+      "platform_name": "DS3622xs+",
+      "platform_version": "broadwellnk-7.1.0-42661",
+      "user_config_json": "ds3622xsp_user_config-test.json",
+      "docker_base_image": "debian:10-slim",
+      "redpill_lkm_make_target": "dev-v7",
+      "compile_with": "toolkit_dev",
+      "downloads": {
+        "kernel": {
+          "url": "https://sourceforge.net/projects/dsgpl/files/Synology%20NAS%20GPL%20Source/25426branch/broadwellnk-source/linux-4.4.x.txz/download",
+          "sha256": "d3e85eb80f16a83244fcae6016ab6783cd8ac55e3af2b4240455261396e1e1be"
+        },
+        "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/dogodefi/redpill-lkm.git",
+        "branch": "develop"
+      },
+      "redpill_load": {
+        "source_url": "https://github.com/pocopico/redpill-load.git",
+        "branch": "develop"
+      }
+    },
     {
       "id": "ds920p-7.0.1-42218",
       "platform_name": "DS920+",
@@ -289,6 +370,33 @@
         "branch": "develop"
       }
     },
+    {
+      "id": "ds920p-7.1.0-42661",
+      "platform_name": "DS920+",
+      "platform_version": "geminilake-7.1.0-42661",
+      "user_config_json": "ds920p_user_config.json",
+      "docker_base_image": "debian:10-slim",
+      "compile_with": "toolkit_dev",
+      "redpill_lkm_make_target": "test-v7",
+      "downloads": {
+        "kernel": {
+          "url": "https://sourceforge.net/projects/dsgpl/files/Synology%20NAS%20GPL%20Source/25426branch/apollolake-source/linux-4.4.x.txz/download",
+          "sha256": "af815ee065775d2e569fd7176e25c8ba7ee17a03361557975c8e5a4b64230c5b"
+        },
+        "toolkit_dev": {
+          "url": "https://sourceforge.net/projects/dsgpl/files/toolkit/DSM7.0/ds.apollolake-7.0.dev.txz/download",
+          "sha256": "d349fa644392d4cfab8191243ee38aaa32bd517208c144678e0c855cb5a619ea"
+        }
+      },
+      "redpill_lkm": {
+        "source_url": "https://github.com/pocopico/redpill-lkm.git",
+        "branch": "master"
+      },
+      "redpill_load": {
+        "source_url": "https://github.com/pocopico/redpill-load.git",
+        "branch": "develop"
+      }
+    },
     {
       "id": "ds1621p-7.0.1-42218",
       "platform_name": "DS1621+",
@@ -316,6 +424,33 @@
         "branch": "develop"
       }
     },
+    {
+      "id": "ds1621p-7.1.0-42661",
+      "platform_name": "DS1621+",
+      "platform_version": "v1000-7.1.0-42661",
+      "user_config_json": "ds1621p_user_config-test.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/v1000-source/linux-4.4.x.txz/download",
+          "sha256": "d3e85eb80f16a83244fcae6016ab6783cd8ac55e3af2b4240455261396e1e1be"
+        },
+        "toolkit_dev": {
+          "url": "https://sourceforge.net/projects/dsgpl/files/toolkit/DSM7.0/ds.v1000-7.0.dev.txz/download",
+          "sha256": "6108f9f7b7f0a13ee985314aef9419303375ab7ded4112be991590339b66ecd1"
+        }
+      },
+      "redpill_lkm": {
+        "source_url": "https://github.com/jumkey/redpill-lkm.git",
+        "branch": "develop"
+      },
+      "redpill_load": {
+        "source_url": "https://github.com/pocopico/redpill-load.git",
+        "branch": "develop"
+      }
+    },
     {
       "id": "dva3221-7.0.1-42218",
       "platform_name": "DVA3221",
@@ -342,6 +477,33 @@
         "source_url": "https://github.com/dogodefi/redpill-load.git",
         "branch": "develop"
       }
+    },
+    {
+      "id": "dva3221-7.1.0-42661",
+      "platform_name": "DVA3221",
+      "platform_version": "denverton-7.1.0-42661",
+      "user_config_json": "dva3221_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/denverton-source/linux-4.4.x.txz/download",
+          "sha256": "d3e85eb80f16a83244fcae6016ab6783cd8ac55e3af2b4240455261396e1e1be"
+        },
+        "toolkit_dev": {
+          "url": "https://sourceforge.net/projects/dsgpl/files/toolkit/DSM7.0/ds.denverton-7.0.dev.txz/download",
+          "sha256": "6dc6818bad28daff4b3b8d27b5e12d0565b65ee60ac17e55c36d913462079f57"
+        }
+      },
+      "redpill_lkm": {
+        "source_url": "https://github.com/dogodefi/redpill-lkm.git",
+        "branch": "develop"
+      },
+      "redpill_load": {
+        "source_url": "https://github.com/pocopico/redpill-load.git",
+        "branch": "develop"
+      }
     }
   ]
 }