Merge pull request fbelavenuto#444 from fbelavenuto/kernel5

Changing cmdline, models contains the LKM disparator now
8khan · Dec 20, 2022 · d100d2f · d100d2f
2 parents 55cbc83 + 44217fc
commit d100d2f
Show file tree

Hide file tree

Showing 18 changed files with 22 additions and 157 deletions.
diff --git a/files/board/arpl/overlayfs/opt/arpl/boot.sh b/files/board/arpl/overlayfs/opt/arpl/boot.sh
@@ -106,7 +106,7 @@ grep -q "force_junior" /proc/cmdline && CMDLINE_LINE+="force_junior "
 [ ${EFI} -eq 1 ] && CMDLINE_LINE+="withefi "
 [ "${BUS}" = "ata" ] && CMDLINE_LINE+="synoboot_satadom=${DOM} dom_szmax=${SIZE} "
 CMDLINE_DIRECT="${CMDLINE_LINE}"
-CMDLINE_LINE+="console=ttyS0,115200n8 earlyprintk log_buf_len=32M earlycon=uart8250,io,0x3f8,115200n8 elevator=elevator root=/dev/md0 loglevel=15"
+CMDLINE_LINE+="console=ttyS0,115200n8 earlyprintk log_buf_len=32M earlycon=uart8250,io,0x3f8,115200n8 root=/dev/md0 loglevel=15"
 for KEY in ${!CMDLINE[@]}; do
   VALUE="${CMDLINE[${KEY}]}"
   CMDLINE_LINE+=" ${KEY}"

diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml
@@ -13,6 +13,7 @@ cmdline: &cmdline
   synoboot2:
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
+  elevator: elevator
 platform: "geminilake"
 unique: "synology_geminilake_1520+"
 beta: true

diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml
@@ -16,6 +16,7 @@ cmdline: &cmdline
   synoboot2:
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
+  elevator: elevator
 platform: "v1000"
 unique: "synology_v1000_1621+"
 dom: 2

diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml
@@ -16,6 +16,7 @@ cmdline: &cmdline
   synoboot2:
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
+  elevator: elevator
 platform: "v1000"
 unique: "synology_v1000_2422+"
 dom: 2

diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml
@@ -15,6 +15,7 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
+  elevator: elevator
 platform: "bromolow"
 unique: "synology_bromolow_3615xs"
 serial:

diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml
@@ -15,6 +15,7 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
+  elevator: elevator
 platform: "broadwell"
 unique: "synology_broadwell_3617xs"
 dom: 1

diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml
@@ -16,6 +16,7 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
+  elevator: elevator
 platform: "broadwellnk"
 unique: "synology_broadwellnk_3622xs+"
 dom: 1

diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml
@@ -16,6 +16,7 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
+  elevator: elevator
 platform: "apollolake"
 unique: "synology_apollolake_918+"
 dom: 2

diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml
@@ -13,6 +13,7 @@ cmdline: &cmdline
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
   vender_format_version: 2
+  elevator: elevator
 platform: "geminilake"
 unique: "synology_geminilake_920+"
 dom: 2

diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml
@@ -12,6 +12,7 @@ cmdline: &cmdline
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
   vender_format_version: 2
+  elevator: elevator
 platform: "r1000"
 unique: "synology_r1000_923+"
 beta: true

diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml
@@ -15,6 +15,7 @@ cmdline: &cmdline
   synoboot2:
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
+  elevator: elevator
 platform: "geminilake"
 unique: "synology_geminilake_dva1622"
 dom: 2

diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3219.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3219.yml
@@ -16,6 +16,7 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
+  elevator: elevator
 platform: "denverton"
 unique: "synology_denverton_dva3219"
 beta: true

diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml
@@ -14,6 +14,7 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
+  elevator: elevator
 platform: "denverton"
 unique: "synology_denverton_dva3221"
 dom: 2

diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml
@@ -13,6 +13,7 @@ cmdline: &cmdline
   synoboot2:
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
+  elevator: elevator
 platform: "v1000"
 unique: "synology_v1000_fs2500"
 beta: true

diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml
@@ -14,6 +14,7 @@ cmdline: &cmdline
   syno_hdd_detect: 0
   syno_port_thaw: 1
   vender_format_version: 2
+  elevator: elevator
 platform: "broadwellnk"
 unique: "synology_broadwellnk_rs4021xs+"
 beta: true

diff --git a/...pt/arpl/model-configs/SA6400.yml.disabled → ...erlayfs/opt/arpl/model-configs/SA6400.yml b/...pt/arpl/model-configs/SA6400.yml.disabled → ...erlayfs/opt/arpl/model-configs/SA6400.yml
@@ -12,6 +12,7 @@ cmdline: &cmdline
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
   vender_format_version: 2
+  scsi_mod.use_blk_mq: 1
 platform: "epyc7002"
 unique: "synology_epyc7002_sa6400"
 beta: true

diff --git a/rss.json b/rss.json
@@ -90,88 +90,11 @@
             "mUnique": "synology_broadwellnk_rs4021xs+",
             "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_RS4021xs%2B_42962.pat",
             "mCheckSum": "c8574a8e358fe40a7b49bbf1ddf38491"
-          }
-        ]
-      },
-      {
-        "title": "DSM 7.1.1-42951",
-        "MajorVer": 7,
-        "MinorVer": 1,
-        "NanoVer": 1,
-        "BuildPhase": 0,
-        "BuildNum": 42951,
-        "BuildDate": "2022/08/01",
-        "ReqMajorVer": 7,
-        "ReqMinorVer": 1,
-        "ReqBuildPhase": 0,
-        "ReqBuildNum": 41890,
-        "ReqBuildDate": "2021/06/25",
-        "isSecurityVersion": false,
-        "model": [
-          {
-            "mUnique": "synology_apollolake_918+",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS918%2B_42951.pat",
-            "mCheckSum": "fbdd1584dfcb1898df5f66a886a6e9b7"
-          },
-          {
-            "mUnique": "synology_geminilake_920+",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS920%2B_42951.pat",
-            "mCheckSum": "9fcb2a54b13f4e6acc3947c2165a464b"
-          },
-          {
-            "mUnique": "synology_geminilake_1520+",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS1520%2B_42951.pat",
-            "mCheckSum": "5fd40dc13c83ff14bc10fd43a7d19606"
-          },
-          {
-            "mUnique": "synology_v1000_1621+",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS1621%2B_42951.pat",
-            "mCheckSum": "4e52301c56ae5e7b03ff9ea1f8392d43"
-          },
-          {
-            "mUnique": "synology_v1000_2422+",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS2422%2B_42951.pat",
-            "mCheckSum": "40da0cb929793e3d165f5958d4a5533b"
-          },
-          {
-            "mUnique": "synology_bromolow_3615xs",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS3615xs_42951.pat",
-            "mCheckSum": "1f6831d8706d8337f06a6028037fe120"
-          },
-          {
-            "mUnique": "synology_broadwell_3617xs",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS3617xs_42951.pat",
-            "mCheckSum": "d6c61c7c84320ccc684b76ae6219e650"
-          },
-          {
-            "mUnique": "synology_broadwellnk_3622xs+",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS3622xs%2B_42951.pat",
-            "mCheckSum": "b34b7b7d21af459ae0ba6ea1f9974de6"
           },
           {
-            "mUnique": "synology_geminilake_dva1622",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DVA1622_42951.pat",
-            "mCheckSum": "6e119d8eb2c0a175a56b0bbba1f43372"
-          },
-          {
-            "mUnique": "synology_denverton_dva3219",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DVA3219_42951.pat",
-            "mCheckSum": "309b02195fb52239ee6fdfafdf157cd1"
-          },
-          {
-            "mUnique": "synology_denverton_dva3221",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DVA3221_42951.pat",
-            "mCheckSum": "59c68430cb9cd20322cb287334a4017b"
-          },
-          {
-            "mUnique": "synology_v1000_fs2500",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_FS2500_42951.pat",
-            "mCheckSum": "7b48e21c1f2090bb01d5f14a8e16a435"
-          },
-          {
-            "mUnique": "synology_broadwellnk_rs4021xs+",
-            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_RS4021xs%2B_42951.pat",
-            "mCheckSum": "e2d11981bba84b2eb6ba62b8bf2d2d28"
+            "mUnique": "synology_epyc7002_sa6400",
+            "mLink": "https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_SA6400_42962.pat",
+            "mCheckSum": "fdbbea86e280a8f754339a064f9ad2df"
           }
         ]
       },

diff --git a/rss.xml b/rss.xml
@@ -87,83 +87,10 @@
         <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_RS4021xs%2B_42962.pat</mLink>
         <mCheckSum>c8574a8e358fe40a7b49bbf1ddf38491</mCheckSum>
       </model>
-    </item>
-    <item>
-      <title>DSM 7.1.1-42951</title>
-      <MajorVer>7</MajorVer>
-      <MinorVer>1</MinorVer>
-      <BuildPhase>1</BuildPhase>
-      <BuildNum>42951</BuildNum>
-      <BuildDate>2022/08/01</BuildDate>
-      <ReqMajorVer>7</ReqMajorVer>
-      <ReqMinorVer>0</ReqMinorVer>
-      <ReqBuildPhase>0</ReqBuildPhase>
-      <ReqBuildNum>41890</ReqBuildNum>
-      <ReqBuildDate>2021/06/25</ReqBuildDate>
-      <model>
-        <mUnique>synology_apollolake_918+</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS918%2B_42951.pat</mLink>
-        <mCheckSum>fbdd1584dfcb1898df5f66a886a6e9b7</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_geminilake_920+</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS920%2B_42951.pat</mLink>
-        <mCheckSum>9fcb2a54b13f4e6acc3947c2165a464b</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_geminilake_1520+</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS1520%2B_42951.pat</mLink>
-        <mCheckSum>5fd40dc13c83ff14bc10fd43a7d19606</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_v1000_1621+</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS1621%2B_42951.pat</mLink>
-        <mCheckSum>4e52301c56ae5e7b03ff9ea1f8392d43</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_v1000_2422+</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS2422%2B_42951.pat</mLink>
-        <mCheckSum>40da0cb929793e3d165f5958d4a5533b</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_bromolow_3615xs</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS3615xs_42951.pat</mLink>
-        <mCheckSum>1f6831d8706d8337f06a6028037fe120</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_broadwell_3617xs</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS3617xs_42951.pat</mLink>
-        <mCheckSum>d6c61c7c84320ccc684b76ae6219e650</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_broadwellnk_3622xs+</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS3622xs%2B_42951.pat</mLink>
-        <mCheckSum>b34b7b7d21af459ae0ba6ea1f9974de6</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_geminilake_dva1622</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DVA1622_42951.pat</mLink>
-        <mCheckSum>6e119d8eb2c0a175a56b0bbba1f43372</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_denverton_dva3219</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DVA3219_42951.pat</mLink>
-        <mCheckSum>309b02195fb52239ee6fdfafdf157cd1</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_denverton_dva3221</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DVA3221_42951.pat</mLink>
-        <mCheckSum>59c68430cb9cd20322cb287334a4017b</mCheckSum>
-      </model>
-      <model>
-        <mUnique>synology_v1000_fs2500</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_FS2500_42951.pat</mLink>
-        <mCheckSum>7b48e21c1f2090bb01d5f14a8e16a435</mCheckSum>
-      </model>
       <model>
-        <mUnique>synology_broadwellnk_rs4021xs+</mUnique>
-        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_RS4021xs%2B_42951.pat</mLink>
-        <mCheckSum>e2d11981bba84b2eb6ba62b8bf2d2d28</mCheckSum>
+        <mUnique>synology_epyc7002_sa6400</mUnique>
+        <mLink>https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_SA6400_42962.pat</mLink>
+        <mCheckSum>fdbbea86e280a8f754339a064f9ad2df</mCheckSum>
       </model>
     </item>
     <item>