Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add support DS3615xs-DS918p 7.0.1-42218/new PAT and config platform ds3617xs 6.2.4-25556/6.2.4-25556u2 #50

Closed
wants to merge 9 commits into from
Closed

add support DS3615xs-DS918p 7.0.1-42218/new PAT and config platform ds3617xs 6.2.4-25556/6.2.4-25556u2 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2e654ed
ajout 7.0.1-42218 pour DS918+ et DS3615xs
jimmyGALLAND Oct 23, 2021
87c04a0
update
jimmyGALLAND Oct 23, 2021
48dde9c
update2
jimmyGALLAND Oct 23, 2021
6bed6cf
patch bsp for DS918+/7.0.1-42218
jimmyGALLAND Oct 23, 2021
a2f6255
add test ds3617xs 6.2.4-25556
jimmyGALLAND Dec 14, 2021
54f487c
add test ds3617xs 6.2.4-25556u2
jimmyGALLAND Dec 15, 2021
66a6d37
add support extract info GRUB, rd, zimage from flashupdate package fr…
jimmyGALLAND Dec 15, 2021
4dfac35
modify bundled-exts
Dec 21, 2021
6ede58f
Merge pull request #1 from jimmyGALLAND/change_bundled-exts
jimmyGALLAND Dec 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions build-loader.sh
View file
Open in desktop
Expand Up @@ -205,6 +205,7 @@ if [ ! -d "${BRP_UPAT_DIR}" ]; then

brp_verify_file_sha256 "${BRP_PAT_FILE}" "$(brp_json_get_field "${BRP_REL_CONFIG_JSON}" "os.sha256")"
brp_unpack_tar "${BRP_PAT_FILE}" "${BRP_UPAT_DIR}"

else
pr_info "Found unpacked PAT at \"%s\" - skipping unpacking" "${BRP_UPAT_DIR}"
fi
Expand All @@ -213,6 +214,16 @@ fi
##### LINUX KERNEL MODIFICATIONS #######################################################################################
# Prepare Linux kernel image
readonly BRP_ZLINUX_FILE=${BRP_UPAT_DIR}/$(brp_json_get_field "${BRP_REL_CONFIG_JSON}" 'files.zlinux.name')

if [ ! -f "${BRP_ZLINUX_FILE}" ]; then
pr_info "No zimage in Unpacked PAT - Try to find flashupdate package" "${BRP_PAT_FILE}"
readonly BRP_FLASHUPDATE_DEBFILE=$( ls -d ${BRP_UPAT_DIR}/flashupdate_*.deb | head -n1 )
if [ -f "${BRP_FLASHUPDATE_DEBFILE}" ]; then
pr_process "flashupdate found unpack"
"${DPKG_PATH}" -x "${BRP_FLASHUPDATE_DEBFILE}" "${BRP_UPAT_DIR}"
fi
fi

readonly BRP_ZLINUX_PATCHED_FILE="${BRP_BUILD_DIR}/zImage-patched"
if [ ! -f "${BRP_ZLINUX_PATCHED_FILE}" ]; then
# Using repack method to patch the kernel. This method assumes that it will be interrupted, someone will go and look
Expand Down
3 changes: 1 addition & 2 deletions bundled-exts.json
View file
Open in desktop
@@ -1,4 +1,3 @@
{
"thethorgroup.virtio": "https://raw.githubusercontent.com/RedPill-TTG/redpill-virtio/master/rpext-index.json",
"thethorgroup.boot-wait": "https://raw.githubusercontent.com/RedPill-TTG/redpill-boot-wait/master/rpext-index.json"
"thethorgroup.jg.virtio": "https://raw.githubusercontent.com/jimmyGALLAND/redpill-ext/master/virtio/rpext-index.json"
}
117 changes: 117 additions & 0 deletions config/DS3615xs/7.0.1-42218/config.json
View file
Open in desktop
@@ -0,0 +1,117 @@
{
"os": {
"id": "ds3615xs_42218",
"pat_url": "https://cndl.synology.cn/download/DSM/release/7.0.1/42218/DSM_DS3615xs_42218.pat",
"sha256": "dddd26891815ddca02d0d53c1d42e8b39058b398a4cc7b49b80c99f851cf0ef7"
},

"files": {
"zlinux": {
"name": "zImage",
"sha256": "d29b695612710376734cb5c5b5ae4f2d8afc49ffd640387e1c86010f6c7d2c8a"
},
"ramdisk": {
"name": "rd.gz",
"sha256": "4c90c3c7ee25b5fcc651552e80a9364d22823c863c834c5f43e3344a3a68af78"
},
"vmlinux": {
"sha256": "69569a0703fcd0a3a492dd1066eb6c3b90ea41e5793a5eac960d27b6f3afa916"
}
},

"patches": {
"_comment": ".bsp patches are applied to FILES using bspatch(1); .patch are applied to DIRECTORIES using patch(1)",
"zlinux": [
"zImage-001-3615xs-42218-ramdisk-and-header.bsp"
],
"ramdisk": [
"@@@COMMON@@@/ramdisk-001-disable-root-pwd.patch",
"@@@COMMON@@@/ramdisk-002-init-script-NEW-name.patch",
"@@@COMMON@@@/ramdisk-003-post-init-script-UPPER.patch"
]
},
"synoinfo": {
"maxdisks": "15",
"internalportcfg": "0x78FF",
"esataportcfg": "0x0",
"usbportcfg": "0x8700",
"rss_server": "http://example.com/null.xml",
"rss_server_ssl": "https://example.com/null.xml",
"small_info_path": "https://example.com/null",
"updateurl": "http://example.com/",
"myds_region_api_base_url": "https://example.com"
},
"grub": {
"template": "@@@COMMON@@@/grub-template.conf",
"base_cmdline": {
"sn": "",
"vid": "0x46f4",
"pid": "0x0001",
"mac1": "",
"netif_num": 1,

"syno_hw_version": "DS3615xs",
"syno_hdd_powerup_seq": 0,
"HddHotplug": 0,
"vender_format_version": 2,
"console": "ttyS0,115200n8",
"withefi": null,
"elevator": "elevator",
"syno_port_thaw": 1,
"syno_hdd_detect": 0,
"root": "/dev/md0",
"earlycon": "uart8250,io,0x3f8,115200n8"
},
"menu_entries": {
"RedPill DS3615xs v7.0.1-42218 Beta (USB, Verbose)": {
"options": [
"savedefault",
"set root=(hd0,msdos1)",
"echo Loading Linux...",
"linux /zImage @@@CMDLINE@@@",
"echo Loading initramfs...",
"initrd /rd.gz /custom.gz",
"echo Starting kernel with USB boot"
],
"cmdline": {
"earlyprintk": null,
"loglevel": 15,
"log_buf_len": "32M"
}
},
"RedPill DS3615xs v7.0.1-42218 Beta (SATA, Verbose)": {
"options": [
"savedefault",
"set root=(hd0,msdos1)",
"echo Loading Linux...",
"linux /zImage @@@CMDLINE@@@",
"echo Loading initramfs...",
"initrd /rd.gz /custom.gz",
"echo Starting kernel with SATA boot"
],
"cmdline": {
"earlyprintk": null,
"loglevel": 15,
"synoboot_satadom": 1,
"log_buf_len": "32M"
}
}
}
},
"extra": {
"compress_rd": false,
"ramdisk_copy": {
"@@@EXT@@@/rp-lkm/redpill-linux-v3.10.108.ko": "usr/lib/modules/rp.ko",
"@@@COMMON@@@/iosched-trampoline.sh": "usr/sbin/modprobe"
},
"bootp1_copy": {
"@@@PAT@@@/GRUB_VER": "GRUB_VER"
},
"bootp2_copy": {
"@@@PAT@@@/GRUB_VER": "GRUB_VER",
"@@@PAT@@@/grub_cksum.syno": "grub_cksum.syno",
"@@@PAT@@@/rd.gz": "rd.gz",
"@@@PAT@@@/zImage": "zImage"
}
}
}
Binary file added config/DS3615xs/7.0.1-42218/zImage-001-3615xs-42218-ramdisk-and-header.bsp
View file
Open in desktop
Binary file not shown.
118 changes: 118 additions & 0 deletions config/DS3617xs/6.2.4-25556/config.json
View file
Open in desktop
@@ -0,0 +1,118 @@
{
"os": {
"id": "ds3617xs_25556",
"pat_url": "https://cndl.synology.cn/download/DSM/release/6.2.4/25556/DSM_DS3617xs_25556.pat",
"sha256": "10f25d807ed4373ff3b17f2172adaec8a00415a335143a89e2494a76dac34cf6"
},

"files": {
"zlinux": {
"name": "zImage",
"sha256": "63c1832b4af3eeb7dd6e788d2cace0773b4a51f93045d1a98674bd2ce7a343d0"
},
"ramdisk": {
"name": "rd.gz",
"sha256": "5aad9fd02535af464eba1441ed5f95c327873134c62c63a0352a10b8299614ec"
},
"vmlinux": {
"sha256": "7a106de283904e78e4ea7cb737aa33cb915eeae81f40f041d46633c1714a7b0e"
}
},

"patches": {
"_comment": ".bsp patches are applied to FILES using bspatch(1); .patch are applied to DIRECTORIES using patch(1)",
"zlinux": [
"zImage-001-3617xs-25556-ramdisk-and-header.bsp"
],
"ramdisk": [
"@@@COMMON@@@/ramdisk-001-disable-root-pwd.patch",
"@@@COMMON@@@/ramdisk-002-init-script-OLD-name.patch",
"@@@COMMON@@@/ramdisk-003-post-init-script-LOWER.patch"

]
},
"synoinfo": {
"maxdisks": "15",
"internalportcfg": "0x78FF",
"esataportcfg": "0x0",
"usbportcfg": "0x8700",
"rss_server": "http://example.com/null.xml",
"rss_server_ssl": "https://example.com/null.xml",
"small_info_path": "https://example.com/null",
"updateurl": "http://example.com/",
"myds_region_api_base_url": "https://example.com"
},
"grub": {
"template": "@@@COMMON@@@/grub-template.conf",
"base_cmdline": {
"sn": "",
"vid": "0x46f4",
"pid": "0x0001",
"mac1": "",
"netif_num": 1,

"syno_hw_version": "DS3617xs",
"syno_hdd_powerup_seq": 0,
"HddHotplug": 0,
"vender_format_version": 2,
"console": "ttyS0,115200n8",
"withefi": null,
"elevator": "elevator",
"syno_port_thaw": 1,
"syno_hdd_detect": 0,
"root": "/dev/md0",
"earlycon": "uart8250,io,0x3f8,115200n8"
},
"menu_entries": {
"RedPill DS3617xs v6.2.4-25556 Beta (USB, Verbose)": {
"options": [
"savedefault",
"set root=(hd0,msdos1)",
"echo Loading Linux...",
"linux /zImage @@@CMDLINE@@@",
"echo Loading initramfs...",
"initrd /rd.gz /custom.gz",
"echo Starting kernel with USB boot"
],
"cmdline": {
"earlyprintk": null,
"loglevel": 15,
"log_buf_len": "32M"
}
},
"RedPill DS3617xs v6.2.4-25556 Beta (SATA, Verbose)": {
"options": [
"savedefault",
"set root=(hd0,msdos1)",
"echo Loading Linux...",
"linux /zImage @@@CMDLINE@@@",
"echo Loading initramfs...",
"initrd /rd.gz /custom.gz",
"echo Starting kernel with SATA boot"
],
"cmdline": {
"earlyprintk": null,
"loglevel": 15,
"synoboot_satadom": 1,
"log_buf_len": "32M"
}
}
}
},
"extra": {
"compress_rd": false,
"ramdisk_copy": {
"@@@EXT@@@/rp-lkm/redpill-linux-v3.10.ko": "usr/lib/modules/rp.ko",
"@@@COMMON@@@/iosched-trampoline.sh": "usr/sbin/modprobe"
},
"bootp1_copy": {
"@@@PAT@@@/GRUB_VER": "GRUB_VER"
},
"bootp2_copy": {
"@@@PAT@@@/GRUB_VER": "GRUB_VER",
"@@@PAT@@@/grub_cksum.syno": "grub_cksum.syno",
"@@@PAT@@@/rd.gz": "rd.gz",
"@@@PAT@@@/zImage": "zImage"
}
}
}
Binary file added config/DS3617xs/6.2.4-25556/zImage-001-3617xs-25556-ramdisk-and-header.bsp
View file
Open in desktop
Binary file not shown.
118 changes: 118 additions & 0 deletions config/DS3617xs/6.2.4-25556u2/config.json
View file
Open in desktop
@@ -0,0 +1,118 @@
{
"os": {
"id": "ds3617xs_25556u2",
"pat_url": "https://global.download.synology.com/download/DSM/criticalupdate/update_pack/25556-2/synology_broadwell_3617xs.pat",
"sha256": "24024fa0e0d8f1f24399287ad166a1d42b65c714e1730a2be391a1901d8c2332"
},

"files": {
"zlinux": {
"name": "zImage",
"sha256": "00433478ec1e7b4f4d7a87aa91f38849e06f8a0feb8bea511c6d3aae917b70fd"
},
"ramdisk": {
"name": "rd.gz",
"sha256": "911fb63399b2fa7f199e992f4cfc1a0d085836245bc13bb14bf126a8564a0817"
},
"vmlinux": {
"sha256": "92a175486ab4bc6c3941d0257c25e5a7a2635180e61e9c9d9301ae7db2e687c8"
}
},

"patches": {
"_comment": ".bsp patches are applied to FILES using bspatch(1); .patch are applied to DIRECTORIES using patch(1)",
"zlinux": [
"zImage-001-3617xs-25556u2-ramdisk-and-header.bsp"
],
"ramdisk": [
"@@@COMMON@@@/ramdisk-001-disable-root-pwd.patch",
"@@@COMMON@@@/ramdisk-002-init-script-OLD-name.patch",
"@@@COMMON@@@/ramdisk-003-post-init-script-LOWER.patch"

]
},
"synoinfo": {
"maxdisks": "15",
"internalportcfg": "0x78FF",
"esataportcfg": "0x0",
"usbportcfg": "0x8700",
"rss_server": "http://example.com/null.xml",
"rss_server_ssl": "https://example.com/null.xml",
"small_info_path": "https://example.com/null",
"updateurl": "http://example.com/",
"myds_region_api_base_url": "https://example.com"
},
"grub": {
"template": "@@@COMMON@@@/grub-template.conf",
"base_cmdline": {
"sn": "",
"vid": "0x46f4",
"pid": "0x0001",
"mac1": "",
"netif_num": 1,

"syno_hw_version": "DS3617xs",
"syno_hdd_powerup_seq": 0,
"HddHotplug": 0,
"vender_format_version": 2,
"console": "ttyS0,115200n8",
"withefi": null,
"elevator": "elevator",
"syno_port_thaw": 1,
"syno_hdd_detect": 0,
"root": "/dev/md0",
"earlycon": "uart8250,io,0x3f8,115200n8"
},
"menu_entries": {
"RedPill DS3617xs v6.2.4-25556 update 2 Beta (USB, Verbose)": {
"options": [
"savedefault",
"set root=(hd0,msdos1)",
"echo Loading Linux...",
"linux /zImage @@@CMDLINE@@@",
"echo Loading initramfs...",
"initrd /rd.gz /custom.gz",
"echo Starting kernel with USB boot"
],
"cmdline": {
"earlyprintk": null,
"loglevel": 15,
"log_buf_len": "32M"
}
},
"RedPill DS3617xs v6.2.4-25556 update 2 Beta (SATA, Verbose)": {
"options": [
"savedefault",
"set root=(hd0,msdos1)",
"echo Loading Linux...",
"linux /zImage @@@CMDLINE@@@",
"echo Loading initramfs...",
"initrd /rd.gz /custom.gz",
"echo Starting kernel with SATA boot"
],
"cmdline": {
"earlyprintk": null,
"loglevel": 15,
"synoboot_satadom": 1,
"log_buf_len": "32M"
}
}
}
},
"extra": {
"compress_rd": false,
"ramdisk_copy": {
"@@@EXT@@@/rp-lkm/redpill-linux-v3.10.ko": "usr/lib/modules/rp.ko",
"@@@COMMON@@@/iosched-trampoline.sh": "usr/sbin/modprobe"
},
"bootp1_copy": {
"@@@PAT@@@/GRUB_VER": "GRUB_VER"
},
"bootp2_copy": {
"@@@PAT@@@/GRUB_VER": "GRUB_VER",
"@@@PAT@@@/grub_cksum.syno": "grub_cksum.syno",
"@@@PAT@@@/rd.gz": "rd.gz",
"@@@PAT@@@/zImage": "zImage"
}
}
}
Binary file added config/DS3617xs/6.2.4-25556u2/zImage-001-3617xs-25556u2-ramdisk-and-header.bsp
View file
Open in desktop
Binary file not shown.