diff --git a/kernel/syno-alpine-7.2/Makefile b/kernel/syno-alpine-7.2/Makefile index 12a64f49e8a..acaf78f943e 100644 --- a/kernel/syno-alpine-7.2/Makefile +++ b/kernel/syno-alpine-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = alpine KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-3.10.x-bsp KERNEL_BASE_ARCH = arm KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-alpine-7.2/digests b/kernel/syno-alpine-7.2/digests index 22caf0a4092..3cffe2be5b0 100644 --- a/kernel/syno-alpine-7.2/digests +++ b/kernel/syno-alpine-7.2/digests @@ -1,3 +1,3 @@ -alpine-linux-3.10.x-bsp.txz SHA1 5076ba22a1de5d71d972ed31dc30ae575aae6448 -alpine-linux-3.10.x-bsp.txz SHA256 773494f629a43e5384f2f4f1ecc2fa58b276dad644e0368d0b836d0ebfc6bf6a -alpine-linux-3.10.x-bsp.txz MD5 b88dd3293f7058032bd788eacec4c095 +alpine-linux-3.10.x-bsp.txz SHA1 6d8807d3a7fde97295bfeab3f9f75108abc4d47f +alpine-linux-3.10.x-bsp.txz SHA256 21db2a19502093ef0cd78f6913dae176966a379a7e9e425ba35816516025fce8 +alpine-linux-3.10.x-bsp.txz MD5 37369af5b67a7c6ca999a5eefc46c118 diff --git a/kernel/syno-alpine4k-7.2/Makefile b/kernel/syno-alpine4k-7.2/Makefile index 1ea6a0770b8..24ccfdb0d96 100644 --- a/kernel/syno-alpine4k-7.2/Makefile +++ b/kernel/syno-alpine4k-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = alpine4k KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-3.10.x-bsp KERNEL_BASE_ARCH = arm KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-alpine4k-7.2/digests b/kernel/syno-alpine4k-7.2/digests index 97de761bf18..ac6f803c227 100644 --- a/kernel/syno-alpine4k-7.2/digests +++ b/kernel/syno-alpine4k-7.2/digests @@ -1,3 +1,3 @@ -alpine4k-linux-3.10.x-bsp.txz SHA1 1a9feb80e0b5f5941510230c13485299d0eec9ce -alpine4k-linux-3.10.x-bsp.txz SHA256 2ca133857370b0e152a7122a84eb9e603010adfb1aa1f17bb817c53f2e294911 -alpine4k-linux-3.10.x-bsp.txz MD5 e717bddffaff1d83a7dd46b504bc8270 +alpine4k-linux-3.10.x-bsp.txz SHA1 02fb9bdc9264effcb1824b55fdc36586a893571a +alpine4k-linux-3.10.x-bsp.txz SHA256 3fd049ca595b99007f22c5eff0cde26f5928256bd17d7a7ffce47143a4461676 +alpine4k-linux-3.10.x-bsp.txz MD5 af551d352a09c6909759a12dca1cb4db diff --git a/kernel/syno-apollolake-7.2/Makefile b/kernel/syno-apollolake-7.2/Makefile index 7cc36e669df..dc6b6cb4539 100644 --- a/kernel/syno-apollolake-7.2/Makefile +++ b/kernel/syno-apollolake-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = apollolake KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = x86 KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-apollolake-7.2/digests b/kernel/syno-apollolake-7.2/digests index 43626d6ed2f..8daa80304e8 100644 --- a/kernel/syno-apollolake-7.2/digests +++ b/kernel/syno-apollolake-7.2/digests @@ -1,3 +1,3 @@ -apollolake-linux-4.4.x.txz SHA1 aa6e11fb3a2a4833e8df2e7b642db573228762c8 -apollolake-linux-4.4.x.txz SHA256 6cbb26bd1b3d4c0427180239563febb8e8adb538e898a7d5ed7efaa05bd048f2 -apollolake-linux-4.4.x.txz MD5 8d89a63a33d6e18ac9fef0549f799cc9 +apollolake-linux-4.4.x.txz SHA1 523910f7cf371bd8515fdbc4b7909c16ce2dfcd8 +apollolake-linux-4.4.x.txz SHA256 801ce23123bc7827bb359333cb92b2a4cd3d6d53374e42efe5272e62f711d366 +apollolake-linux-4.4.x.txz MD5 bc3001e693b120e40f29696c852cf960 diff --git a/kernel/syno-armada37xx-7.2/Makefile b/kernel/syno-armada37xx-7.2/Makefile index aac35d5ece4..91399aa59f6 100644 --- a/kernel/syno-armada37xx-7.2/Makefile +++ b/kernel/syno-armada37xx-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = armada37xx KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = arm64 KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-armada37xx-7.2/digests b/kernel/syno-armada37xx-7.2/digests index eb5ac3833e3..40c5cfcd5ae 100644 --- a/kernel/syno-armada37xx-7.2/digests +++ b/kernel/syno-armada37xx-7.2/digests @@ -1,3 +1,3 @@ -armada37xx-linux-4.4.x.txz SHA1 b0d3a78db2ccace6741fa6f681b24272fc6c0ce8 -armada37xx-linux-4.4.x.txz SHA256 d4bdd6bf26b72df61e44724a6f108a33d80912a29cae7148346043d4e86b23e7 -armada37xx-linux-4.4.x.txz MD5 f6e52c59cff63700fe327f22e2379fdc +armada37xx-linux-4.4.x.txz SHA1 ff620071801689e13862e83216d1f1e2b83e0dc4 +armada37xx-linux-4.4.x.txz SHA256 bd51aa5ad6a744bf350c1ec59723689960a29b031f04a226b490074b27ee553d +armada37xx-linux-4.4.x.txz MD5 e70a4761dad01b74749402666b3f46f1 diff --git a/kernel/syno-armada38x-7.2/Makefile b/kernel/syno-armada38x-7.2/Makefile index 6b7365815bd..de023ce4816 100644 --- a/kernel/syno-armada38x-7.2/Makefile +++ b/kernel/syno-armada38x-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = armada38x KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-3.10.x-bsp KERNEL_BASE_ARCH = arm KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-armada38x-7.2/digests b/kernel/syno-armada38x-7.2/digests index 4af6e1b59db..db74bab3f90 100644 --- a/kernel/syno-armada38x-7.2/digests +++ b/kernel/syno-armada38x-7.2/digests @@ -1,3 +1,3 @@ -armada38x-linux-3.10.x-bsp.txz SHA1 e7e2691935bdf261265e47c29eee266baf5a3f5d -armada38x-linux-3.10.x-bsp.txz SHA256 acd34c6bfcc6b65f62c3071b22367ab9d4ee2045f693571025c17507832a2824 -armada38x-linux-3.10.x-bsp.txz MD5 d8d8177e4a5b77625489b6b512a4353c +armada38x-linux-3.10.x-bsp.txz SHA1 9278f56e899d5dc754ec7ad24714597c81b66068 +armada38x-linux-3.10.x-bsp.txz SHA256 53f98c906625b408411a966bc2ea17e363bedda051922b9be2d075438185fc0e +armada38x-linux-3.10.x-bsp.txz MD5 46dd7a9ca7af006c94912a9656df2bd7 diff --git a/kernel/syno-avoton-7.2/Makefile b/kernel/syno-avoton-7.2/Makefile index 31563712ad3..3c87c6c4cc4 100644 --- a/kernel/syno-avoton-7.2/Makefile +++ b/kernel/syno-avoton-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = avoton KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-3.10.x KERNEL_BASE_ARCH = x86 KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-avoton-7.2/digests b/kernel/syno-avoton-7.2/digests index 989426e1ae8..cc7aa419430 100644 --- a/kernel/syno-avoton-7.2/digests +++ b/kernel/syno-avoton-7.2/digests @@ -1,3 +1,3 @@ -avoton-linux-3.10.x.txz SHA1 48594b885818cef21090dfca55dc38b472bb55a7 -avoton-linux-3.10.x.txz SHA256 933fd86e6764aff09d2c53cbe97aa13bf50d0c3f91fe37fc561e4cd0cd1b67a3 -avoton-linux-3.10.x.txz MD5 3f484fe6afae5a506e53ed68e5c9de6e +avoton-linux-3.10.x.txz SHA1 e22a9854e76c4cbf1fafc336caefd34c99ea2cfd +avoton-linux-3.10.x.txz SHA256 227c94c058c979f94aec1384f69acdfd3ec3668c6bd4627bc70df8145cbb738a +avoton-linux-3.10.x.txz MD5 b11b2f685dd91b3fbbac6fdc040cac5a diff --git a/kernel/syno-braswell-7.2/Makefile b/kernel/syno-braswell-7.2/Makefile index 2e5815c74d4..fd53644d16e 100644 --- a/kernel/syno-braswell-7.2/Makefile +++ b/kernel/syno-braswell-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = braswell KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-3.10.x KERNEL_BASE_ARCH = x86 KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-braswell-7.2/digests b/kernel/syno-braswell-7.2/digests index 9315c8d7bd0..8d4715f7780 100644 --- a/kernel/syno-braswell-7.2/digests +++ b/kernel/syno-braswell-7.2/digests @@ -1,3 +1,3 @@ -braswell-linux-3.10.x.txz SHA1 3b8a1509f920f3e85a95ee1008388d946874f950 -braswell-linux-3.10.x.txz SHA256 0a2c33786c67074d755f147102976d0a8e9ab786197b622c3f45effdb651b92b -braswell-linux-3.10.x.txz MD5 e47747e1b407537798f56fb6f8e52447 +braswell-linux-3.10.x.txz SHA1 d1cddf9072827580596ff6a9e7ea991edcb3fdb4 +braswell-linux-3.10.x.txz SHA256 4f07b2a2214a937235ec378033d0b666258f90ce7899023a510bff898aebab4d +braswell-linux-3.10.x.txz MD5 18b91955652bcffe6c450dcdcf86a846 diff --git a/kernel/syno-broadwell-7.2/Makefile b/kernel/syno-broadwell-7.2/Makefile index 22063d052bd..b9f9e8c0891 100644 --- a/kernel/syno-broadwell-7.2/Makefile +++ b/kernel/syno-broadwell-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = broadwell KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = x86 KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-broadwell-7.2/digests b/kernel/syno-broadwell-7.2/digests index 4225c84b68d..e826d79b8a6 100644 --- a/kernel/syno-broadwell-7.2/digests +++ b/kernel/syno-broadwell-7.2/digests @@ -1,3 +1,3 @@ -broadwell-linux-4.4.x.txz SHA1 f03b9352b96e27bbc84971e91919e1b8c57139b5 -broadwell-linux-4.4.x.txz SHA256 4daa6d750509765975fb280625c5cee9bb0e7d52e68ad949f8940e7247fec468 -broadwell-linux-4.4.x.txz MD5 67ff2513ad9bcb0a9a474c16506758e7 +broadwell-linux-4.4.x.txz SHA1 e89acf42610665dca6d6ca12042ef2ac65cb90f1 +broadwell-linux-4.4.x.txz SHA256 bdc9b4aea6ee2b7eb75a180ea4b8e193b26ff3804c2ede4cdf05a3c631bc6a2b +broadwell-linux-4.4.x.txz MD5 5a999df42468e66b0971a189655100ff diff --git a/kernel/syno-broadwellnk-7.2/Makefile b/kernel/syno-broadwellnk-7.2/Makefile index 771c0eb2fdd..ae355b3f71b 100644 --- a/kernel/syno-broadwellnk-7.2/Makefile +++ b/kernel/syno-broadwellnk-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = broadwellnk KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = x86 KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-broadwellnk-7.2/digests b/kernel/syno-broadwellnk-7.2/digests index 5311aaad0cb..9615532eac3 100644 --- a/kernel/syno-broadwellnk-7.2/digests +++ b/kernel/syno-broadwellnk-7.2/digests @@ -1,3 +1,3 @@ -broadwellnk-linux-4.4.x.txz SHA1 6bb290816507a76a9c3c05de28b02412d7acfd3b -broadwellnk-linux-4.4.x.txz SHA256 a554217bce97c328a339b956fa5035dbe8116c6e7837bdb39942fa6ade919e87 -broadwellnk-linux-4.4.x.txz MD5 0d72a59a30e8c8b329f902be0c5afe10 +broadwellnk-linux-4.4.x.txz SHA1 39902df38f33ab99f51e0ad94aca5f3f4bb081dc +broadwellnk-linux-4.4.x.txz SHA256 dd65630b7286d42ba927312de9e220772e49e3f3c6fafc191dcdc85865530875 +broadwellnk-linux-4.4.x.txz MD5 cbc34d4e18c2bd281be3fb600690734b diff --git a/kernel/syno-broadwellnkv2-7.2/Makefile b/kernel/syno-broadwellnkv2-7.2/Makefile index e8e3b2d0dc1..094e43881eb 100644 --- a/kernel/syno-broadwellnkv2-7.2/Makefile +++ b/kernel/syno-broadwellnkv2-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = broadwellnkv2 KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = x86 KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-broadwellnkv2-7.2/digests b/kernel/syno-broadwellnkv2-7.2/digests index a9104975f1d..8a0d683aea3 100644 --- a/kernel/syno-broadwellnkv2-7.2/digests +++ b/kernel/syno-broadwellnkv2-7.2/digests @@ -1,3 +1,3 @@ -broadwellnkv2-linux-4.4.x.txz SHA1 5f553708ef566b5cfd65bc78339a2e6226b65bf6 -broadwellnkv2-linux-4.4.x.txz SHA256 bea836b585c2555971083fe47eca8d35f588a2a30b3cd0b48aa94701c418bc98 -broadwellnkv2-linux-4.4.x.txz MD5 7bf91390154a11c48ae0aaf8a8be5ffb +broadwellnkv2-linux-4.4.x.txz SHA1 32e25f4086ad6ddf2055d6f55591ebf971f0282f +broadwellnkv2-linux-4.4.x.txz SHA256 f24a675405f582c309aac291081c5c463b75e29275c24e75ad43f97a5c96624d +broadwellnkv2-linux-4.4.x.txz MD5 bafa6a65e80206ea7b3cb27c186f741f diff --git a/kernel/syno-broadwellntbap-7.2/Makefile b/kernel/syno-broadwellntbap-7.2/Makefile index 282641af638..9f6f742304b 100644 --- a/kernel/syno-broadwellntbap-7.2/Makefile +++ b/kernel/syno-broadwellntbap-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = broadwellntbap KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = x86 KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-broadwellntbap-7.2/digests b/kernel/syno-broadwellntbap-7.2/digests index 0de8850a857..5770f683472 100644 --- a/kernel/syno-broadwellntbap-7.2/digests +++ b/kernel/syno-broadwellntbap-7.2/digests @@ -1,3 +1,3 @@ -broadwellntbap-linux-4.4.x.txz SHA1 ce62c0aa4daa7bcc567423f45083dc7cd6133741 -broadwellntbap-linux-4.4.x.txz SHA256 7d67bd514d0ab590ea120381050e9f70aaea8b981bbbe0c35c5f2f8cab1dfc5a -broadwellntbap-linux-4.4.x.txz MD5 5428981c0edc55872139762f86f98913 +broadwellntbap-linux-4.4.x.txz SHA1 90ebaa798983a791c9ac7511712d6c71bd00a1b7 +broadwellntbap-linux-4.4.x.txz SHA256 37bcc86c1300c49c8d5057775441b99b576c652790e2ead8842550a48825018e +broadwellntbap-linux-4.4.x.txz MD5 0b82da851935ada8e16f92dbf660ff12 diff --git a/kernel/syno-bromolow-7.2/Makefile b/kernel/syno-bromolow-7.2/Makefile index e210f7bd57e..c76daf4e196 100644 --- a/kernel/syno-bromolow-7.2/Makefile +++ b/kernel/syno-bromolow-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = bromolow KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-3.10.x KERNEL_BASE_ARCH = x86 KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-bromolow-7.2/digests b/kernel/syno-bromolow-7.2/digests index 11b0eb8eeb4..a07cb48385f 100644 --- a/kernel/syno-bromolow-7.2/digests +++ b/kernel/syno-bromolow-7.2/digests @@ -1,3 +1,3 @@ -bromolow-linux-3.10.x.txz SHA1 850949d195d35f179d02800b10e0d8b33dc6c84d -bromolow-linux-3.10.x.txz SHA256 f7ad16ee73263a4d9ff765cf83e0d32390f0ab69b08fc9deb659865c585fd8af -bromolow-linux-3.10.x.txz MD5 d630fde4d887f540087024c460da5398 +bromolow-linux-3.10.x.txz SHA1 267db01823466facde1a916da1b0c91a10b7fa1a +bromolow-linux-3.10.x.txz SHA256 db2afb758f97ce4244e351222d7886f08b8a91cef402d2a94dac3ed546aeac28 +bromolow-linux-3.10.x.txz MD5 59ccf86a68b8aa00e300d9c09803371b diff --git a/kernel/syno-denverton-7.2/Makefile b/kernel/syno-denverton-7.2/Makefile index 43d41239203..fe3324fb3c0 100644 --- a/kernel/syno-denverton-7.2/Makefile +++ b/kernel/syno-denverton-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = denverton KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = x86 KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-denverton-7.2/digests b/kernel/syno-denverton-7.2/digests index 4c901f8f81e..ef5b691a10e 100644 --- a/kernel/syno-denverton-7.2/digests +++ b/kernel/syno-denverton-7.2/digests @@ -1,3 +1,3 @@ -denverton-linux-4.4.x.txz SHA1 979640d91d584e80a1082d85baa13da8699b4185 -denverton-linux-4.4.x.txz SHA256 a20bef031194f9283ed413b95f54a39d1c0666574a75b3d99083401d017eef19 -denverton-linux-4.4.x.txz MD5 3a19887cb910a69baf47275a4b511026 +denverton-linux-4.4.x.txz SHA1 3f32371d29095de037b23de348da825605e4dd9f +denverton-linux-4.4.x.txz SHA256 5aa4b8aacfe2892ae69a160f54fa65fee820579567fd9ed05efad0b7b5016dc8 +denverton-linux-4.4.x.txz MD5 53c38735eea8ef39139c031e83b2e5a6 diff --git a/kernel/syno-epyc7002-7.1/patches/001-remove-deprecated-cdi.patch b/kernel/syno-epyc7002-7.1/patches/001-remove-deprecated-cdi.patch new file mode 100644 index 00000000000..2d067c92032 --- /dev/null +++ b/kernel/syno-epyc7002-7.1/patches/001-remove-deprecated-cdi.patch @@ -0,0 +1,11 @@ +--- drivers/cdrom/cdrom.c-orig 2025-03-10 20:44:10.000000000 +0000 ++++ drivers/cdrom/cdrom.c 2025-07-15 00:27:20.327175390 +0000 +@@ -602,7 +602,7 @@ int register_cdrom(struct gendisk *disk, + } + + cdi->disk = disk; +- disk->cdi = cdi; ++ //disk->cdi = cdi; + + ENSURE(cdo, drive_status, CDC_DRIVE_STATUS); + if (cdo->check_events == NULL) diff --git a/kernel/syno-epyc7002-7.2/Makefile b/kernel/syno-epyc7002-7.2/Makefile index c9fee421302..2bdbdb442d4 100644 --- a/kernel/syno-epyc7002-7.2/Makefile +++ b/kernel/syno-epyc7002-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = epyc7002 KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-5.10.x KERNEL_BASE_ARCH = x86 KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-epyc7002-7.2/digests b/kernel/syno-epyc7002-7.2/digests index 82d9e413217..c0761aacfab 100644 --- a/kernel/syno-epyc7002-7.2/digests +++ b/kernel/syno-epyc7002-7.2/digests @@ -1,3 +1,3 @@ -epyc7002-linux-5.10.x.txz SHA1 2b7deed8c982039b85eae72ae9089482d782d492 -epyc7002-linux-5.10.x.txz SHA256 6b9be0681396ded205c5afe53375730fba86ca7e3deeabe2456eccc497f36079 -epyc7002-linux-5.10.x.txz MD5 df79927e0817c8c15838a569d57c7629 +epyc7002-linux-5.10.x.txz SHA1 fa4d924b99a61728cd98ad33bc7ddc7f97b9321f +epyc7002-linux-5.10.x.txz SHA256 b1ef589d9370a543230b69046205e1489cd71a2bfcc7dacbc7752d8478e4bc92 +epyc7002-linux-5.10.x.txz MD5 cfb637ef6b9e4614c67b272c478ad4bc diff --git a/kernel/syno-epyc7002-7.2/patches/001-remove-deprecated-cdi.patch b/kernel/syno-epyc7002-7.2/patches/001-remove-deprecated-cdi.patch new file mode 100644 index 00000000000..2d067c92032 --- /dev/null +++ b/kernel/syno-epyc7002-7.2/patches/001-remove-deprecated-cdi.patch @@ -0,0 +1,11 @@ +--- drivers/cdrom/cdrom.c-orig 2025-03-10 20:44:10.000000000 +0000 ++++ drivers/cdrom/cdrom.c 2025-07-15 00:27:20.327175390 +0000 +@@ -602,7 +602,7 @@ int register_cdrom(struct gendisk *disk, + } + + cdi->disk = disk; +- disk->cdi = cdi; ++ //disk->cdi = cdi; + + ENSURE(cdo, drive_status, CDC_DRIVE_STATUS); + if (cdo->check_events == NULL) diff --git a/kernel/syno-geminilake-7.2/Makefile b/kernel/syno-geminilake-7.2/Makefile index a89deeb042b..5bab71e72cd 100644 --- a/kernel/syno-geminilake-7.2/Makefile +++ b/kernel/syno-geminilake-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = geminilake KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = x86 KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-geminilake-7.2/digests b/kernel/syno-geminilake-7.2/digests index 6db024fb385..f0526b78461 100644 --- a/kernel/syno-geminilake-7.2/digests +++ b/kernel/syno-geminilake-7.2/digests @@ -1,3 +1,3 @@ -geminilake-linux-4.4.x.txz SHA1 fbc2b3eb70d25fdbe7bc18c712cfee4aedc57677 -geminilake-linux-4.4.x.txz SHA256 e0490fda0b3e0caa56cda3a18ca2192f53df510c0bc0dccaf3c0e94f3ca0e6de -geminilake-linux-4.4.x.txz MD5 ddd8625e0d9360e209eb3436cb4d298e +geminilake-linux-4.4.x.txz SHA1 68ceebfa0ccb9fb44413277389cbe9e1672d77fa +geminilake-linux-4.4.x.txz SHA256 eb4f319363f61bea53ac01759bac91d1ff3562bc56963debd510f47704e7ecd8 +geminilake-linux-4.4.x.txz MD5 a3e9b268565b895bb152426c729c345e diff --git a/kernel/syno-grantley-7.2/Makefile b/kernel/syno-grantley-7.2/Makefile index cbbda411d40..f440d0d2ae5 100644 --- a/kernel/syno-grantley-7.2/Makefile +++ b/kernel/syno-grantley-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = grantley KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-3.10.x KERNEL_BASE_ARCH = x86 KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-grantley-7.2/digests b/kernel/syno-grantley-7.2/digests index 3a8607b2aca..5e508a239c4 100644 --- a/kernel/syno-grantley-7.2/digests +++ b/kernel/syno-grantley-7.2/digests @@ -1,3 +1,3 @@ -grantley-linux-3.10.x.txz SHA1 9622a7e0b17f49ec621d14720b4d0f3198a90ecc -grantley-linux-3.10.x.txz SHA256 addac0cb7f1aaeb24d3f44f7907ec6cf0de33d26b8c349b6f12f49c12e1a082f -grantley-linux-3.10.x.txz MD5 632ec45bdb648a8ddeb886ca78202c81 +grantley-linux-3.10.x.txz SHA1 9780b42f33755045b607e4a928d4a76f32b4d3d4 +grantley-linux-3.10.x.txz SHA256 48b4733745654146088edc5b6281785a76b6bdee3bc5f0b5ec52d6010963c5dc +grantley-linux-3.10.x.txz MD5 2d52e0fb49dc2e0c490d3a47988b0486 diff --git a/kernel/syno-kvmx64-7.2/Makefile b/kernel/syno-kvmx64-7.2/Makefile index 9bc196fec2f..c6a387dcf1f 100644 --- a/kernel/syno-kvmx64-7.2/Makefile +++ b/kernel/syno-kvmx64-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = kvmx64 KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = x86 KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-kvmx64-7.2/digests b/kernel/syno-kvmx64-7.2/digests index 68f4c2b4f31..522703ccaba 100644 --- a/kernel/syno-kvmx64-7.2/digests +++ b/kernel/syno-kvmx64-7.2/digests @@ -1,3 +1,3 @@ -kvmx64-linux-4.4.x.txz SHA1 2c71356dc1d0be1a69a244addf16c6259ed4279e -kvmx64-linux-4.4.x.txz SHA256 d48e0f0b440b743afb31d79ab8cbb8228f8e7b2b265c1c6be848109b8f00a71b -kvmx64-linux-4.4.x.txz MD5 69f26d53094510d23e4f463da0d13c08 +kvmx64-linux-4.4.x.txz SHA1 1625924fdf1b41d827d36d084314cf68d736c654 +kvmx64-linux-4.4.x.txz SHA256 999d196bae224bfdb1c70f6bdf58ea8dcf9c6f391717ec6903a5302cb0e413db +kvmx64-linux-4.4.x.txz MD5 29e44d0805636f9e1a7b5a649107590c diff --git a/kernel/syno-monaco-7.2/Makefile b/kernel/syno-monaco-7.2/Makefile index 0459711c98b..1608b26b997 100644 --- a/kernel/syno-monaco-7.2/Makefile +++ b/kernel/syno-monaco-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = monaco KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-3.10.x-bsp KERNEL_BASE_ARCH = arm KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-monaco-7.2/digests b/kernel/syno-monaco-7.2/digests index cbb2e45e5f2..14f910967b5 100644 --- a/kernel/syno-monaco-7.2/digests +++ b/kernel/syno-monaco-7.2/digests @@ -1,3 +1,3 @@ -monaco-linux-3.10.x-bsp.txz SHA1 a9566ffbe5356a99b813ef3190336055ab52d1de -monaco-linux-3.10.x-bsp.txz SHA256 6bdd6eb8c777f4ca425479875f6e9935b03c1867560dbdb518fd50be21a620fe -monaco-linux-3.10.x-bsp.txz MD5 44f019b675553e902f5bcdeb02920d2a +monaco-linux-3.10.x-bsp.txz SHA1 216a59d89b10617639d5ce98628ca3f828246ce4 +monaco-linux-3.10.x-bsp.txz SHA256 0f59b3eca45524d9d2f1487d01716db21a3f1c2520098ed5ccbd6b1c57e458a5 +monaco-linux-3.10.x-bsp.txz MD5 eb1fa8fbab6d1a651bac0569e5c25a16 diff --git a/kernel/syno-purley-7.2/Makefile b/kernel/syno-purley-7.2/Makefile index 3301ef3d0c3..eb1fd79095b 100644 --- a/kernel/syno-purley-7.2/Makefile +++ b/kernel/syno-purley-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = purley KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = x86 KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-purley-7.2/digests b/kernel/syno-purley-7.2/digests index f1178cbeac3..d3a160dd687 100644 --- a/kernel/syno-purley-7.2/digests +++ b/kernel/syno-purley-7.2/digests @@ -1,3 +1,3 @@ -purley-linux-4.4.x.txz SHA1 1af8c6044974b6212cc10e8a5d6889cf82111ccd -purley-linux-4.4.x.txz SHA256 247107f0af329c9fdba9fe618d361f7bec26ff00afa875830b09c354e90a141e -purley-linux-4.4.x.txz MD5 1887f7eddad75f6ffc3f925c4915c5c0 +purley-linux-4.4.x.txz SHA1 0340c65ba7e5ee5dd4758d9b7912579823c475af +purley-linux-4.4.x.txz SHA256 6ac670db90b179160567fb2d0102537b94fdc14978a55c06be3d2fd6e7c7efa9 +purley-linux-4.4.x.txz MD5 05bf261846471823933873292064d774 diff --git a/kernel/syno-r1000-7.2/Makefile b/kernel/syno-r1000-7.2/Makefile index 855b53378ca..811293d973a 100644 --- a/kernel/syno-r1000-7.2/Makefile +++ b/kernel/syno-r1000-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = r1000 KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = x86 KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-r1000-7.2/digests b/kernel/syno-r1000-7.2/digests index a3a607d25ee..4df6e1ba9d2 100644 --- a/kernel/syno-r1000-7.2/digests +++ b/kernel/syno-r1000-7.2/digests @@ -1,3 +1,3 @@ -r1000-linux-4.4.x.txz SHA1 74ab8276a2a416d7c54c09dffe254bf4777daf46 -r1000-linux-4.4.x.txz SHA256 9576221d006d552c4fd4c900e9a1bb38316e5604c7bce44574cdb8b9a28116dc -r1000-linux-4.4.x.txz MD5 741ffd3f980e21ca78f9406afa8ab1ac +r1000-linux-4.4.x.txz SHA1 4860318099d7d1f41dc6caca395a62c278aa842f +r1000-linux-4.4.x.txz SHA256 ae4615d04bd3fb4eb179a5daac7c4d85730733a72370bcf6e57650f6de06e881 +r1000-linux-4.4.x.txz MD5 ba64f6354f4daa3551cf90043f2d2be2 diff --git a/kernel/syno-rtd1296-7.2/Makefile b/kernel/syno-rtd1296-7.2/Makefile index b5900c03696..14fec8b9445 100644 --- a/kernel/syno-rtd1296-7.2/Makefile +++ b/kernel/syno-rtd1296-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = rtd1296 KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = arm64 KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-rtd1296-7.2/digests b/kernel/syno-rtd1296-7.2/digests index 6e34f84b54f..49ea3b8b51e 100644 --- a/kernel/syno-rtd1296-7.2/digests +++ b/kernel/syno-rtd1296-7.2/digests @@ -1,3 +1,3 @@ -rtd1296-linux-4.4.x.txz SHA1 cc462b0dedfaa7a6e8fc6e723caef08478193c4a -rtd1296-linux-4.4.x.txz SHA256 8c8ae6582e03df00bc80fff848757ea4f29be51ae36ae6e280d7912a5435c019 -rtd1296-linux-4.4.x.txz MD5 314e805760d55dc50cede241b4a9f40c +rtd1296-linux-4.4.x.txz SHA1 70289695f22ed918ccd255d1386b77157330f3c8 +rtd1296-linux-4.4.x.txz SHA256 41b173ccf12225a42a75fe3d3c243ec89e3e88f1a6574d0b87b9ebe3fe696e2c +rtd1296-linux-4.4.x.txz MD5 34bce8a21bc9b4dd0a30144438bc108c diff --git a/kernel/syno-rtd1619b-7.1/patches/001-remove-deprecated-cdi.patch b/kernel/syno-rtd1619b-7.1/patches/001-remove-deprecated-cdi.patch new file mode 100644 index 00000000000..2d067c92032 --- /dev/null +++ b/kernel/syno-rtd1619b-7.1/patches/001-remove-deprecated-cdi.patch @@ -0,0 +1,11 @@ +--- drivers/cdrom/cdrom.c-orig 2025-03-10 20:44:10.000000000 +0000 ++++ drivers/cdrom/cdrom.c 2025-07-15 00:27:20.327175390 +0000 +@@ -602,7 +602,7 @@ int register_cdrom(struct gendisk *disk, + } + + cdi->disk = disk; +- disk->cdi = cdi; ++ //disk->cdi = cdi; + + ENSURE(cdo, drive_status, CDC_DRIVE_STATUS); + if (cdo->check_events == NULL) diff --git a/kernel/syno-rtd1619b-7.2/Makefile b/kernel/syno-rtd1619b-7.2/Makefile index 5565c57e5e5..2613f3d9845 100644 --- a/kernel/syno-rtd1619b-7.2/Makefile +++ b/kernel/syno-rtd1619b-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = rtd1619b KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-5.10.x KERNEL_BASE_ARCH = arm64 KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-rtd1619b-7.2/digests b/kernel/syno-rtd1619b-7.2/digests index 17630992101..701fe71a840 100644 --- a/kernel/syno-rtd1619b-7.2/digests +++ b/kernel/syno-rtd1619b-7.2/digests @@ -1,3 +1,3 @@ -rtd1619b-linux-5.10.x.txz SHA1 ad953d0a064f39d3fed242c50b56fa2d85e9501f -rtd1619b-linux-5.10.x.txz SHA256 ea28194b24bf2260774d29eb0546556cb9d00303e8ec6c1fe639bf463474b2ab -rtd1619b-linux-5.10.x.txz MD5 865a7601c34e8b0e0b9103d2f4383a6c +rtd1619b-linux-5.10.x.txz SHA1 47f009bd0e3ecd262a212585a38e26fce7d0a995 +rtd1619b-linux-5.10.x.txz SHA256 01e8abeb04ac17ac804c719b19975d209e4db87020e1594a1c5e0e72968746b5 +rtd1619b-linux-5.10.x.txz MD5 5f55ecc7494774842124d8aff6385ce0 diff --git a/kernel/syno-rtd1619b-7.2/patches/001-remove-deprecated-cdi.patch b/kernel/syno-rtd1619b-7.2/patches/001-remove-deprecated-cdi.patch new file mode 100644 index 00000000000..2d067c92032 --- /dev/null +++ b/kernel/syno-rtd1619b-7.2/patches/001-remove-deprecated-cdi.patch @@ -0,0 +1,11 @@ +--- drivers/cdrom/cdrom.c-orig 2025-03-10 20:44:10.000000000 +0000 ++++ drivers/cdrom/cdrom.c 2025-07-15 00:27:20.327175390 +0000 +@@ -602,7 +602,7 @@ int register_cdrom(struct gendisk *disk, + } + + cdi->disk = disk; +- disk->cdi = cdi; ++ //disk->cdi = cdi; + + ENSURE(cdo, drive_status, CDC_DRIVE_STATUS); + if (cdo->check_events == NULL) diff --git a/kernel/syno-v1000-7.2/Makefile b/kernel/syno-v1000-7.2/Makefile index 552d8e2a596..3888bf69719 100644 --- a/kernel/syno-v1000-7.2/Makefile +++ b/kernel/syno-v1000-7.2/Makefile @@ -1,6 +1,6 @@ KERNEL_ARCH = v1000 KERNEL_VERS = 7.2 -KERNEL_BUILD = 64570 +KERNEL_BUILD = 72806 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = x86 KERNEL_URL_VERSION = 7.2 diff --git a/kernel/syno-v1000-7.2/digests b/kernel/syno-v1000-7.2/digests index 2e6e2288ec6..e64314f1b97 100644 --- a/kernel/syno-v1000-7.2/digests +++ b/kernel/syno-v1000-7.2/digests @@ -1,3 +1,3 @@ -v1000-linux-4.4.x.txz SHA1 3f168e5de32d80cbbb12f8e51a3fa190cd972990 -v1000-linux-4.4.x.txz SHA256 9ee1ab5472cd8a50c69c697fa0fc0ae1dffb610b7afd8e75f48b22e2ee1bfaae -v1000-linux-4.4.x.txz MD5 6f13476585be558ca2986fe076b3c9f9 +v1000-linux-4.4.x.txz SHA1 4fd29cadf2a8be838689f8a107c1db433590223b +v1000-linux-4.4.x.txz SHA256 97ee4a3405a4bc9d81286248f3780a4e43c48ea09139514c829edf7f30467456 +v1000-linux-4.4.x.txz MD5 8dc57b89a328b24a85979163a8185df5 diff --git a/mk/spksrc.cross-kernel-configure.mk b/mk/spksrc.cross-kernel-configure.mk index 0b17afb33db..c6d6c5e8900 100644 --- a/mk/spksrc.cross-kernel-configure.mk +++ b/mk/spksrc.cross-kernel-configure.mk @@ -55,6 +55,15 @@ endif @$(RUN) $(MAKE) mrproper @$(MSG) "Applying $(KERNEL_CONFIG) configuration" @$(RUN) cp $(KERNEL_CONFIG) .config +ifeq ($(call version_ge, ${TC_KERNEL}, 5),1) + @$(MSG) "Disable: CONFIG_UNWINDER_ORC" + @$(RUN) sed -i 's/^CONFIG_UNWINDER_ORC=y/# CONFIG_UNWINDER_ORC is not set/' .config + @$(RUN) sed -i 's/^# CONFIG_UNWINDER_FRAME_POINTER is not set/CONFIG_UNWINDER_FRAME_POINTER=y/' .config + @$(MSG) "Disable: CONFIG_STACK_VALIDATION" + @$(RUN) sed -i 's/^CONFIG_STACK_VALIDATION=y/# CONFIG_STACK_VALIDATION is not set/' .config + @$(MSG) "Disable: CONFIG_DEBUG_INFO_BTF" + @$(RUN) sed -i 's/^CONFIG_DEBUG_INFO_BTF=y/# CONFIG_DEBUG_INFO_BTF is not set/' .config +endif @$(MSG) "Set any new symbols to their default value" # olddefconfig is not available < 3.8 ifeq ($(call version_lt, ${TC_KERNEL}, 3.8),1) diff --git a/mk/spksrc.depend.mk b/mk/spksrc.depend.mk index 29d705c5768..473c399703b 100644 --- a/mk/spksrc.depend.mk +++ b/mk/spksrc.depend.mk @@ -8,7 +8,7 @@ # Variables: # DEPENDS List of dependencies to go through # REQUIRE_KERNEL If set, will compile kernel modules and allow -# use of KERNEL_DIR +# use of KERNEL_DISTRIB_DIR # REQUIRE_TOOLKIT If set, will download and extract matching toolkit # BUILD_DEPENDS List of dependencies to go through, PLIST is ignored diff --git a/mk/spksrc.directories.mk b/mk/spksrc.directories.mk index 82908d4f6b5..4c481ddd06d 100644 --- a/mk/spksrc.directories.mk +++ b/mk/spksrc.directories.mk @@ -14,7 +14,7 @@ PIP_DISTRIB_DIR = $(abspath $(DISTRIB_DIR)/pip) PIP_CACHE_DIR = $(WORK_DIR)/pip TOOLCHAIN_DIR = $(BASE_DISTRIB_DIR)/toolchain TOOLKIT_DIR = $(BASE_DISTRIB_DIR)/toolkit -KERNEL_DIR = $(BASE_DISTRIB_DIR)/kernel +KERNEL_DISTRIB_DIR = $(BASE_DISTRIB_DIR)/kernel PACKAGES_DIR = $(CURDIR)/../../packages # Default download location, see spksrc.download.mk ifeq ($(strip $(DISTRIB_DIR)),) diff --git a/mk/spksrc.kernel-env.mk b/mk/spksrc.kernel-env.mk index 2e3e1071db3..b48c9a46df6 100644 --- a/mk/spksrc.kernel-env.mk +++ b/mk/spksrc.kernel-env.mk @@ -15,7 +15,7 @@ KERNEL_DEPEND = $(KO_ARCH)-$(KO_TCVERSION) # else only process matching -<#> else -KERNEL_DEPEND = $(filter $(addsuffix -$(KO_TCVERSION),$(filter-out $(UNSUPPORTED_ARCHS),$(shell sed -n -e '/TC_ARCH/ s/.*= *//p' ../../toolchain/syno-$(KO_ARCH)-$(KO_TCVERSION)/Makefile 2>/dev/null))), $(LEGACY_ARCHS)) +KERNEL_DEPEND = $(subst ../../kernel/syno-,,$(wildcard $(addprefix ../../kernel/syno-,$(filter $(addsuffix -$(KO_TCVERSION),$(filter-out $(UNSUPPORTED_ARCHS),$(shell sed -n -e '/TC_ARCH/ s/.*= *//p' ../../toolchain/syno-$(KO_ARCH)-$(KO_TCVERSION)/Makefile 2>/dev/null))), $(LEGACY_ARCHS))))) endif # end REQUIRE_KERNEL_MODULE diff --git a/mk/spksrc.kernel-modules.mk b/mk/spksrc.kernel-modules.mk index aa2d8e12f2b..9c86931566e 100644 --- a/mk/spksrc.kernel-modules.mk +++ b/mk/spksrc.kernel-modules.mk @@ -5,23 +5,36 @@ include $(BASEDIR)mk/spksrc.kernel-env.mk ### +kernel-modules: SHELL:=/bin/bash kernel-modules: - @set -e; \ - $(MSG) "kernel-modules archs to be processed: $(KERNEL_DEPEND)" ; \ + @$(MSG) "kernel-modules archs to be processed: $(KERNEL_DEPEND)" ; \ rsync -ah --mkpath work$(ARCH_SUFFIX)/tc_vars* work$(ARCH_SUFFIX)/tc_vars-backup ; \ - for depend in $(KERNEL_DEPEND); \ - do \ - $(MSG) "Building kernel-modules for $${depend} ARCH" | tee --append build-$(ARCH)-$(TCVERSION)-kernel-modules-$${depend}.log ; \ + BUILD_SUCCESS=true ; \ + for depend in $(KERNEL_DEPEND); do \ + set -o pipefail; { \ + $(MSG) "Building kernel-modules for $${depend} ARCH" ; \ $(MAKE) spkclean ; \ $(MSG) "$$(date +%Y%m%d-%H%M%S) MAKELEVEL: $(MAKELEVEL), PARALLEL_MAKE: $(PARALLEL_MAKE), ARCH: $(ARCH)-$(TCVERSION), NAME: kernel-modules-$${depend}-$(TCVERSION) [BEGIN]" >> $(PSTAT_LOG) ; \ - $(PSTAT_TIME) $(MAKE) WORK_DIR=$(CURDIR)/work$(ARCH_SUFFIX) \ + if ! $(PSTAT_TIME) $(MAKE) WORK_DIR=$(CURDIR)/work$(ARCH_SUFFIX) \ REQUIRE_KERNEL_MODULE="$(REQUIRE_KERNEL_MODULE)" \ ARCH=$$(echo $${depend} | cut -f1 -d-) \ TCVERSION=$$(echo $${depend} | cut -f2 -d-) \ - -C ../../kernel/syno-$$depend | tee --append build-$(ARCH)-$(TCVERSION)-kernel-modules-$${depend}.log ; \ + -C ../../kernel/syno-$$depend ; then \ + $(MSG) "ERROR: Build failed for $${depend}" ; \ + BUILD_SUCCESS=false; \ + fi; \ $(MSG) "$$(date +%Y%m%d-%H%M%S) MAKELEVEL: $(MAKELEVEL), PARALLEL_MAKE: $(PARALLEL_MAKE), ARCH: $(ARCH)-$(TCVERSION), NAME: kernel-modules-$${depend}-$(TCVERSION) [END]" >> $(PSTAT_LOG) ; \ - rm -fr $(CURDIR)/work$(ARCH_SUFFIX)/linux-$${depend} ; \ + if [ "$$BUILD_SUCCESS" = "true" ]; then \ + $(MSG) "All kernel modules built successfully - cleaning up sources" ; \ + for depend in $(KERNEL_DEPEND); do \ + rm -fr $(CURDIR)/work$(ARCH_SUFFIX)/linux-$${depend} ; \ + done ; \ + else \ + $(MSG) "Build failed - keeping sources for debugging" ; \ + exit 1; \ + fi; \ + } > >(tee --append build-$(ARCH)-$(TCVERSION)-kernel-modules-$${depend}.log) 2>&1 ; [ $${PIPESTATUS[0]} -eq 0 ] || false ; \ done ; \ - rsync -ah work$(ARCH_SUFFIX)/tc_vars-backup/tc_vars* work$(ARCH_SUFFIX)/. + rsync -ah work$(ARCH_SUFFIX)/tc_vars-backup/tc_vars* work$(ARCH_SUFFIX)/. ; \ ### diff --git a/mk/spksrc.kernel.mk b/mk/spksrc.kernel.mk index 4fdee0f3aa4..96abcd0c583 100644 --- a/mk/spksrc.kernel.mk +++ b/mk/spksrc.kernel.mk @@ -29,7 +29,7 @@ PKG_DIST_FILE = $(KERNEL_DIST_FILE) else LOCAL_FILE = $(KERNEL_DIST_NAME) endif -DISTRIB_DIR = $(KERNEL_DIR)/$(KERNEL_VERS) +DISTRIB_DIR = $(KERNEL_DISTRIB_DIR)/$(KERNEL_VERS)-$(KERNEL_BUILD) DIST_FILE = $(DISTRIB_DIR)/$(LOCAL_FILE) DIST_EXT = $(KERNEL_EXT) EXTRACT_CMD = $(EXTRACT_CMD.$(KERNEL_EXT)) --skip-old-files --strip-components=$(KERNEL_STRIP) $(KERNEL_PREFIX) diff --git a/spk/synokernel-cdrom/Makefile b/spk/synokernel-cdrom/Makefile index 43c1ed26e2d..144fbdc4a5c 100644 --- a/spk/synokernel-cdrom/Makefile +++ b/spk/synokernel-cdrom/Makefile @@ -1,19 +1,18 @@ SPK_NAME = synokernel-cdrom -SPK_VERS = 1.3 -SPK_REV = 3 +SPK_VERS = 1.4 +SPK_REV = 4 SPK_ICON = src/$(SPK_NAME).png DEPENDS = REQUIRE_KERNEL ?= 1 -REQUIRE_KERNEL_MODULE = CONFIG_CDROM_PKTCDVD:drivers/cdrom:cdrom -REQUIRE_KERNEL_MODULE += CONFIG_BLK_DEV_SR:drivers/scsi:sr_mod +REQUIRE_KERNEL_MODULE = CONFIG_BLK_DEV_SR:drivers/scsi:sr_mod MAINTAINER = th0ma7 DESCRIPTION = "Provides Synology kernel CD-ROM drivers cdrom.ko and sr_mod.ko" -CHANGELOG = "1. Support DSM-7.1 and DSM-7.2" +CHANGELOG = "1. Support all DSM-7.1 (42962) and DSM-7.2 (72806) kernels" -UNSUPPORTED_ARCHS = $(PPC_ARCHS) epyc7002 rtd1619b +UNSUPPORTED_ARCHS = $(PPC_ARCHS) STARTABLE = no DISPLAY_NAME = SynoKernel USB CD-ROM drivers @@ -28,6 +27,12 @@ POST_STRIP_TARGET = synokernel-cdrom_extra-install include ../../mk/spksrc.spk.mk +ifeq ($(call version_ge, ${TC_KERNEL}, 5),1) +REQUIRE_KERNEL_MODULE += CONFIG_CDROM:drivers/cdrom:cdrom +else +REQUIRE_KERNEL_MODULE += CONFIG_CDROM_PKTCDVD:drivers/cdrom:cdrom +endif + .PHONY: synokernel-cdrom_extra-install synokernel-cdrom_extra-install: install -m 755 -d $(STAGING_DIR)/etc/ diff --git a/spk/synokernel-usbserial/Makefile b/spk/synokernel-usbserial/Makefile index f2edb340d5f..2fe55faec10 100644 --- a/spk/synokernel-usbserial/Makefile +++ b/spk/synokernel-usbserial/Makefile @@ -1,6 +1,6 @@ SPK_NAME = synokernel-usbserial -SPK_VERS = 1.2 -SPK_REV = 9 +SPK_VERS = 1.3 +SPK_REV = 10 SPK_ICON = src/$(SPK_NAME).png DEPENDS = @@ -16,9 +16,9 @@ REQUIRE_KERNEL_MODULE += CONFIG_USB_SERIAL_TI:drivers/usb/serial:ti_usb_3410_505 MAINTAINER = th0ma7 DESCRIPTION = "Provides usbserial.ko ch341.ko cp210x.ko pl2303.ko ti_usb3410_5052.ko and ftdi_sio.ko" -CHANGELOG = "1. Support DSM-7.1 and DSM-7.2" +CHANGELOG = "1. Support all DSM-7.1 (42962) and DSM-7.2 (72806) kernels" -UNSUPPORTED_ARCHS = $(PPC_ARCHS) epyc7002 rtd1619b +UNSUPPORTED_ARCHS = $(PPC_ARCHS) STARTABLE = no DISPLAY_NAME = SynoKernel USB Serial drivers