diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1019+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1019+.yml index 39ae498a..6b7f4d2e 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1019+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1019+.yml @@ -114,7 +114,7 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64216: + 64551: ver: "7.2.0" kver: "4.4.302" rd-compressed: false diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml index eb2fc7f6..f644d3f5 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml @@ -88,7 +88,7 @@ builds: - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - 64216: + 64551: ver: "7.2.0" kver: "4.4.302" rd-compressed: false diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml index 0e801dc2..a064c959 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml @@ -89,7 +89,7 @@ builds: - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - 64216: + 64551: ver: "7.2.0" kver: "4.4.302" rd-compressed: false diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621xs+.yml index f21a3832..23710192 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621xs+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621xs+.yml @@ -111,7 +111,7 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64216: + 64551: ver: "7.2.0" kver: "4.4.302" rd-compressed: false diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml index 4192b07e..73cb933c 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml @@ -88,7 +88,7 @@ builds: - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - 64216: + 64551: ver: "7.2.0" kver: "4.4.302" rd-compressed: false diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml index aa3d298c..1d54bda8 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml @@ -92,7 +92,7 @@ builds: - "ramdisk-42661-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 42962: + 64551: ver: "7.1.1" kver: "3.10.108" rd-compressed: false diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml index ee64ca25..8d804225 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml @@ -113,7 +113,7 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64216: + 64551: ver: "7.2.0" kver: "4.4.302" rd-compressed: false diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml index 7e20d491..802db376 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml @@ -93,7 +93,7 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64216: + 64551: ver: "7.2.0" kver: "4.4.302" rd-compressed: false diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS916+.yml.disabled b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS916+.yml.disabled index 94f14471..73b32ecf 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS916+.yml.disabled +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS916+.yml.disabled @@ -111,7 +111,7 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64216: + 64551: ver: "7.2.0" kver: "3.10.108" rd-compressed: false diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml index 10d4db21..c850b446 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml @@ -117,7 +117,7 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64216: + 64551: ver: "7.2.0" kver: "4.4.302" rd-compressed: false diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml index 3bb743ad..3ed59635 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml @@ -90,7 +90,7 @@ builds: - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - 64216: + 64551: ver: "7.2.0" kver: "4.4.302" rd-compressed: false diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml index 99cf224c..c4244241 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml @@ -47,7 +47,7 @@ builds: - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - 64216: + 64551: ver: "7.2.0" kver: "4.4.302" rd-compressed: false diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml index a074b5c0..9ba95ef2 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml @@ -71,7 +71,7 @@ builds: - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - 64216: + 64551: ver: "7.2.0" kver: "4.4.302" rd-compressed: false diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3219.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3219.yml index 40597c9e..e49bec13 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3219.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3219.yml @@ -115,7 +115,7 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64216: + 64551: ver: "7.2.0" kver: "4.4.302" rd-compressed: false diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml index 376bdadd..22150255 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml @@ -116,7 +116,7 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64216: + 64551: ver: "7.2.0" kver: "4.4.302" rd-compressed: false diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml index 9054d396..a4f6a458 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml @@ -88,7 +88,7 @@ builds: - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - 64216: + 64551: ver: "7.2.0" kver: "4.4.302" rd-compressed: false diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/FS6400.yml.disabled b/files/board/arpl/overlayfs/opt/arpl/model-configs/FS6400.yml.disabled index 65a13383..f1ca625a 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/FS6400.yml.disabled +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/FS6400.yml.disabled @@ -87,7 +87,7 @@ builds: - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - 64216: + 64551: ver: "7.2.0" kver: "4.4.302" rd-compressed: false @@ -96,7 +96,7 @@ builds: synoinfo: <<: *synoinfo pat: - url: "https://cndl.synology.cn/download/DSM/beta/7.2/64216/DSM_FS6400_64216.pat" + url: "https://global.synologydownload.com/download/DSM/beta/7.2/64216/DSM_FS6400_64216.pat" hash: "c225b79d5154488226655cbbd2f40e14f5711643baffb7b8b15488683f28e058" ramdisk-hash: "2109e6c499636b92e84912df867d1a01755a8b73b4b625838f4782f894264879" zimage-hash: "f5a41949fb348e6fb4006ddabede35675b93bfbf126a46870dd5db99918fea1e" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml index 3b20f406..ff2bcc63 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml @@ -112,7 +112,7 @@ builds: - "ramdisk-42951-post-init-script.patch" - "ramdisk-42661-disable-disabled-ports.patch" - 64216: + 64551: ver: "7.2.0" kver: "4.4.302" rd-compressed: false diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml.disabled b/files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml.disabled index 326f802c..97e3671d 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml.disabled +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml.disabled @@ -47,7 +47,7 @@ builds: - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - 64216: + 64551: ver: "7.2.0" kver: "5.10.55" rd-compressed: false diff --git a/rssupdate.py b/rssupdate.py index ae46d20f..c997b7f3 100644 --- a/rssupdate.py +++ b/rssupdate.py @@ -115,8 +115,9 @@ def main(): # if __name__ == '__main__': models.append(filename.split(".yml")[0]) print(models) - - # Get pats + + # Get beta pats + # 临时对策, RC 64551 目前并没有在 archive.synology.com 上线, beta 又为 64216, 临时用 64216 的地址进行替换. pats = {} req = requests.get('https://prerelease.synology.com/webapi/models?event=dsm72_beta') rels = json.loads(req.text) @@ -125,7 +126,7 @@ def main(): # if __name__ == '__main__': if "name" not in i or "dsm" not in i: continue if i["name"] not in models: continue if i["name"] not in pats.keys(): pats[i["name"]]={} - pats[i["name"]][fullversion(i["dsm"]["version"])] = i["dsm"]["url"].split('?')[0] + pats[i["name"]][fullversion(i["dsm"]["version"]).replace('64216','64551')] = i["dsm"]["url"].split('?')[0].replace('beta','release').replace('64216','64551') req = requests.get('https://archive.synology.com/download/Os/DSM') req.encoding = 'utf-8' @@ -135,7 +136,7 @@ def main(): # if __name__ == '__main__': for i in l: ver = i.attrs['href'].split('/')[-1] if not any([ver.startswith('6.2.4'), ver.startswith('7')]): continue - req = requests.get('https://archive.synology.cn{}'.format(i.attrs['href'])) + req = requests.get('https://archive.synology.com{}'.format(i.attrs['href'])) req.encoding = 'utf-8' bs=BeautifulSoup(req.text, 'html.parser') p = re.compile(r"^(.*?)_(.*?)_(.*?).pat$", re.MULTILINE | re.DOTALL)