From ef9e17df1b1558d4e3740a48e29af567b612ecb9 Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Mon, 15 Apr 2024 14:05:10 -0700 Subject: [PATCH 01/45] new package libarchive --- cross/libarchive/Makefile | 21 +++++++++++++++++++++ cross/libarchive/PLIST | 7 +++++++ cross/libarchive/digests | 3 +++ 3 files changed, 31 insertions(+) create mode 100644 cross/libarchive/Makefile create mode 100644 cross/libarchive/PLIST create mode 100644 cross/libarchive/digests diff --git a/cross/libarchive/Makefile b/cross/libarchive/Makefile new file mode 100644 index 00000000000..722ad8004ec --- /dev/null +++ b/cross/libarchive/Makefile @@ -0,0 +1,21 @@ +PKG_NAME = libarchive +PKG_VERS = 3.7.3 + +PKG_DIST_SITE = https://github.com/libarchive/libarchive/archive +PKG_EXT = tar.gz +PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) +PKG_DIR = $(PKG_NAME)-$(PKG_VERS) + +COMMENT = Multi-format archive and compression library +HOMEPAGE = https://www.libarchive.org/ +#LICENSE = https://github.com/libarchive/libarchive/blob/master/COPYING + +BUILD_DEPENDS = cross/openssl3 + +PRE_CONFIGURE_TARGET = libarchive_pre_configure + +include ../../mk/spksrc.cross-cc.mk + +.PHONY: libarchive_pre_configure +libarchive_pre_configure: + $(RUN) build/autogen.sh diff --git a/cross/libarchive/PLIST b/cross/libarchive/PLIST new file mode 100644 index 00000000000..8e3b0ad75d9 --- /dev/null +++ b/cross/libarchive/PLIST @@ -0,0 +1,7 @@ +bin:bin/bsdcat +bin:bin/bsdcpio +bin:bin/bsdtar +bin:bin/bsdunzip +lib:lib/libarchive.so +lib:lib/libarchive.so.13 +lib:lib/libarchive.so.13.7.3 diff --git a/cross/libarchive/digests b/cross/libarchive/digests new file mode 100644 index 00000000000..cdb15d4b5bb --- /dev/null +++ b/cross/libarchive/digests @@ -0,0 +1,3 @@ +v3.7.3.tar.gz SHA1 9a68d48cc805f09da6640af06fe68cb4ff330a06 +v3.7.3.tar.gz SHA256 7c03c1102e081408778d0ca4dbd9083ba4f82fe7ac6b29e9fe3cc9a62f329f2a +v3.7.3.tar.gz MD5 28af2de59fe960027a1db597c2aa9415 From 8a10f995c72a0baca95c1ccf6d61d21b10636d5a Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Mon, 15 Apr 2024 14:44:52 -0700 Subject: [PATCH 02/45] First pass at spk build - also fix license --- cross/libarchive/Makefile | 2 +- spk/libarchive/Makefile | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 spk/libarchive/Makefile diff --git a/cross/libarchive/Makefile b/cross/libarchive/Makefile index 722ad8004ec..2aa4763bfad 100644 --- a/cross/libarchive/Makefile +++ b/cross/libarchive/Makefile @@ -8,7 +8,7 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS) COMMENT = Multi-format archive and compression library HOMEPAGE = https://www.libarchive.org/ -#LICENSE = https://github.com/libarchive/libarchive/blob/master/COPYING +LICENSE = 3-Clause BSD BUILD_DEPENDS = cross/openssl3 diff --git a/spk/libarchive/Makefile b/spk/libarchive/Makefile new file mode 100644 index 00000000000..52e53e9ed31 --- /dev/null +++ b/spk/libarchive/Makefile @@ -0,0 +1,19 @@ +SPK_NAME = libarchive +SPK_VERS = 3.7.3 +SPK_REV = 0 +#SPK_ICON = src/libarchive.png + +#DISPLAY_NAME = libarchive +DESCRIPTION = Multi-format archive and compression library +HOMEPAGE = https://www.libarchive.org/ +LICENSE = 3-Clause BSD +MAINTAINER = dotysan + +DEPENDS = cross/$(SPK_NAME) +STARTABLE = no +#REQUIRED_MIN_DSM = 7.0 +#UNSUPPORTED_ARCHS = comcerto2k +# do we need to symlink in the bin stuff? +#SPK_COMMANDS = bin/gpac bin/MP4Box + +include ../../mk/spksrc.spk.mk From cc8bb2d98ed2ea2f221ba58978d245a7bd189025 Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Tue, 16 Apr 2024 12:28:56 -0700 Subject: [PATCH 03/45] libarchive is not a pkg but just a depdendency - build from pre-configured tarball instead of raw source - which seems to support GNU configure - libcrytpo is runtime dependency - don't include bsd* cli; just shared object only --- cross/libarchive/Makefile | 14 +++++--------- cross/libarchive/PLIST | 4 ---- cross/libarchive/digests | 6 +++--- spk/libarchive/Makefile | 19 ------------------- 4 files changed, 8 insertions(+), 35 deletions(-) delete mode 100644 spk/libarchive/Makefile diff --git a/cross/libarchive/Makefile b/cross/libarchive/Makefile index 2aa4763bfad..19ed0b2bed3 100644 --- a/cross/libarchive/Makefile +++ b/cross/libarchive/Makefile @@ -1,21 +1,17 @@ PKG_NAME = libarchive PKG_VERS = 3.7.3 -PKG_DIST_SITE = https://github.com/libarchive/libarchive/archive -PKG_EXT = tar.gz -PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://github.com/libarchive/$(PKG_NAME)/releases/download/v$(PKG_VERS) +PKG_EXT = tar.xz +PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) COMMENT = Multi-format archive and compression library HOMEPAGE = https://www.libarchive.org/ LICENSE = 3-Clause BSD -BUILD_DEPENDS = cross/openssl3 +DEPENDS = cross/openssl3 -PRE_CONFIGURE_TARGET = libarchive_pre_configure +GNU_CONFIGURE = 1 include ../../mk/spksrc.cross-cc.mk - -.PHONY: libarchive_pre_configure -libarchive_pre_configure: - $(RUN) build/autogen.sh diff --git a/cross/libarchive/PLIST b/cross/libarchive/PLIST index 8e3b0ad75d9..97c2b76763e 100644 --- a/cross/libarchive/PLIST +++ b/cross/libarchive/PLIST @@ -1,7 +1,3 @@ -bin:bin/bsdcat -bin:bin/bsdcpio -bin:bin/bsdtar -bin:bin/bsdunzip lib:lib/libarchive.so lib:lib/libarchive.so.13 lib:lib/libarchive.so.13.7.3 diff --git a/cross/libarchive/digests b/cross/libarchive/digests index cdb15d4b5bb..fac4ca6679d 100644 --- a/cross/libarchive/digests +++ b/cross/libarchive/digests @@ -1,3 +1,3 @@ -v3.7.3.tar.gz SHA1 9a68d48cc805f09da6640af06fe68cb4ff330a06 -v3.7.3.tar.gz SHA256 7c03c1102e081408778d0ca4dbd9083ba4f82fe7ac6b29e9fe3cc9a62f329f2a -v3.7.3.tar.gz MD5 28af2de59fe960027a1db597c2aa9415 +libarchive-3.7.3.tar.xz SHA1 67d722171cc3552ecd7fccd05934e8de4596c02b +libarchive-3.7.3.tar.xz SHA256 63e7a7174638fc7d6b79b4c8b0ad954e0f4f45abe7239c1ecb200232aa9a43d2 +libarchive-3.7.3.tar.xz MD5 b60683739a16ff6f00f32aa3516402ed diff --git a/spk/libarchive/Makefile b/spk/libarchive/Makefile deleted file mode 100644 index 52e53e9ed31..00000000000 --- a/spk/libarchive/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -SPK_NAME = libarchive -SPK_VERS = 3.7.3 -SPK_REV = 0 -#SPK_ICON = src/libarchive.png - -#DISPLAY_NAME = libarchive -DESCRIPTION = Multi-format archive and compression library -HOMEPAGE = https://www.libarchive.org/ -LICENSE = 3-Clause BSD -MAINTAINER = dotysan - -DEPENDS = cross/$(SPK_NAME) -STARTABLE = no -#REQUIRED_MIN_DSM = 7.0 -#UNSUPPORTED_ARCHS = comcerto2k -# do we need to symlink in the bin stuff? -#SPK_COMMANDS = bin/gpac bin/MP4Box - -include ../../mk/spksrc.spk.mk From d5a0380273e0e6efa8fba80fb1304fea70ca4267 Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Tue, 16 Apr 2024 13:41:49 -0700 Subject: [PATCH 04/45] new DIY package: pixz - patched to allow cross-compile --- cross/pixz/Makefile | 39 +++++++++++++++++++ cross/pixz/PLIST | 1 + cross/pixz/digests | 3 ++ ...1-configure.ac-replace-AC_CHECK_FILE.patch | 31 +++++++++++++++ diyspk/pixz/Makefile | 17 ++++++++ 5 files changed, 91 insertions(+) create mode 100644 cross/pixz/Makefile create mode 100644 cross/pixz/PLIST create mode 100644 cross/pixz/digests create mode 100644 cross/pixz/patches/0001-configure.ac-replace-AC_CHECK_FILE.patch create mode 100644 diyspk/pixz/Makefile diff --git a/cross/pixz/Makefile b/cross/pixz/Makefile new file mode 100644 index 00000000000..4c862f8a705 --- /dev/null +++ b/cross/pixz/Makefile @@ -0,0 +1,39 @@ +PKG_NAME = pixz +PKG_REPO = https://github.com/vasi/$(PKG_NAME) + +PKG_VERS = 1.0.7 +# above will break cross-compile https://github.com/vasi/pixz/issues/67 +# - patch: https://github.com/vasi/pixz/commit/4ddfdca8416a008819d08d14d6a6f4796aef7857 +# or should we pull from master? no release in almost 4 years +#PKG_VERS = d0e61be32968b2c6a532612b4080dee656ce5db6 +#PKG_DIST_SITE = $(PKG_REPO)/archive +#PKG_EXT = tar.gz +#PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) + +PKG_DIST_SITE = $(PKG_REPO)/releases/download/v$(PKG_VERS) +PKG_EXT = tar.xz +PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) + +PKG_DIR = $(PKG_NAME)-$(PKG_VERS) + +COMMENT = Parallel, indexed xz compressor +HOMEPAGE = $(PKG_REPO) +LICENSE = FreeBSD 2-Clause "Simplified" + +DEPENDS = cross/xz +DEPENDS += cross/libarchive + +PATCHES_LEVEL = 1 + +PRE_CONFIGURE_TARGET = pixz_pre_configure +GNU_CONFIGURE = 1 +CONFIGURE_ARGS += --without-manpage + +include ../../mk/spksrc.cross-cc.mk + +.PHONY: pixz_pre_configure +# must rebuild configure after patching configure.ac +pixz_pre_configure: + @$(RUN) autoreconf -fi +# below only in gh/source archive; not release +# @$(RUN) ./autogen.sh diff --git a/cross/pixz/PLIST b/cross/pixz/PLIST new file mode 100644 index 00000000000..38207cfb323 --- /dev/null +++ b/cross/pixz/PLIST @@ -0,0 +1 @@ +bin:bin/pixz diff --git a/cross/pixz/digests b/cross/pixz/digests new file mode 100644 index 00000000000..dcd74f8c4c5 --- /dev/null +++ b/cross/pixz/digests @@ -0,0 +1,3 @@ +pixz-1.0.7.tar.xz SHA1 56238b6a53f4b0ddfcce8d4e4655e13035bdbe5a +pixz-1.0.7.tar.xz SHA256 e5e32c6eb0bf112b98e74a5da8fb63b9f2cae71800f599d97ce540e150c8ddc5 +pixz-1.0.7.tar.xz MD5 d49ed375b176590ed995d109251fef3d diff --git a/cross/pixz/patches/0001-configure.ac-replace-AC_CHECK_FILE.patch b/cross/pixz/patches/0001-configure.ac-replace-AC_CHECK_FILE.patch new file mode 100644 index 00000000000..1a55a5ccd4a --- /dev/null +++ b/cross/pixz/patches/0001-configure.ac-replace-AC_CHECK_FILE.patch @@ -0,0 +1,31 @@ +From 4ddfdca8416a008819d08d14d6a6f4796aef7857 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 12 Oct 2020 22:40:13 +0200 +Subject: [PATCH] configure.ac: replace AC_CHECK_FILE + +AC_CHECK_FILE can't be used when cross-compiling so replace it by a +simple test -f + +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0a19a2a..9773993 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -16,8 +16,8 @@ AC_PROG_CC_STDC + # Check for a2x only if the man page is missing, i.e. we are building from git. The release tarballs + # are set up to include the man pages. This way, only people creating tarballs via `make dist` and + # people building from git need a2x as a dependency. +-AC_CHECK_FILE( +- [src/pixz.1], ++AS_IF( ++ [test -f src/pixz.1], + [], + [ + AC_ARG_WITH( +-- +2.43.0 + diff --git a/diyspk/pixz/Makefile b/diyspk/pixz/Makefile new file mode 100644 index 00000000000..e69f12570bb --- /dev/null +++ b/diyspk/pixz/Makefile @@ -0,0 +1,17 @@ +SPK_NAME = pixz +SPK_VERS = 1.0.7 +SPK_REV = 0 +#SPK_ICON = src/pixz.png + +#DISPLAY_NAME = pixz +DESCRIPTION = Parallel, indexed xz compressor +HOMEPAGE = https://github.com/vasi/$(SPK_NAME) +LICENSE = 2-Clause BSD +MAINTAINER = dotysan + +DEPENDS = cross/$(SPK_NAME) + +STARTABLE = no +SPK_COMMANDS = bin/$(SPK_NAME) + +include ../../mk/spksrc.spk.mk From 65cb7eb599e9fb0ae54238cf4ea8f6a28573b81e Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Tue, 16 Apr 2024 15:42:06 -0700 Subject: [PATCH 05/45] Disable iconv for libarchive I have no idea why. But spk/synocli-file would not build pixz. However, cross/libarchive and diyspk/pigz both built standalone just fine. Also documenting some other strange and no-determininistic artifacts linked to build enviornment. --- cross/libarchive/Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cross/libarchive/Makefile b/cross/libarchive/Makefile index 19ed0b2bed3..8de33b7028c 100644 --- a/cross/libarchive/Makefile +++ b/cross/libarchive/Makefile @@ -10,8 +10,18 @@ COMMENT = Multi-format archive and compression library HOMEPAGE = https://www.libarchive.org/ LICENSE = 3-Clause BSD +# why does it still use only system autoconf?!? +#BUILD_DEPENDS = cross/autoconf + +# why does this still crash building synocli-file with pixz?!? +#BUILD_DEPENDS = cross/iconv +# or +#BUILD_DEPENDS = cross/libiconv +# above does nothing, must disable iconv below + DEPENDS = cross/openssl3 GNU_CONFIGURE = 1 +CONFIGURE_ARGS += --without-iconv include ../../mk/spksrc.cross-cc.mk From 59adc30dab50d2ef882dca6b49a0f3824e41af5f Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Tue, 16 Apr 2024 15:52:00 -0700 Subject: [PATCH 06/45] Add pixz to synocli-file --- spk/synocli-file/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spk/synocli-file/Makefile b/spk/synocli-file/Makefile index b8dc441a761..ca4399d4398 100644 --- a/spk/synocli-file/Makefile +++ b/spk/synocli-file/Makefile @@ -1,6 +1,6 @@ SPK_NAME = synocli-file SPK_VERS = 3.3 -SPK_REV = 23 +SPK_REV = 24 SPK_ICON = src/synocli-file.png # cross/libblkid must be built before cross/e2fsprogs or cross/libext2fs @@ -13,6 +13,7 @@ DEPENDS = cross/less cross/tree cross/ncdu cross/jdupes cross/rhash cross/nano DEPENDS += cross/mc cross/pcre2 cross/fdupes cross/zstd DEPENDS += cross/detox DEPENDS += cross/lzip cross/plzip +DEPENDS += cross/pixz DEPENDS += cross/mg DEPENDS += cross/jupp DEPENDS += cross/iconv @@ -118,6 +119,7 @@ SPK_COMMANDS += bin/pcre2grep bin/pcre2test SPK_COMMANDS += bin/rmlint SPK_COMMANDS += bin/zstd bin/unzstd bin/zstdcat bin/zstdmt bin/zstdgrep bin/zstdless SPK_COMMANDS += bin/lzip bin/plzip +SPK_COMMANDS += bin/pixz SPK_COMMANDS += bin/fdupes SPK_COMMANDS += bin/micro SPK_COMMANDS += bin/fzf From df1e911a3b0bbc8396d985e320182fe5f724e70e Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Wed, 17 Apr 2024 12:48:00 -0700 Subject: [PATCH 07/45] Proper build env dependency for libarchive --- cross/libarchive/Makefile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/cross/libarchive/Makefile b/cross/libarchive/Makefile index 8de33b7028c..48ebe2d809c 100644 --- a/cross/libarchive/Makefile +++ b/cross/libarchive/Makefile @@ -10,15 +10,7 @@ COMMENT = Multi-format archive and compression library HOMEPAGE = https://www.libarchive.org/ LICENSE = 3-Clause BSD -# why does it still use only system autoconf?!? -#BUILD_DEPENDS = cross/autoconf - -# why does this still crash building synocli-file with pixz?!? -#BUILD_DEPENDS = cross/iconv -# or -#BUILD_DEPENDS = cross/libiconv -# above does nothing, must disable iconv below - +BUILD_DEPENDS = native/autoconf DEPENDS = cross/openssl3 GNU_CONFIGURE = 1 From 936722589a790c77eac013c130afc117e83f75b7 Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Wed, 17 Apr 2024 12:48:52 -0700 Subject: [PATCH 08/45] pixz: fix undefined reference to rpl_malloc --- .../patches/0002-undefined-references.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 cross/pixz/patches/0002-undefined-references.patch diff --git a/cross/pixz/patches/0002-undefined-references.patch b/cross/pixz/patches/0002-undefined-references.patch new file mode 100644 index 00000000000..2e8e916cfcb --- /dev/null +++ b/cross/pixz/patches/0002-undefined-references.patch @@ -0,0 +1,17 @@ +Fix undefined reference to `rpl_malloc' when cross-compiling. + +diff -wpurN pixz-1.0.7/configure.ac pixz-1.0.7.patched/configure.ac +--- pixz-1.0.7/configure.ac 2024-04-17 12:41:01.040203638 -0700 ++++ pixz-1.0.7.patched/configure.ac 2024-04-17 12:41:49.224434589 -0700 +@@ -65,10 +65,8 @@ AC_TYPE_UINT8_T + AC_SYS_LARGEFILE + + # Checks for library functions. +-AC_FUNC_MALLOC +-AC_FUNC_REALLOC + AC_FUNC_STRTOD +-AC_CHECK_FUNCS([memchr memmove memset strerror strtol]) ++AC_CHECK_FUNCS([malloc realloc memchr memmove memset strerror strtol]) + AC_CHECK_HEADER([sys/endian.h], + [ + AC_CHECK_DECLS([htole64, le64toh], [], [], [ From d074b5d6d1020b26366ad49edf83d25643f28180 Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Wed, 17 Apr 2024 12:51:43 -0700 Subject: [PATCH 09/45] libarchive: whoops must include native dependency --- native/autoconf/Makefile | 16 ++++++++++++++++ native/autoconf/digests | 3 +++ 2 files changed, 19 insertions(+) create mode 100644 native/autoconf/Makefile create mode 100644 native/autoconf/digests diff --git a/native/autoconf/Makefile b/native/autoconf/Makefile new file mode 100644 index 00000000000..19f8bd3501e --- /dev/null +++ b/native/autoconf/Makefile @@ -0,0 +1,16 @@ +PKG_NAME = autoconf +PKG_VERS = 2.72 +PKG_EXT = tar.xz +PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://ftp.gnu.org/gnu/autoconf/ +PKG_DIR = $(PKG_NAME)-$(PKG_VERS) + +DEPENDS = cross/m4 + +HOMEPAGE = https://www.gnu.org/software/autoconf/ +COMMENT = Autoconf is an extensible package of M4 macros that produce shell scripts to automatically configure software source code packages. +LICENSE = GPLv2 + +GNU_CONFIGURE = 1 + +include ../../mk/spksrc.native-cc.mk diff --git a/native/autoconf/digests b/native/autoconf/digests new file mode 100644 index 00000000000..a06f1063b32 --- /dev/null +++ b/native/autoconf/digests @@ -0,0 +1,3 @@ +autoconf-2.72.tar.xz SHA1 1d082d999ff4506ec8f92c6ecb9732546f5204fb +autoconf-2.72.tar.xz SHA256 ba885c1319578d6c94d46e9b0dceb4014caafe2490e437a0dbca3f270a223f5a +autoconf-2.72.tar.xz MD5 1be79f7106ab6767f18391c5e22be701 From 5b32915b2034a38a4c9f173c268043706896d8b1 Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Wed, 17 Apr 2024 14:30:48 -0700 Subject: [PATCH 10/45] pixz: bump rev; ready for prime time --- diyspk/pixz/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diyspk/pixz/Makefile b/diyspk/pixz/Makefile index e69f12570bb..d082acde5e8 100644 --- a/diyspk/pixz/Makefile +++ b/diyspk/pixz/Makefile @@ -1,6 +1,6 @@ SPK_NAME = pixz SPK_VERS = 1.0.7 -SPK_REV = 0 +SPK_REV = 1 #SPK_ICON = src/pixz.png #DISPLAY_NAME = pixz From faec11c3ce9523bddec7f0e6730a3cc9617e2143 Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Thu, 18 Apr 2024 17:17:54 -0700 Subject: [PATCH 11/45] Update cross/libarchive/PLIST Link shared object aliases instead of copy. Co-authored-by: hgy59 --- cross/libarchive/PLIST | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cross/libarchive/PLIST b/cross/libarchive/PLIST index 97c2b76763e..0a76ce3904a 100644 --- a/cross/libarchive/PLIST +++ b/cross/libarchive/PLIST @@ -1,3 +1,3 @@ -lib:lib/libarchive.so -lib:lib/libarchive.so.13 +lnk:lib/libarchive.so +lnk:lib/libarchive.so.13 lib:lib/libarchive.so.13.7.3 From cedc12ec071a8e458fc7f299bd7c4d9434b14e08 Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Thu, 18 Apr 2024 18:01:20 -0700 Subject: [PATCH 12/45] add pixz - also clean up kruft --- spk/synocli-file/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/spk/synocli-file/Makefile b/spk/synocli-file/Makefile index ca4399d4398..45b85fdbbe5 100644 --- a/spk/synocli-file/Makefile +++ b/spk/synocli-file/Makefile @@ -1,5 +1,5 @@ SPK_NAME = synocli-file -SPK_VERS = 3.3 +SPK_VERS = 3.4 SPK_REV = 24 SPK_ICON = src/synocli-file.png @@ -98,7 +98,15 @@ endif PCRE2_CLI_FULL = 1 export PCRE2_CLI_FULL -DESCRIPTION = "SynoCli File Tools provide a set of small command-line utilities: less, tree, ncdu, jdupes, fdupes, rhash, mc \(midnight commander\), mg \(emacs-like text editor\), nano, jupp \(based on JOE - Joe\'s Own Editor 3.1\), file, detox, pcre2, zstd, lzip, plzip, detox, iconv, dos2unix tools, patch$(OPTIONAL_DESC)." +DESCRIPTION = "SynoCli File Tools provide a set of small command-line utilities: \ + less, tree, ncdu, jdupes, fdupes, rhash, \ + mc \(midnight commander\), \ + mg \(emacs-like text editor\), nano, \ + jupp \(based on JOE - Joe\'s Own Editor 3.1\), \ + file, detox, pcre2, zstd, lzip, plzip, \ + pixz, \ + detox, iconv, dos2unix tools, \ + patch$(OPTIONAL_DESC)." STARTABLE = no CHANGELOG = "1. Add xstow.
2. Add patch.
3. Update dos2unix to v7.5.2.
4. Update eza v0.18.6.
5. Update fd to v9.0.0.
6. Update fzf to v0.46.1.
7. Update mc to v4.8.31.
8. Update lzip to v1.24 and plzip to v1.11.
9. Update ripgrep to v14.1.0." From 8a7ebfc8ab80718e9fd6984e0ad61d449a4c8289 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Wed, 24 Apr 2024 21:46:55 +0200 Subject: [PATCH 13/45] misc. updates (#6080) - update native/nasm to v2.16.03 (nasm is available as latest version only) - update native/go to v1.21.9 - update gmp to v6.3.0 --- cross/gmp/Makefile | 2 +- cross/gmp/PLIST | 4 ++-- cross/gmp/digests | 6 +++--- .../001-remove-obsolete-subfolders-from-build.patch | 12 ++++++------ native/go/Makefile | 2 +- native/go/digests | 6 +++--- native/nasm/Makefile | 2 +- native/nasm/digests | 6 +++--- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/cross/gmp/Makefile b/cross/gmp/Makefile index 266b8661f12..5d483e35414 100644 --- a/cross/gmp/Makefile +++ b/cross/gmp/Makefile @@ -1,5 +1,5 @@ PKG_NAME = gmp -PKG_VERS = 6.2.1 +PKG_VERS = 6.3.0 PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://ftp.gnu.org/gnu/gmp diff --git a/cross/gmp/PLIST b/cross/gmp/PLIST index 6604af606e0..ea0df4b3590 100644 --- a/cross/gmp/PLIST +++ b/cross/gmp/PLIST @@ -1,6 +1,6 @@ lnk:lib/libgmp.so lnk:lib/libgmp.so.10 -lib:lib/libgmp.so.10.4.1 +lib:lib/libgmp.so.10.5.0 lnk:lib/libgmpxx.so lnk:lib/libgmpxx.so.4 -lib:lib/libgmpxx.so.4.6.1 +lib:lib/libgmpxx.so.4.7.0 diff --git a/cross/gmp/digests b/cross/gmp/digests index fe551213db4..7afd984bfe3 100644 --- a/cross/gmp/digests +++ b/cross/gmp/digests @@ -1,3 +1,3 @@ -gmp-6.2.1.tar.xz SHA1 0578d48607ec0e272177d175fd1807c30b00fdf2 -gmp-6.2.1.tar.xz SHA256 fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2 -gmp-6.2.1.tar.xz MD5 0b82665c4a92fd2ade7440c13fcaa42b +gmp-6.3.0.tar.xz SHA1 b4043dd2964ab1a858109da85c44de224384f352 +gmp-6.3.0.tar.xz SHA256 a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898 +gmp-6.3.0.tar.xz MD5 956dc04e864001a9c22429f761f2c283 diff --git a/cross/gmp/patches/001-remove-obsolete-subfolders-from-build.patch b/cross/gmp/patches/001-remove-obsolete-subfolders-from-build.patch index 07bef905142..8d1ca4593a4 100644 --- a/cross/gmp/patches/001-remove-obsolete-subfolders-from-build.patch +++ b/cross/gmp/patches/001-remove-obsolete-subfolders-from-build.patch @@ -1,11 +1,11 @@ # avoid build of doc, demos and tests # ---- Makefile.in.orig 2020-11-14 18:45:16.000000000 +0000 -+++ Makefile.in 2022-06-25 14:06:26.284881269 +0000 -@@ -572,7 +572,7 @@ - LIBGMPXX_LT_CURRENT = 10 - LIBGMPXX_LT_REVISION = 1 - LIBGMPXX_LT_AGE = 6 +--- Makefile.in.orig 2023-07-29 13:42:23.000000000 +0000 ++++ Makefile.in 2024-04-23 19:49:26.598228868 +0000 +@@ -573,7 +573,7 @@ + LIBGMPXX_LT_CURRENT = 11 + LIBGMPXX_LT_REVISION = 0 + LIBGMPXX_LT_AGE = 7 -SUBDIRS = tests mpn mpz mpq mpf printf scanf rand cxx demos tune doc +SUBDIRS = mpn mpz mpq mpf printf scanf rand cxx tune diff --git a/native/go/Makefile b/native/go/Makefile index e5bee87f84f..ff9405a0297 100644 --- a/native/go/Makefile +++ b/native/go/Makefile @@ -1,5 +1,5 @@ PKG_NAME = go -PKG_VERS = 1.21.8 +PKG_VERS = 1.21.9 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)$(PKG_VERS).linux-amd64.$(PKG_EXT) PKG_DIST_SITE = https://go.dev/dl diff --git a/native/go/digests b/native/go/digests index b409982f5b6..6b4d9215921 100644 --- a/native/go/digests +++ b/native/go/digests @@ -1,3 +1,3 @@ -go1.21.8.linux-amd64.tar.gz SHA1 fbafe2ea4ef3f786e904bbbb6838af105e6469eb -go1.21.8.linux-amd64.tar.gz SHA256 538b3b143dc7f32b093c8ffe0e050c260b57fc9d57a12c4140a639a8dd2b4e4f -go1.21.8.linux-amd64.tar.gz MD5 a3e6cd4ed28d6b25572d30bc011d5ef1 +go1.21.9.linux-amd64.tar.gz SHA1 0f20ba006a8de282ff0192ba9bb8b1bfd159fa75 +go1.21.9.linux-amd64.tar.gz SHA256 f76194c2dc607e0df4ed2e7b825b5847cb37e34fc70d780e2f6c7e805634a7ea +go1.21.9.linux-amd64.tar.gz MD5 d881736208e33b4efec8eb249e29e40e diff --git a/native/nasm/Makefile b/native/nasm/Makefile index bb699703fc5..d47efd9ab7e 100644 --- a/native/nasm/Makefile +++ b/native/nasm/Makefile @@ -1,5 +1,5 @@ PKG_NAME = nasm -PKG_VERS = 2.16.01 +PKG_VERS = 2.16.03 PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://fossies.org/linux/misc diff --git a/native/nasm/digests b/native/nasm/digests index 9c50a8c0271..5b94283afd7 100644 --- a/native/nasm/digests +++ b/native/nasm/digests @@ -1,3 +1,3 @@ -nasm-2.16.01.tar.xz SHA1 3ab515b4a7d50b7f8c63406a19070a93dcfdb820 -nasm-2.16.01.tar.xz SHA256 c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558 -nasm-2.16.01.tar.xz MD5 d755ba0d16f94616c2907f8cab7c748b +nasm-2.16.03.tar.xz SHA1 d3ceab29f8c62bdf9240032349deb594cb642863 +nasm-2.16.03.tar.xz SHA256 1412a1c760bbd05db026b6c0d1657affd6631cd0a63cddb6f73cc6d4aa616148 +nasm-2.16.03.tar.xz MD5 2b8c72c52eee4f20085065e68ac83b55 From c3a0be5fb63bddca6e3469eef0f26e44d01676ee Mon Sep 17 00:00:00 2001 From: hgy59 Date: Thu, 25 Apr 2024 00:12:49 +0200 Subject: [PATCH 14/45] python310: update to v3.10.14 (#6082) - update python310 to include working openssl for ARMv5 archs --- cross/python310/Makefile | 2 +- cross/python310/digests | 6 +++--- native/python310/Makefile | 2 +- native/python310/digests | 6 +++--- spk/python310/Makefile | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cross/python310/Makefile b/cross/python310/Makefile index 418f47c1eb5..c9d9c53d26e 100644 --- a/cross/python310/Makefile +++ b/cross/python310/Makefile @@ -1,5 +1,5 @@ PKG_NAME = python310 -PKG_VERS = 3.10.13 +PKG_VERS = 3.10.14 PKG_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS))) PKG_EXT = tar.xz PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT) diff --git a/cross/python310/digests b/cross/python310/digests index 9908929c0d8..73d7b7d7132 100644 --- a/cross/python310/digests +++ b/cross/python310/digests @@ -1,3 +1,3 @@ -Python-3.10.13.tar.xz SHA1 fa66c061cba1acee5e9fe69b7d22cca744a6ecda -Python-3.10.13.tar.xz SHA256 5c88848668640d3e152b35b4536ef1c23b2ca4bd2c957ef1ecbb053f571dd3f6 -Python-3.10.13.tar.xz MD5 8847dc6458d1431d0ae0f55942deeb89 +Python-3.10.14.tar.xz SHA1 9103b4716dff30b40fd0239982f3a2d851143a46 +Python-3.10.14.tar.xz SHA256 9c50481faa8c2832329ba0fc8868d0a606a680fc4f60ec48d26ce8e076751fda +Python-3.10.14.tar.xz MD5 05148354ce821ba7369e5b7958435400 diff --git a/native/python310/Makefile b/native/python310/Makefile index b2ba8e32ef1..80062b791bb 100644 --- a/native/python310/Makefile +++ b/native/python310/Makefile @@ -1,5 +1,5 @@ PKG_NAME = python310 -PKG_VERS = 3.10.13 +PKG_VERS = 3.10.14 PKG_EXT = tar.xz PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.python.org/ftp/python/$(PKG_VERS) diff --git a/native/python310/digests b/native/python310/digests index 9908929c0d8..73d7b7d7132 100644 --- a/native/python310/digests +++ b/native/python310/digests @@ -1,3 +1,3 @@ -Python-3.10.13.tar.xz SHA1 fa66c061cba1acee5e9fe69b7d22cca744a6ecda -Python-3.10.13.tar.xz SHA256 5c88848668640d3e152b35b4536ef1c23b2ca4bd2c957ef1ecbb053f571dd3f6 -Python-3.10.13.tar.xz MD5 8847dc6458d1431d0ae0f55942deeb89 +Python-3.10.14.tar.xz SHA1 9103b4716dff30b40fd0239982f3a2d851143a46 +Python-3.10.14.tar.xz SHA256 9c50481faa8c2832329ba0fc8868d0a606a680fc4f60ec48d26ce8e076751fda +Python-3.10.14.tar.xz MD5 05148354ce821ba7369e5b7958435400 diff --git a/spk/python310/Makefile b/spk/python310/Makefile index 8730b532a21..d1c20881b02 100644 --- a/spk/python310/Makefile +++ b/spk/python310/Makefile @@ -1,7 +1,7 @@ SPK_NAME = python310 -SPK_VERS = 3.10.13 +SPK_VERS = 3.10.14 SPK_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(SPK_VERS))).$(word 2,$(subst ., ,$(SPK_VERS))) -SPK_REV = 19 +SPK_REV = 20 SPK_ICON = src/python3.png DEPENDS = cross/$(SPK_NAME) @@ -13,7 +13,7 @@ DESCRIPTION_FRE = Language de programmation Python. DESCRIPTION_SPN = Lenguaje de programación Python. STARTABLE = no DISPLAY_NAME = Python 3.10 -CHANGELOG = "1. Update to Python 3.10.13" +CHANGELOG = "1. Update to Python 3.10.14" HOMEPAGE = https://www.python.org LICENSE = PSF From 30268231252f4c7e3405aeb8ba1975171a9fd1e2 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Sun, 5 May 2024 22:35:06 +0200 Subject: [PATCH 15/45] update git and gitea (#6092) * update git - update git to v2.45.0 and use cross/openssl3 - update git-lfs to v 3.5.1 * update gitea to v1.21.11 --- cross/git-lfs/Makefile | 2 +- cross/git-lfs/digests | 6 +++--- cross/git/Makefile | 4 ++-- cross/git/digests | 6 +++--- cross/gitea/Makefile | 2 +- cross/gitea/digests | 6 +++--- spk/git/Makefile | 6 +++--- spk/gitea/Makefile | 10 +++++----- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/cross/git-lfs/Makefile b/cross/git-lfs/Makefile index 484c23d29ba..ae703a06c2f 100644 --- a/cross/git-lfs/Makefile +++ b/cross/git-lfs/Makefile @@ -1,5 +1,5 @@ PKG_NAME = git-lfs -PKG_VERS = 3.4.0 +PKG_VERS = 3.5.1 PKG_EXT = tar.gz PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/git-lfs/git-lfs/archive diff --git a/cross/git-lfs/digests b/cross/git-lfs/digests index 78b2a86c8e5..d5dfefc11bc 100644 --- a/cross/git-lfs/digests +++ b/cross/git-lfs/digests @@ -1,3 +1,3 @@ -git-lfs-3.4.0.tar.gz SHA1 82cfca5bc4a3c2e5f6fe22402a0543ffd230ed69 -git-lfs-3.4.0.tar.gz SHA256 fa93f65cc5c15b96037a72cf243bc2cc04c94ea5cccc346664425d6d4bac66c2 -git-lfs-3.4.0.tar.gz MD5 9dba0b1ad1d26f834631181523e8edc5 +git-lfs-3.5.1.tar.gz SHA1 f47002b6a90b136c8d3a4d66c0da2f4042b5ae2f +git-lfs-3.5.1.tar.gz SHA256 d682a12c0bc48d08d28834dd0d575c91d53dd6c6db63c45c2db7c3dd2fb69ea4 +git-lfs-3.5.1.tar.gz MD5 c1a4758e6a0166a87466f2c974207cdc diff --git a/cross/git/Makefile b/cross/git/Makefile index f694f9afcd6..18a4499b42d 100644 --- a/cross/git/Makefile +++ b/cross/git/Makefile @@ -1,11 +1,11 @@ PKG_NAME = git -PKG_VERS = 2.43.0 +PKG_VERS = 2.45.0 PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://kernel.org/pub/software/scm/git PKG_DIR = $(PKG_NAME)-$(PKG_VERS) -DEPENDS = cross/libexpat cross/zlib cross/openssl cross/libssh2 cross/curl +DEPENDS = cross/libexpat cross/zlib cross/openssl3 cross/libssh2 cross/curl HOMEPAGE = https://git-scm.com COMMENT = Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals. diff --git a/cross/git/digests b/cross/git/digests index 59962843438..e25dad37f24 100644 --- a/cross/git/digests +++ b/cross/git/digests @@ -1,3 +1,3 @@ -git-2.43.0.tar.xz SHA1 d34f8331e3dcd7d2beb2f4af3e3d6db50b8036f1 -git-2.43.0.tar.xz SHA256 5446603e73d911781d259e565750dcd277a42836c8e392cac91cf137aa9b76ec -git-2.43.0.tar.xz MD5 66a036a0442b8d159b0eff5a0fe0dc94 +git-2.45.0.tar.xz SHA1 e764c858b083b8a21efedc879730ae1a281ec4a4 +git-2.45.0.tar.xz SHA256 0aac200bd06476e7df1ff026eb123c6827bc10fe69d2823b4bf2ebebe5953429 +git-2.45.0.tar.xz MD5 1daf15b08a3ef7bc58510ab75f5f1851 diff --git a/cross/gitea/Makefile b/cross/gitea/Makefile index 681b202a428..1d016ca65e2 100644 --- a/cross/gitea/Makefile +++ b/cross/gitea/Makefile @@ -1,5 +1,5 @@ PKG_NAME = gitea -PKG_VERS = 1.21.8 +PKG_VERS = 1.21.11 PKG_EXT = tar.gz PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/go-gitea/gitea/archive diff --git a/cross/gitea/digests b/cross/gitea/digests index ba4df49e5d5..226b03af937 100644 --- a/cross/gitea/digests +++ b/cross/gitea/digests @@ -1,3 +1,3 @@ -gitea-1.21.8.tar.gz SHA1 d775301a755bec79091fd06b7bb296c71491d0f6 -gitea-1.21.8.tar.gz SHA256 3d6a0ca9e894acae331369ac900f964b3122cf14cd792fc348a02a53e4d0f4b7 -gitea-1.21.8.tar.gz MD5 a24ac5866b66c32c119966408107cdc6 +gitea-1.21.11.tar.gz SHA1 7450cace7d94b00f06da5c3607bfb115c3c0f68f +gitea-1.21.11.tar.gz SHA256 9828409e71c9fcf46bbe8f858974d5b863dfc4a7e539165cef98890ac6bd2e2f +gitea-1.21.11.tar.gz MD5 442dbfa079d4febd2fdd7a9c5b753dec diff --git a/spk/git/Makefile b/spk/git/Makefile index b58f07a740d..94e9e6c8a5a 100644 --- a/spk/git/Makefile +++ b/spk/git/Makefile @@ -1,6 +1,6 @@ SPK_NAME = git -SPK_VERS = 2.43.0 -SPK_REV = 30 +SPK_VERS = 2.45.0 +SPK_REV = 31 SPK_ICON = src/git.png DEPENDS = cross/git @@ -11,7 +11,7 @@ DESCRIPTION = Git is a fast, scalable, distributed revision control system with DESCRIPTION_FRE = Git est un système de gestion de révision rapide, extensible et distribué avec un ensemble de commandes inhabituellement riche qui fournit à la fois des opérations de haut niveau et un accès complet aux structures de bas niveau. STARTABLE = no DISPLAY_NAME = Git -CHANGELOG = "1. Update git to v2.43.0.
2. Update OpenSSL to v3.1.4.
3. Update git-lfs to v3.4.0.
4. Fix git-lfs availability." +CHANGELOG = "1. Update git to v2.45.0.
2. Update OpenSSL to v3.1.5.
3. Update git-lfs to v3.5.1." HOMEPAGE = https://git-scm.com LICENSE = GPLv2 diff --git a/spk/gitea/Makefile b/spk/gitea/Makefile index 27be689c0c3..4dc09dbad52 100644 --- a/spk/gitea/Makefile +++ b/spk/gitea/Makefile @@ -1,16 +1,16 @@ SPK_NAME = gitea -SPK_VERS = 1.21.8 -SPK_REV = 12 -SPK_ICON = src/$(SPK_NAME).png +SPK_VERS = 1.21.11 +SPK_REV = 13 +SPK_ICON = src/gitea.png MAINTAINER = wkobiela DESCRIPTION = Gitea is a community managed lightweight code hosting solution written in Go. DISPLAY_NAME = Gitea -CHANGELOG = "1. Update to v1.21.8." +CHANGELOG = "1. Update to v1.21.11." LICENSE = MIT -DEPENDS = cross/$(SPK_NAME) +DEPENDS = cross/gitea SPK_DEPENDS = "git>=2" SERVICE_USER = auto From b896cd24b0bd7a939199b2f8b77f57ff2f498936 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Wed, 15 May 2024 07:38:13 +0200 Subject: [PATCH 16/45] octoprint: update to v1.10.1 (#6097) - update octroprint - ARMv5 packages are availble again, since #6025 --- spk/octoprint/Makefile | 6 +- spk/octoprint/src/requirements-crossenv.txt | 16 ++--- spk/octoprint/src/requirements-pure.txt | 66 ++++++++++----------- 3 files changed, 43 insertions(+), 45 deletions(-) diff --git a/spk/octoprint/Makefile b/spk/octoprint/Makefile index 42b2a3c7cef..7a1dbed907e 100644 --- a/spk/octoprint/Makefile +++ b/spk/octoprint/Makefile @@ -1,6 +1,6 @@ SPK_NAME = octoprint -SPK_VERS = 1.9.2 -SPK_REV = 11 +SPK_VERS = 1.10.1 +SPK_REV = 12 SPK_ICON = src/octoprint.png DSM_UI_DIR = app @@ -21,7 +21,7 @@ ADMIN_PORT = $(SERVICE_PORT) DISPLAY_NAME = OctoPrint HOMEPAGE = https://octoprint.org/ LICENSE = AGPLv3 -CHANGELOG = "1. Update OctoPrint to v1.9.2.
2. Python dependency to 3.11." +CHANGELOG = "1. Update OctoPrint to v1.10.1.
2. Bring back package for ARMv5." # SERVICE_COMMAND is in src/service-setup.sh STARTABLE = yes diff --git a/spk/octoprint/src/requirements-crossenv.txt b/spk/octoprint/src/requirements-crossenv.txt index ffb3381cf4e..d7a3db77673 100644 --- a/spk/octoprint/src/requirements-crossenv.txt +++ b/spk/octoprint/src/requirements-crossenv.txt @@ -1,12 +1,12 @@ argon2_cffi_bindings==21.2.0 -# cffi==1.15.1 => python 3.11 package -charset_normalizer==3.2.0 -frozendict==2.3.8 -MarkupSafe==2.1.3 +# cffi==1.16.0 => python 3.11 package +charset_normalizer==3.3.2 +frozendict==2.4.4 +MarkupSafe==2.1.5 netifaces==0.11.0 -psutil==5.9.5 -pydantic==1.10.11 +psutil==5.9.8 +pydantic==1.10.12 PyYAML==6.0.1 -regex==2023.6.3 -tornado==6.3.2 +regex==2024.5.10 +tornado==6.2 wrapt==1.15.0 diff --git a/spk/octoprint/src/requirements-pure.txt b/spk/octoprint/src/requirements-pure.txt index 53122b234f9..42e9d5b22de 100644 --- a/spk/octoprint/src/requirements-pure.txt +++ b/spk/octoprint/src/requirements-pure.txt @@ -1,63 +1,61 @@ -OctoPrint==1.9.2 -OctoPrint_FileCheck==2021.2.23 +OctoPrint==1.10.1 +OctoPrint_FileCheck==2024.3.27 OctoPrint_FirmwareCheck==2021.10.11 -OctoPrint_PiSupport==2023.5.24 +OctoPrint_PiSupport==2023.10.10 -argon2_cffi==21.3.0 -async_timeout==4.0.2 +argon2_cffi==23.1.0 Babel==2.12.1 -blinker==1.6.2 +blinker==1.6.3 cachelib==0.10.2 -#certifi==2023.7.22 ==> python311 +#certifi==2024.2.2 ==> python311 class_doc==0.2.6 -click==8.1.6 -colorlog==6.7.0 +click==8.1.7 +colorlog==6.8.2 Deprecated==1.2.14 -emoji==2.6.0 -feedparser==6.0.10 +emoji==2.11.1 +feedparser==6.0.11 filetype==1.2.0 Flask==2.2.5 -Flask_Assets==2.0 +Flask_Assets==2.1.0 flask_babel==3.1.0 -Flask_Limiter==3.3.1 -Flask_Login==0.6.2 +Flask_Limiter==3.6.0 +Flask_Login==0.6.3 future==0.18.3 -idna==3.4 +idna==3.7 ifaddr==0.2.0 -importlib_resources==6.0.0 -itsdangerous==2.1.2 -Jinja2==3.1.2 -limits==3.5.0 -Markdown==3.4.3 +importlib_resources==6.4.0 +itsdangerous==2.2.0 +jinja2==3.1.4 +limits==3.12.0 +Markdown==3.4.4 markdown_it_py==3.0.0 mdurl==0.1.2 more_itertools==9.1.0 netaddr==0.8.0 ordered_set==4.1.0 -packaging==23.1 +packaging==24.0 passlib==1.7.4 pathvalidate==2.5.2 -#pip==23.1.2 ==> python311 -pkginfo==1.9.6 -pycparser==2.21 -Pygments==2.15.1 +#pip==23.2.1 ==> python311 +pkginfo==1.10.0 +pycparser==2.22 +pygments==2.18.0 pylru==1.2.1 pyserial==3.5 -pytz==2023.3 +pytz==2024.1 requests==2.31.0 -rich==13.4.2 +rich==13.7.1 sarge==0.1.7.post1 semantic_version==2.10.0 -sentry_sdk==1.28.1 +sentry_sdk==1.45.0 #setuptools==65.5.0 ==> python311 sgmllib3k==1.0.0 -typing_extensions==4.7.1 -Unidecode==1.3.6 -urllib3==2.0.4 +typing_extensions==4.11.0 +Unidecode==1.3.8 +urllib3==2.2.1 watchdog==2.3.1 webassets==2.0 websocket_client==1.6.1 Werkzeug==2.2.3 -wheel==0.41.0 -zeroconf==0.39.4 -zipstream_ng==1.6.0 +zeroconf==0.132.2 +zipstream_ng==1.7.1 From 18f68fbacddf5e38ce7b7c13eab1f8ad0a922e7d Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Thu, 30 May 2024 17:39:48 -0400 Subject: [PATCH 17/45] armv5 rust version frozen for no-atomic support (#6108) * armv5 rust version frozen for no-atomic support --- mk/spksrc.cross-rust-env.mk | 1 + mk/spksrc.tc-rust.mk | 4 ++-- mk/spksrc.tc.mk | 4 +--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mk/spksrc.cross-rust-env.mk b/mk/spksrc.cross-rust-env.mk index 0aa88bfa86e..d5ec3b5f9ba 100644 --- a/mk/spksrc.cross-rust-env.mk +++ b/mk/spksrc.cross-rust-env.mk @@ -32,6 +32,7 @@ RUSTUP_DEFAULT_TOOLCHAIN_STAGE = 2 # map archs to rust targets ifeq ($(findstring $(RUST_ARCH), $(ARMv5_ARCHS)),$(RUST_ARCH)) +RUSTUP_DEFAULT_TOOLCHAIN = 1.77.2 RUST_TARGET = armv5te-unknown-linux-gnueabi endif ifeq ($(findstring $(RUST_ARCH), $(ARMv7_ARCHS)),$(RUST_ARCH)) diff --git a/mk/spksrc.tc-rust.mk b/mk/spksrc.tc-rust.mk index 69918445c71..11130ad5c3a 100644 --- a/mk/spksrc.tc-rust.mk +++ b/mk/spksrc.tc-rust.mk @@ -57,7 +57,7 @@ rust_toml: echo "compiler-docs = false" ; \ echo @echo "[rust]" ; \ - echo 'channel = "stable"' ; \ + echo 'channel = "$(RUSTUP_DEFAULT_TOOLCHAIN)"' ; \ echo 'lto = "off"' ; \ echo @echo "[llvm]" ; \ @@ -104,7 +104,7 @@ rustc_target: $(PRE_RUSTC_TARGET) $(TC_LOCAL_VARS_RUST) flock -u 5 ifeq ($(TC_RUSTUP_TOOLCHAIN),$(RUSTUP_DEFAULT_TOOLCHAIN)) @$(MSG) "rustup target add $(RUST_TARGET)" - rustup override set stable + rustup override set $(RUSTUP_DEFAULT_TOOLCHAIN) rustup target add $(RUST_TARGET) rustup show else diff --git a/mk/spksrc.tc.mk b/mk/spksrc.tc.mk index 6cda4c398e4..2ae3ae4d169 100644 --- a/mk/spksrc.tc.mk +++ b/mk/spksrc.tc.mk @@ -11,6 +11,7 @@ include ../../mk/spksrc.common.mk ### Include common rules include ../../mk/spksrc.common-rules.mk +# Include ross-rust-env.mk to generate install its toolchain include ../../mk/spksrc.cross-rust-env.mk # Include cross-cmake-env.mk to generate its toolchain file @@ -19,9 +20,6 @@ include ../../mk/spksrc.cross-cmake-env.mk # Include cross-meson-env.mk to generate its toolchain file include ../../mk/spksrc.cross-meson-env.mk -##### rust specific configurations -include ../../mk/spksrc.cross-rust-env.mk - # Configure the included makefiles URLS = $(TC_DIST_SITE)/$(TC_DIST_NAME) NAME = $(TC_NAME) From 986c281af272471f78c7e0e7cf08baff1c385a36 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Fri, 31 May 2024 08:06:29 +0200 Subject: [PATCH 18/45] go: update to v1.22 (#6094) - update native/go to v1.22.3 (required by kopia in #5845) --- native/go/Makefile | 2 +- native/go/digests | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/native/go/Makefile b/native/go/Makefile index ff9405a0297..2a1d21873cf 100644 --- a/native/go/Makefile +++ b/native/go/Makefile @@ -1,5 +1,5 @@ PKG_NAME = go -PKG_VERS = 1.21.9 +PKG_VERS = 1.22.3 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)$(PKG_VERS).linux-amd64.$(PKG_EXT) PKG_DIST_SITE = https://go.dev/dl diff --git a/native/go/digests b/native/go/digests index 6b4d9215921..d950fe507d9 100644 --- a/native/go/digests +++ b/native/go/digests @@ -1,3 +1,3 @@ -go1.21.9.linux-amd64.tar.gz SHA1 0f20ba006a8de282ff0192ba9bb8b1bfd159fa75 -go1.21.9.linux-amd64.tar.gz SHA256 f76194c2dc607e0df4ed2e7b825b5847cb37e34fc70d780e2f6c7e805634a7ea -go1.21.9.linux-amd64.tar.gz MD5 d881736208e33b4efec8eb249e29e40e +go1.22.3.linux-amd64.tar.gz SHA1 eac5030e85c878d40d59a485ac2aacf3e292384e +go1.22.3.linux-amd64.tar.gz SHA256 8920ea521bad8f6b7bc377b4824982e011c19af27df88a815e3586ea895f1b36 +go1.22.3.linux-amd64.tar.gz MD5 4d6b67c3e7bfd4ecb71571c0ddf2e908 From 5eccb90fa2db1f33854639830a3211f650d4a491 Mon Sep 17 00:00:00 2001 From: Safihre Date: Fri, 31 May 2024 22:20:53 +0200 Subject: [PATCH 19/45] Update SABnzbd to 4.3.2 (#6107) --- cross/sabnzbd/Makefile | 2 +- cross/sabnzbd/digests | 6 ++--- spk/sabnzbd/Makefile | 6 ++--- spk/sabnzbd/src/requirements-crossenv.txt | 10 ++++--- spk/sabnzbd/src/requirements-pure.txt | 33 ++++++++++++++++------- 5 files changed, 38 insertions(+), 19 deletions(-) diff --git a/cross/sabnzbd/Makefile b/cross/sabnzbd/Makefile index a418fdb5b6b..fb008ff4856 100644 --- a/cross/sabnzbd/Makefile +++ b/cross/sabnzbd/Makefile @@ -1,5 +1,5 @@ PKG_NAME = SABnzbd -PKG_VERS = 4.2.3 +PKG_VERS = 4.3.2 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS)-src.$(PKG_EXT) PKG_DIST_SITE = https://github.com/sabnzbd/sabnzbd/releases/download/$(PKG_VERS) diff --git a/cross/sabnzbd/digests b/cross/sabnzbd/digests index 06a23627e94..bbb6e822961 100644 --- a/cross/sabnzbd/digests +++ b/cross/sabnzbd/digests @@ -1,3 +1,3 @@ -SABnzbd-4.2.3-src.tar.gz SHA1 bc4cbb73130568b7d22279f216db8c31137f0f00 -SABnzbd-4.2.3-src.tar.gz SHA256 f16314cf4032dcaccfd0b4af4d0e67a55c37f31870af3ca90f80d5f547ed8c25 -SABnzbd-4.2.3-src.tar.gz MD5 afb88648a2b90a06be8e0a336a711fc9 +SABnzbd-4.3.2-src.tar.gz SHA1 b7cc8ec479f252fe97be1768c38bf6c4ecafac33 +SABnzbd-4.3.2-src.tar.gz SHA256 d238ffa957e71ad22c16535922cb32e7e6e84afc79eadd5c8f668ce591e207be +SABnzbd-4.3.2-src.tar.gz MD5 a5a98f63f22fcce0e9cb98fa06e2e86c \ No newline at end of file diff --git a/spk/sabnzbd/Makefile b/spk/sabnzbd/Makefile index 13476095dc2..f77d3d7f791 100644 --- a/spk/sabnzbd/Makefile +++ b/spk/sabnzbd/Makefile @@ -1,6 +1,6 @@ SPK_NAME = sabnzbd -SPK_VERS = 4.2.3 -SPK_REV = 69 +SPK_VERS = 4.3.2 +SPK_REV = 70 SPK_ICON = src/sabnzbd.png PYTHON_PACKAGE = python311 @@ -15,7 +15,7 @@ DESCRIPTION_FRE = SABnzbd rend Usenet aussi simple et automatisé que possible. DESCRIPTION_SPN = SABnzbd hace que Usenet sea lo más simple posible, automatizando todo lo que se puede. Todo lo que tienes que hacer es agregar un archivo .nzb. SABnzbd empieza desde ahí. Tus archivos serán automáticamente descargados, verificados, reparados, descomprimidos y archivados. DISPLAY_NAME = SABnzbd STARTABLE = yes -CHANGELOG = "Update SABnzbd to 4.2.3." +CHANGELOG = "Update SABnzbd to 4.3.2." HOMEPAGE = https://sabnzbd.org LICENSE = GPL diff --git a/spk/sabnzbd/src/requirements-crossenv.txt b/spk/sabnzbd/src/requirements-crossenv.txt index beabdfdc254..512a6a24b53 100644 --- a/spk/sabnzbd/src/requirements-crossenv.txt +++ b/spk/sabnzbd/src/requirements-crossenv.txt @@ -1,5 +1,9 @@ # cross-compiled wheels cffi==1.16.0 -Cheetah3==3.2.6 -sabctools==8.1.0 -orjson==3.9.10 +CT3==3.3.3.post1 +sabctools==8.2.3 +orjson==3.10.3 + +# AppRise/Requests Requirements +PyYAML==6.0.1 +charset_normalizer==3.3.2 diff --git a/spk/sabnzbd/src/requirements-pure.txt b/spk/sabnzbd/src/requirements-pure.txt index 15ed0ece34b..2cbfa3e0dad 100644 --- a/spk/sabnzbd/src/requirements-pure.txt +++ b/spk/sabnzbd/src/requirements-pure.txt @@ -1,24 +1,39 @@ # Wheels that absolutely needs # to be managed as pure-python +pycparser==2.22 feedparser==6.0.11 configobj==5.0.8 -cheroot==10.0.0 +cheroot==10.0.1 cherrypy==18.9.0 -jaraco.functools==4.0.0 +jaraco.functools==4.0.1 jaraco.collections==5.0.0 jaraco.text==3.8.1 # Newer version introduces irrelevant extra dependencies -jaraco.classes==3.3.0 +jaraco.classes==3.4.0 jaraco.context==4.3.0 more-itertools==10.2.0 zc.lockfile==3.0.post1 -python-dateutil==2.8.2 -tempora==5.5.0 -pytz==2023.3.post1 +python-dateutil==2.9.0.post0 +tempora==5.5.1 +pytz==2024.1 sgmllib3k==1.0.0 portend==3.2.0 chardet==5.2.0 PySocks==1.7.1 -puremagic==1.15 +puremagic==1.23 guessit==3.8.0 -babelfish==0.6.0 -rebulk==3.2.0 \ No newline at end of file +babelfish==0.6.1 +rebulk==3.2.0 + +# Apprise Requirements +apprise==1.8.0 +requests==2.31.0 +requests-oauthlib==2.0.0 +markdown==3.6 +paho-mqtt==1.6.1 # Pinned, newer versions don't work with AppRise yet + +# Requests Requirements +idna==3.7 +urllib3==2.2.1 +oauthlib==3.2.2 +PyJWT==2.8.0 +blinker==1.8.2 From 3174f7bc3be686f992c17417d6cadb4d11a7a6fb Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Mon, 3 Jun 2024 20:32:53 -0400 Subject: [PATCH 20/45] rust-qoriq: Migrate from native to toolchain/syno-qoriq-6.2.4-rust (#6123) --- .../syno-qoriq-6.2.4-rust}/Makefile | 0 .../syno-qoriq-6.2.4-rust}/digests | 0 toolchain/syno-qoriq-6.2.4/Makefile | 9 +++++---- 3 files changed, 5 insertions(+), 4 deletions(-) rename {native/rust-qoriq => toolchain/syno-qoriq-6.2.4-rust}/Makefile (100%) rename {native/rust-qoriq => toolchain/syno-qoriq-6.2.4-rust}/digests (100%) diff --git a/native/rust-qoriq/Makefile b/toolchain/syno-qoriq-6.2.4-rust/Makefile similarity index 100% rename from native/rust-qoriq/Makefile rename to toolchain/syno-qoriq-6.2.4-rust/Makefile diff --git a/native/rust-qoriq/digests b/toolchain/syno-qoriq-6.2.4-rust/digests similarity index 100% rename from native/rust-qoriq/digests rename to toolchain/syno-qoriq-6.2.4-rust/digests diff --git a/toolchain/syno-qoriq-6.2.4/Makefile b/toolchain/syno-qoriq-6.2.4/Makefile index 9fb31a0bff5..0d49dd95eee 100644 --- a/toolchain/syno-qoriq-6.2.4/Makefile +++ b/toolchain/syno-qoriq-6.2.4/Makefile @@ -11,13 +11,14 @@ TC_SYSROOT = $(TC_TARGET)/sysroot TC_EXTRA_CFLAGS = -mcpu=8548 -mhard-float -mfloat-gprs=double TC_RUSTFLAGS = -C target-cpu=e500 -OPTIONAL_DEPENDS = native/rust-qoriq -POST_FIX_TARGET = qoriq_post_fix_target - include ../../mk/spksrc.tc.mk +OPTIONAL_DEPENDS = toolchain/syno-$(TC_ARCH)-$(TC_VERS)-rust + ifneq ($(RUST_BUILD_TOOLCHAIN),1) -DEPENDS = native/rust-qoriq +DEPENDS = toolchain/syno-$(TC_ARCH)-$(TC_VERS)-rust +else +POST_FIX_TARGET = qoriq_post_fix_target endif .PHONY: qoriq_post_fix_target From 61f7d56bf6e5405c54f1592c1b7885d46d613a9a Mon Sep 17 00:00:00 2001 From: hgy59 Date: Fri, 7 Jun 2024 14:38:37 +0200 Subject: [PATCH 21/45] c-ares: update and fix download link (#6128) - update c-ares to v1.29.0 - limit c-ares to v1.28.1 for OLD_PPC_ARCHS - c-ares sources are now available on github only --- cross/c-ares-1.28/Makefile | 23 +++++++++++++++++++++++ cross/{c-ares => c-ares-1.28}/PLIST | 2 +- cross/c-ares-1.28/digests | 3 +++ cross/c-ares-latest/Makefile | 26 ++++++++++++++++++++++++++ cross/c-ares-latest/PLIST | 3 +++ cross/c-ares-latest/digests | 3 +++ cross/c-ares/Makefile | 22 +++++++++------------- cross/c-ares/digests | 3 --- 8 files changed, 68 insertions(+), 17 deletions(-) create mode 100644 cross/c-ares-1.28/Makefile rename cross/{c-ares => c-ares-1.28}/PLIST (60%) create mode 100644 cross/c-ares-1.28/digests create mode 100644 cross/c-ares-latest/Makefile create mode 100644 cross/c-ares-latest/PLIST create mode 100644 cross/c-ares-latest/digests delete mode 100644 cross/c-ares/digests diff --git a/cross/c-ares-1.28/Makefile b/cross/c-ares-1.28/Makefile new file mode 100644 index 00000000000..b314b0e7a10 --- /dev/null +++ b/cross/c-ares-1.28/Makefile @@ -0,0 +1,23 @@ +PKG_NAME = c-ares +PKG_VERS = 1.28.1 +PKG_EXT = tar.gz +PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://github.com/c-ares/c-ares/releases/download/cares-$(subst .,_,$(PKG_VERS)) +PKG_DIR = $(PKG_NAME)-$(PKG_VERS) + +DEPENDS = + +HOMEPAGE = https://c-ares.org/ +COMMENT = c-ares is a C library for asynchronous DNS requests (including name resolves). +LICENSE = MIT + +POST_CONFIGURE_TARGET = cares_post_configure + +CMAKE_ARGS += -DCARES_BUILD_TOOLS=OFF + +include ../../mk/spksrc.cross-cmake.mk + +.PHONY: cares_post_configure +cares_post_configure: + @$(MSG) Create target include folder to suppress ignorable error logs + @$(RUN) install -d $(INSTALL_DIR)$(INSTALL_PREFIX)/include diff --git a/cross/c-ares/PLIST b/cross/c-ares-1.28/PLIST similarity index 60% rename from cross/c-ares/PLIST rename to cross/c-ares-1.28/PLIST index 2e92bf44a99..633c20dea99 100644 --- a/cross/c-ares/PLIST +++ b/cross/c-ares-1.28/PLIST @@ -1,3 +1,3 @@ lnk:lib/libcares.so lnk:lib/libcares.so.2 -lib:lib/libcares.so.2.12.0 +lib:lib/libcares.so.2.13.1 diff --git a/cross/c-ares-1.28/digests b/cross/c-ares-1.28/digests new file mode 100644 index 00000000000..90b8e3ef481 --- /dev/null +++ b/cross/c-ares-1.28/digests @@ -0,0 +1,3 @@ +c-ares-1.28.1.tar.gz SHA1 3a55cc7d21a4eff683bfb03c12067c44c0c43698 +c-ares-1.28.1.tar.gz SHA256 675a69fc54ddbf42e6830bc671eeb6cd89eeca43828eb413243fd2c0a760809d +c-ares-1.28.1.tar.gz MD5 2b0f0df7491538a0d10f3310e13d4b5f diff --git a/cross/c-ares-latest/Makefile b/cross/c-ares-latest/Makefile new file mode 100644 index 00000000000..f593d2fc987 --- /dev/null +++ b/cross/c-ares-latest/Makefile @@ -0,0 +1,26 @@ +PKG_NAME = c-ares +PKG_VERS = 1.29.0 +PKG_EXT = tar.gz +PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://github.com/c-ares/c-ares/releases/download/cares-$(subst .,_,$(PKG_VERS)) +PKG_DIR = $(PKG_NAME)-$(PKG_VERS) + +DEPENDS = + +# ares_event_configchg.c:140: error: 'IN_NONBLOCK' undeclared (first use in this function) +UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) + +HOMEPAGE = https://c-ares.org/ +COMMENT = c-ares is a C library for asynchronous DNS requests (including name resolves). +LICENSE = MIT + +POST_CONFIGURE_TARGET = cares_post_configure + +CMAKE_ARGS += -DCARES_BUILD_TOOLS=OFF + +include ../../mk/spksrc.cross-cmake.mk + +.PHONY: cares_post_configure +cares_post_configure: + @$(MSG) Create target include folder to suppress ignorable error logs + @$(RUN) install -d $(INSTALL_DIR)$(INSTALL_PREFIX)/include diff --git a/cross/c-ares-latest/PLIST b/cross/c-ares-latest/PLIST new file mode 100644 index 00000000000..88a89937cee --- /dev/null +++ b/cross/c-ares-latest/PLIST @@ -0,0 +1,3 @@ +lnk:lib/libcares.so +lnk:lib/libcares.so.2 +lib:lib/libcares.so.2.14.0 diff --git a/cross/c-ares-latest/digests b/cross/c-ares-latest/digests new file mode 100644 index 00000000000..f14b2a2d6ea --- /dev/null +++ b/cross/c-ares-latest/digests @@ -0,0 +1,3 @@ +c-ares-1.29.0.tar.gz SHA1 69d14a6ea7e414a290e3e3f058210ef02d469c0b +c-ares-1.29.0.tar.gz SHA256 0b89fa425b825c4c7bc708494f374ae69340e4d1fdc64523bdbb2750bfc02ea7 +c-ares-1.29.0.tar.gz MD5 0768b7b8a7318be4576a68a7c31db6fb diff --git a/cross/c-ares/Makefile b/cross/c-ares/Makefile index 50b17cf006f..f909758be5f 100644 --- a/cross/c-ares/Makefile +++ b/cross/c-ares/Makefile @@ -1,16 +1,12 @@ -PKG_NAME = c-ares -PKG_VERS = 1.27.0 -PKG_EXT = tar.gz -PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://c-ares.org/download -PKG_DIR = $(PKG_NAME)-$(PKG_VERS) +PKG_NAME = c-ares-main -DEPENDS = +OPTIONAL_DEPENDS = cross/c-ares-latest +OPTIONAL_DEPENDS += cross/c-ares-1.28 -HOMEPAGE = https://c-ares.org/ -COMMENT = c-ares is a C library for asynchronous DNS requests (including name resolves). -LICENSE = MIT +include ../../mk/spksrc.main-depends.mk -CMAKE_ARGS += -DCARES_BUILD_TOOLS=OFF - -include ../../mk/spksrc.cross-cmake.mk +ifeq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH)) +DEPENDS = cross/c-ares-1.28 +else +DEPENDS = cross/c-ares-latest +endif diff --git a/cross/c-ares/digests b/cross/c-ares/digests deleted file mode 100644 index 2e35569618c..00000000000 --- a/cross/c-ares/digests +++ /dev/null @@ -1,3 +0,0 @@ -c-ares-1.27.0.tar.gz SHA1 839f67cfb067b35e040b6fd3dd1bcf5c72af4277 -c-ares-1.27.0.tar.gz SHA256 0a72be66959955c43e2af2fbd03418e82a2bd5464604ec9a62147e37aceb420b -c-ares-1.27.0.tar.gz MD5 e69ed15d01d1824a0241946b283abf79 From d946e751d92e172b06cba6a966528f88c3269938 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Fri, 7 Jun 2024 16:04:30 +0200 Subject: [PATCH 22/45] openssl3: update to v3.1.6 (#6129) --- cross/openssl3/Makefile | 2 +- cross/openssl3/digests | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cross/openssl3/Makefile b/cross/openssl3/Makefile index 234247a2cec..961b7fd39eb 100644 --- a/cross/openssl3/Makefile +++ b/cross/openssl3/Makefile @@ -1,5 +1,5 @@ PKG_NAME = openssl3 -PKG_VERS = 3.1.5 +PKG_VERS = 3.1.6 PKG_EXT = tar.gz PKG_DIST_NAME = openssl-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.openssl.org/source diff --git a/cross/openssl3/digests b/cross/openssl3/digests index 0d291b56a16..bea3e409e78 100644 --- a/cross/openssl3/digests +++ b/cross/openssl3/digests @@ -1,3 +1,3 @@ -openssl-3.1.5.tar.gz SHA1 bae9e00477fb036e28f1c2e9a837fb6992823c57 -openssl-3.1.5.tar.gz SHA256 6ae015467dabf0469b139ada93319327be24b98251ffaeceda0221848dc09262 -openssl-3.1.5.tar.gz MD5 567235bf15ad72fcb9555e3b1c8ee4bc +openssl-3.1.6.tar.gz SHA1 2ab959fbc11283a0bc7a39e33b8f6862372cfc9a +openssl-3.1.6.tar.gz SHA256 5d2be4036b478ef3cb0a854ca9b353072c3a0e26d8a56f8f0ab9fb6ed32d38d7 +openssl-3.1.6.tar.gz MD5 f758a2f7ec64e13620dc5f2030d03876 From 602f1d98fb91e44bb06b1cca7e5c290116db6831 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Sat, 8 Jun 2024 23:32:27 +0200 Subject: [PATCH 23/45] Update synocli-monitor (#6127) * synocli-monitor update tools and add dedicated lsof - Add actual lsof and drop lsof of busybox - Update bandwhich to v0.22.2 - Update bottom to v0.9.6 - Update htop to v3.3.0 - Update iperf2 to v2.3.0 - Update iperf3 to v3.17.1 (some models are limited to iperf3 3.15) - Update net-snmp v5.9.4 - Update procs to v0.14.5 * iperf3: keep patch for older kernels * cross/iperf3: fix for DSM 5.2 --- cross/bandwhich/Makefile | 4 +-- cross/bandwhich/digests | 6 ++-- cross/bottom/Makefile | 2 +- cross/bottom/digests | 6 ++-- cross/busybox/configs/procutils | 1 - cross/busybox/configs/procutils.dsm5 | 1 - cross/htop/Makefile | 2 +- cross/htop/digests | 6 ++-- cross/iperf2/Makefile | 2 +- cross/iperf2/digests | 6 ++-- cross/iperf3-3.15/Makefile | 25 +++++++++++++ cross/{iperf3 => iperf3-3.15}/PLIST | 0 cross/iperf3-3.15/digests | 3 ++ ...h-portable-endian-for-old-ppc-arches.patch | 0 ...h-conflicts-for-Synology-3.x-Kernels.patch | 0 cross/iperf3-latest/Makefile | 25 +++++++++++++ cross/iperf3-latest/PLIST | 4 +++ cross/iperf3-latest/digests | 3 ++ ...h-conflicts-for-Synology-3.x-Kernels.patch | 22 ++++++++++++ cross/iperf3/Makefile | 30 ++++++---------- cross/iperf3/digests | 3 -- cross/lsof/Makefile | 26 ++++++++++++++ cross/lsof/PLIST | 1 + cross/lsof/digests | 3 ++ .../001-disable-build-of-man-pages.patch | 24 +++++++++++++ cross/net-snmp/Makefile | 4 +-- cross/net-snmp/PLIST | 3 +- cross/net-snmp/digests | 6 ++-- cross/nmon/Makefile | 2 +- cross/nmon/digests | 6 ++-- cross/procs/Makefile | 2 +- cross/procs/digests | 6 ++-- diyspk/htop/Makefile | 13 ++++--- diyspk/iperf2/Makefile | 6 ++-- diyspk/iperf3/Makefile | 13 +++++-- diyspk/lsof/Makefile | 16 +++++++++ diyspk/net-snmp/Makefile | 35 +++++++++++++++++++ diyspk/nmon/Makefile | 5 ++- spk/synocli-monitor/Makefile | 12 ++++--- 39 files changed, 258 insertions(+), 76 deletions(-) create mode 100644 cross/iperf3-3.15/Makefile rename cross/{iperf3 => iperf3-3.15}/PLIST (100%) create mode 100644 cross/iperf3-3.15/digests rename cross/{iperf3 => iperf3-3.15}/patches/001-patch-portable-endian-for-old-ppc-arches.patch (100%) rename cross/{iperf3 => iperf3-3.15}/patches/002-fix-netinet_in.h-conflicts-for-Synology-3.x-Kernels.patch (100%) create mode 100644 cross/iperf3-latest/Makefile create mode 100644 cross/iperf3-latest/PLIST create mode 100644 cross/iperf3-latest/digests create mode 100644 cross/iperf3-latest/patches/002-fix-netinet_in.h-conflicts-for-Synology-3.x-Kernels.patch delete mode 100644 cross/iperf3/digests create mode 100644 cross/lsof/Makefile create mode 100644 cross/lsof/PLIST create mode 100644 cross/lsof/digests create mode 100644 cross/lsof/patches/001-disable-build-of-man-pages.patch create mode 100644 diyspk/lsof/Makefile create mode 100644 diyspk/net-snmp/Makefile diff --git a/cross/bandwhich/Makefile b/cross/bandwhich/Makefile index b3de163babd..7b2bafd3e13 100644 --- a/cross/bandwhich/Makefile +++ b/cross/bandwhich/Makefile @@ -1,7 +1,7 @@ PKG_NAME = bandwhich -PKG_VERS = 0.20.0 +PKG_VERS = 0.22.2 PKG_EXT = tar.gz -PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) +PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/imsnif/bandwhich/archive PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) diff --git a/cross/bandwhich/digests b/cross/bandwhich/digests index c262006f53c..5c8ef3830b5 100644 --- a/cross/bandwhich/digests +++ b/cross/bandwhich/digests @@ -1,3 +1,3 @@ -bandwhich-0.20.0.tar.gz SHA1 357c691219831a68524f009f58efc6011e8c0d68 -bandwhich-0.20.0.tar.gz SHA256 4bbf05be32439049edd50bd1e4d5a2a95b0be8d36782e4100732f0cc9f19ba12 -bandwhich-0.20.0.tar.gz MD5 ade13a9a94e0c9667b8dd5e55425091a +bandwhich-0.22.2.tar.gz SHA1 0c9a1cebd2db2562bf52bfbeee13c03770a8014b +bandwhich-0.22.2.tar.gz SHA256 4c41719549e05dbaac1bc84828269e59b2f2032e76ae646da9b9e3b87e5a5fd1 +bandwhich-0.22.2.tar.gz MD5 9389c4eb67ca86dc86ce550f40f93586 diff --git a/cross/bottom/Makefile b/cross/bottom/Makefile index 6ab256c968f..4429dd21b2c 100644 --- a/cross/bottom/Makefile +++ b/cross/bottom/Makefile @@ -1,5 +1,5 @@ PKG_NAME = bottom -PKG_VERS = 0.9.2 +PKG_VERS = 0.9.6 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/ClementTsang/bottom/archive diff --git a/cross/bottom/digests b/cross/bottom/digests index db2740ba256..cd12eaaa36f 100644 --- a/cross/bottom/digests +++ b/cross/bottom/digests @@ -1,3 +1,3 @@ -bottom-0.9.2.tar.gz SHA1 af17bcaea5c86bfeaddbc1405160db9b7a0a21e0 -bottom-0.9.2.tar.gz SHA256 c6b1f6eefa814607cbc6f1ebf6358a070293413d09583963970d650b724a3b3a -bottom-0.9.2.tar.gz MD5 75c7f75cc1a9be6a078b292a63d22dd4 +bottom-0.9.6.tar.gz SHA1 034d0b70aa1eb5da9eda9b1611f9ab329d1135fb +bottom-0.9.6.tar.gz SHA256 202130e0d7c362d0d0cf211f6a13e31be3a02f13f998f88571e59a7735d60667 +bottom-0.9.6.tar.gz MD5 7a0b000bbf1e3db4ab78ca45d2ba8cbf diff --git a/cross/busybox/configs/procutils b/cross/busybox/configs/procutils index 7ef83b0099e..86c3acccdbf 100644 --- a/cross/busybox/configs/procutils +++ b/cross/busybox/configs/procutils @@ -1,6 +1,5 @@ CONFIG_LONG_OPTS=y CONFIG_IOSTAT=y -CONFIG_LSOF=y CONFIG_PGREP=y CONFIG_FEATURE_PIDOF_SINGLE=y CONFIG_FEATURE_PIDOF_OMIT=y diff --git a/cross/busybox/configs/procutils.dsm5 b/cross/busybox/configs/procutils.dsm5 index e3f82558475..75dc6ca926a 100644 --- a/cross/busybox/configs/procutils.dsm5 +++ b/cross/busybox/configs/procutils.dsm5 @@ -1,6 +1,5 @@ CONFIG_LONG_OPTS=y CONFIG_IOSTAT=y -CONFIG_LSOF=y CONFIG_PGREP=y CONFIG_FEATURE_PIDOF_SINGLE=y CONFIG_FEATURE_PIDOF_OMIT=y diff --git a/cross/htop/Makefile b/cross/htop/Makefile index c78019d3ee3..b9d600ca13f 100644 --- a/cross/htop/Makefile +++ b/cross/htop/Makefile @@ -1,5 +1,5 @@ PKG_NAME = htop -PKG_VERS = 3.2.2 +PKG_VERS = 3.3.0 PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/htop-dev/htop/releases/download/$(PKG_VERS) diff --git a/cross/htop/digests b/cross/htop/digests index a2879a8b3d8..5bdae7d39dd 100644 --- a/cross/htop/digests +++ b/cross/htop/digests @@ -1,3 +1,3 @@ -htop-3.2.2.tar.xz SHA1 0007912db076bb572f94af9dde81803c6bdf5d6d -htop-3.2.2.tar.xz SHA256 bac9e9ab7198256b8802d2e3b327a54804dc2a19b77a5f103645b11c12473dc8 -htop-3.2.2.tar.xz MD5 65242dcb1dc2564d647cbb4171a3914b +htop-3.3.0.tar.xz SHA1 1b20a1aae696f0c00fa27be426121c38eae25146 +htop-3.3.0.tar.xz SHA256 a69acf9b42ff592c4861010fce7d8006805f0d6ef0e8ee647a6ee6e59b743d5c +htop-3.3.0.tar.xz MD5 9b59f24212cb93bd1877fe8e837a4f19 diff --git a/cross/iperf2/Makefile b/cross/iperf2/Makefile index f91249a3c8c..e769abd6d95 100644 --- a/cross/iperf2/Makefile +++ b/cross/iperf2/Makefile @@ -1,5 +1,5 @@ PKG_NAME = iperf2 -PKG_VERS = 2.1.9 +PKG_VERS = 2.2.0 PKG_EXT = tar.gz PKG_NAME_REAL = iperf PKG_DIST_NAME = $(PKG_NAME_REAL)-$(PKG_VERS).$(PKG_EXT) diff --git a/cross/iperf2/digests b/cross/iperf2/digests index af88f36a579..f5575acf1f7 100644 --- a/cross/iperf2/digests +++ b/cross/iperf2/digests @@ -1,3 +1,3 @@ -iperf-2.1.9.tar.gz SHA1 e7b669c2e8747df95b59956e83ff53d3971d7a5f -iperf-2.1.9.tar.gz SHA256 5c0771aab00ef14520013aef01675977816e23bb8f5d9fde016f90eb2f1be788 -iperf-2.1.9.tar.gz MD5 e6f8ca3ff2d6911da24ac3f1a319b799 +iperf-2.2.0.tar.gz SHA1 bcbd101ab36f3faacaab1a765a96806ca49a1495 +iperf-2.2.0.tar.gz SHA256 16810a9575e4c6dd65e4a18ab5df3cdac6730b3c832cf080a8990f132f68364a +iperf-2.2.0.tar.gz MD5 34bb6ac1abeb801bf3f729794dc5ac36 diff --git a/cross/iperf3-3.15/Makefile b/cross/iperf3-3.15/Makefile new file mode 100644 index 00000000000..fa0f6c30e97 --- /dev/null +++ b/cross/iperf3-3.15/Makefile @@ -0,0 +1,25 @@ +PKG_NAME = iperf3 +PKG_VERS = 3.15 +PKG_EXT = tar.gz +PKG_NAME_REAL = iperf +PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://github.com/esnet/iperf/archive +PKG_DIST_FILE = $(PKG_NAME_REAL)-$(PKG_VERS).$(PKG_EXT) +PKG_DIR = $(PKG_NAME_REAL)-$(PKG_VERS) + +DEPENDS = cross/openssl3 + +HOMEPAGE = https://software.es.net/iperf/ +COMMENT = The iperf series of tools perform active measurements to determine the maximum achievable bandwidth on IP networks. It supports tuning of various parameters related to timing, protocols, and buffers. For each test it reports the measured throughput, loss, and other parameters. +LICENSE = 3-Clause BSD + +GNU_CONFIGURE = 1 + +CONFIGURE_ARGS = --disable-static + +ifeq ($(findstring $(ARCH),qoriq),$(ARCH)) +# prefer netinet/tcp.h over linux/tcp.h to ensure 'TCP_USER_TIMEOUT' is declared. +CONFIGURE_ARGS += ac_cv_header_linux_tcp_h=no +endif + +include ../../mk/spksrc.cross-cc.mk diff --git a/cross/iperf3/PLIST b/cross/iperf3-3.15/PLIST similarity index 100% rename from cross/iperf3/PLIST rename to cross/iperf3-3.15/PLIST diff --git a/cross/iperf3-3.15/digests b/cross/iperf3-3.15/digests new file mode 100644 index 00000000000..60e2727ce1e --- /dev/null +++ b/cross/iperf3-3.15/digests @@ -0,0 +1,3 @@ +iperf-3.15.tar.gz SHA1 e98d5a66a26f2cdfbfef24e0fafaafa22b3e808b +iperf-3.15.tar.gz SHA256 d287baa6f0ef4fc27160e2c9ae2fd7a03ce3ae303292e3b5455bce7ae633ad58 +iperf-3.15.tar.gz MD5 be25c3c818fb5b8af41b44c5ab8439ca diff --git a/cross/iperf3/patches/001-patch-portable-endian-for-old-ppc-arches.patch b/cross/iperf3-3.15/patches/001-patch-portable-endian-for-old-ppc-arches.patch similarity index 100% rename from cross/iperf3/patches/001-patch-portable-endian-for-old-ppc-arches.patch rename to cross/iperf3-3.15/patches/001-patch-portable-endian-for-old-ppc-arches.patch diff --git a/cross/iperf3/patches/002-fix-netinet_in.h-conflicts-for-Synology-3.x-Kernels.patch b/cross/iperf3-3.15/patches/002-fix-netinet_in.h-conflicts-for-Synology-3.x-Kernels.patch similarity index 100% rename from cross/iperf3/patches/002-fix-netinet_in.h-conflicts-for-Synology-3.x-Kernels.patch rename to cross/iperf3-3.15/patches/002-fix-netinet_in.h-conflicts-for-Synology-3.x-Kernels.patch diff --git a/cross/iperf3-latest/Makefile b/cross/iperf3-latest/Makefile new file mode 100644 index 00000000000..bb70a13aa34 --- /dev/null +++ b/cross/iperf3-latest/Makefile @@ -0,0 +1,25 @@ +PKG_NAME = iperf3 +PKG_VERS = 3.17.1 +PKG_EXT = tar.gz +PKG_NAME_REAL = iperf +PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://github.com/esnet/iperf/archive +PKG_DIST_FILE = $(PKG_NAME_REAL)-$(PKG_VERS).$(PKG_EXT) +PKG_DIR = $(PKG_NAME_REAL)-$(PKG_VERS) + +DEPENDS = cross/openssl3 + +HOMEPAGE = https://software.es.net/iperf/ +COMMENT = The iperf series of tools perform active measurements to determine the maximum achievable bandwidth on IP networks. It supports tuning of various parameters related to timing, protocols, and buffers. For each test it reports the measured throughput, loss, and other parameters. +LICENSE = 3-Clause BSD + +GNU_CONFIGURE = 1 + +CONFIGURE_ARGS = --disable-static + +ifeq ($(findstring $(ARCH),qoriq),$(ARCH)) +# prefer netinet/tcp.h over linux/tcp.h to ensure 'TCP_USER_TIMEOUT' is declared. +CONFIGURE_ARGS += ac_cv_header_linux_tcp_h=no +endif + +include ../../mk/spksrc.cross-cc.mk diff --git a/cross/iperf3-latest/PLIST b/cross/iperf3-latest/PLIST new file mode 100644 index 00000000000..d1727545f4b --- /dev/null +++ b/cross/iperf3-latest/PLIST @@ -0,0 +1,4 @@ +bin:bin/iperf3 +lnk:lib/libiperf.so +lnk:lib/libiperf.so.0 +lib:lib/libiperf.so.0.0.0 diff --git a/cross/iperf3-latest/digests b/cross/iperf3-latest/digests new file mode 100644 index 00000000000..8a975955426 --- /dev/null +++ b/cross/iperf3-latest/digests @@ -0,0 +1,3 @@ +iperf-3.17.1.tar.gz SHA1 872f9dfdc360ac93b7c15fa76230225fe9b59631 +iperf-3.17.1.tar.gz SHA256 105b4fe7fbce31c9b94a3fec10c46e3b4b298adc076e1e3af52b990e1faf2db9 +iperf-3.17.1.tar.gz MD5 b6bc5f6ae709fe200a55900d18659942 diff --git a/cross/iperf3-latest/patches/002-fix-netinet_in.h-conflicts-for-Synology-3.x-Kernels.patch b/cross/iperf3-latest/patches/002-fix-netinet_in.h-conflicts-for-Synology-3.x-Kernels.patch new file mode 100644 index 00000000000..b37ca053c49 --- /dev/null +++ b/cross/iperf3-latest/patches/002-fix-netinet_in.h-conflicts-for-Synology-3.x-Kernels.patch @@ -0,0 +1,22 @@ +# fix netinet/in*.h conflicts for Synology 3.x Kernels +# +--- src/flowlabel.h.orig 2023-02-16 22:23:12.000000000 +0000 ++++ src/flowlabel.h 2023-06-26 06:27:57.549262516 +0000 +@@ -31,7 +31,7 @@ + #include + #include + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0) + #include + #else + #ifndef __ANDROID__ +@@ -39,7 +39,7 @@ + It is just a stripped copy of the Linux kernel header "linux/in6.h" + "Flow label" things are still not defined in "netinet/in*.h" headers, + but we cannot use "linux/in6.h" immediately because it currently +- conflicts with "netinet/in.h" . (in kernel versions < 3.7.0) ++ conflicts with "netinet/in.h" . (in synology kernel versions < 3.11.0) + */ + struct in6_flowlabel_req + { diff --git a/cross/iperf3/Makefile b/cross/iperf3/Makefile index 79894b5fbbf..cbc70fb50c9 100644 --- a/cross/iperf3/Makefile +++ b/cross/iperf3/Makefile @@ -1,23 +1,15 @@ -PKG_NAME = iperf3 -PKG_VERS = 3.13 -PKG_EXT = tar.gz -PKG_NAME_REAL = iperf -PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://github.com/esnet/iperf/archive -PKG_DIST_FILE = $(PKG_NAME_REAL)-$(PKG_VERS).$(PKG_EXT) -PKG_DIR = $(PKG_NAME_REAL)-$(PKG_VERS) +PKG_NAME = iperf3-main -DEPENDS = cross/openssl +# libatomics is required for iperf3 >= 3.16 +OPTIONAL_DEPENDS = cross/iperf3-latest +OPTIONAL_DEPENDS += cross/iperf3-3.15 -HOMEPAGE = https://software.es.net/iperf/ -COMMENT = The iperf series of tools perform active measurements to determine the maximum achievable bandwidth on IP networks. It supports tuning of various parameters related to timing, protocols, and buffers. For each test it reports the measured throughput, loss, and other parameters. -LICENSE = 3-Clause BSD +include ../../mk/spksrc.main-depends.mk -GNU_CONFIGURE = 1 - -ifeq ($(findstring $(ARCH),qoriq),$(ARCH)) -# prefer netinet/tcp.h over linux/tcp.h to ensure 'TCP_USER_TIMEOUT' is declared. -CONFIGURE_ARGS += ac_cv_header_linux_tcp_h=no +ifeq ($(call version_lt, ${TCVERSION}, 6.0)$(call version_ge, ${TCVERSION}, 3.0),11) +DEPENDS = cross/iperf3-3.15 +else ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH)) +DEPENDS = cross/iperf3-3.15 +else +DEPENDS = cross/iperf3-latest endif - -include ../../mk/spksrc.cross-cc.mk diff --git a/cross/iperf3/digests b/cross/iperf3/digests deleted file mode 100644 index e4c58b3718c..00000000000 --- a/cross/iperf3/digests +++ /dev/null @@ -1,3 +0,0 @@ -iperf-3.13.tar.gz SHA1 57504ea15f392d9d69723933aa8f0ad891f7e786 -iperf-3.13.tar.gz SHA256 a49d23fe0d3b1482047ad7f3b9e384c69657a63b486c4e3f0ce512a077d94434 -iperf-3.13.tar.gz MD5 43c734bf63157ec277d706879dc3b2c0 diff --git a/cross/lsof/Makefile b/cross/lsof/Makefile new file mode 100644 index 00000000000..7bb77d4126e --- /dev/null +++ b/cross/lsof/Makefile @@ -0,0 +1,26 @@ +PKG_NAME = lsof +PKG_VERS = 4.99.3 +PKG_EXT = tar.gz +PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://github.com/lsof-org/lsof/releases/download/$(PKG_VERS) +PKG_DIR = $(PKG_NAME)-$(PKG_VERS) + +DEPENDS = + +HOMEPAGE = https://lsof.readthedocs.io/ +COMMENT = lsof is a command listing open files. +LICENSE = https://github.com/lsof-org/lsof/blob/master/COPYING + +GNU_CONFIGURE = 1 + +CONFIGURE_ARGS = --disable-static +CONFIGURE_ARGS += --disable-liblsof + +include ../../mk/spksrc.common.mk +ifeq ($(findstring $(ARCH),$(i686_ARCHS) $(x64_ARCHS)),$(ARCH)) +# avoid error: 'NETLINK_SOCK_DIAG' undeclared for evansport-6.2.4 +# evansport-7.1 does not find/use sock_diag anyway +CONFIGURE_ARGS += ac_cv_header_linux_sock_diag_h=no +endif + +include ../../mk/spksrc.cross-cc.mk diff --git a/cross/lsof/PLIST b/cross/lsof/PLIST new file mode 100644 index 00000000000..107fa4a159d --- /dev/null +++ b/cross/lsof/PLIST @@ -0,0 +1 @@ +bin:bin/lsof diff --git a/cross/lsof/digests b/cross/lsof/digests new file mode 100644 index 00000000000..93f393d034f --- /dev/null +++ b/cross/lsof/digests @@ -0,0 +1,3 @@ +lsof-4.99.3.tar.gz SHA1 b6aef3e74c42f6a81120b70fc0a7aec3b4136146 +lsof-4.99.3.tar.gz SHA256 86428a8881b0d1147a52058e853c775b83d794f0da685d549b2bfd07063ed1cd +lsof-4.99.3.tar.gz MD5 0fa5cfcaaca77a2fb3579c17de016353 diff --git a/cross/lsof/patches/001-disable-build-of-man-pages.patch b/cross/lsof/patches/001-disable-build-of-man-pages.patch new file mode 100644 index 00000000000..61f9a4907ba --- /dev/null +++ b/cross/lsof/patches/001-disable-build-of-man-pages.patch @@ -0,0 +1,24 @@ +# +# Disable build of man pages +# - the creation of man pages needs soelim that is not installed +# +--- Makefile.in.orig 2023-12-24 02:15:55.000000000 +0000 ++++ Makefile.in 2024-05-12 18:57:33.882105829 +0000 +@@ -1251,7 +1251,7 @@ + tests_LTunix_CFLAGS = @LSOF_TEST_CFLAGS@ -I$(top_srcdir)/include + tests_LTbasic2_CFLAGS = -I$(top_srcdir)/include + tests_LTbasic2_LDADD = liblsof.la +-man8_MANS = lsof.man ++man8_MANS = + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-am + +@@ -4670,7 +4670,7 @@ + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) + $(MAKE) $(AM_MAKEFLAGS) check-TESTS + check: check-am +-all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(MANS) $(HEADERS) \ ++all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(HEADERS) \ + config.h + install-binPROGRAMS: install-libLTLIBRARIES + diff --git a/cross/net-snmp/Makefile b/cross/net-snmp/Makefile index fd6c19179c5..31eafa00ddd 100644 --- a/cross/net-snmp/Makefile +++ b/cross/net-snmp/Makefile @@ -1,11 +1,11 @@ PKG_NAME = net-snmp -PKG_VERS = 5.9.3 +PKG_VERS = 5.9.4 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://sourceforge.net/projects/net-snmp/files/net-snmp/$(PKG_VERS) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) -DEPENDS = cross/openssl +DEPENDS = cross/openssl3 HOMEPAGE = http://www.net-snmp.org/ COMMENT = Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6. diff --git a/cross/net-snmp/PLIST b/cross/net-snmp/PLIST index 701d016560e..aa745d538d8 100644 --- a/cross/net-snmp/PLIST +++ b/cross/net-snmp/PLIST @@ -8,6 +8,7 @@ bin:bin/snmpgetnext lnk:bin/snmpinform bin:bin/snmpnetstat bin:bin/snmpping +bin:bin/snmpps bin:bin/snmpset bin:bin/snmpstatus bin:bin/snmptable @@ -19,5 +20,5 @@ bin:bin/snmpvacm bin:bin/snmpwalk lnk:lib/libnetsnmp.so lnk:lib/libnetsnmp.so.40 -lib:lib/libnetsnmp.so.40.2.0 +lib:lib/libnetsnmp.so.40.2.1 rsc:share/snmp/mibs/ diff --git a/cross/net-snmp/digests b/cross/net-snmp/digests index 0e231730af9..5268819da62 100644 --- a/cross/net-snmp/digests +++ b/cross/net-snmp/digests @@ -1,3 +1,3 @@ -net-snmp-5.9.3.tar.gz SHA1 e452814a963c9ca19d1947feef3aa0ad537cb650 -net-snmp-5.9.3.tar.gz SHA256 2097f29b7e1bf3f1300b4bae52fa2308d0bb8d5d3998dbe02f9462a413a2ef0a -net-snmp-5.9.3.tar.gz MD5 11dc7dd91e3aadd6a6d953c7dd216574 +net-snmp-5.9.4.tar.gz SHA1 c144409282ca90826af79b50ade1c2d78d330396 +net-snmp-5.9.4.tar.gz SHA256 8b4de01391e74e3c7014beb43961a2d6d6fa03acc34280b9585f4930745b0544 +net-snmp-5.9.4.tar.gz MD5 395f7988f1ee4fd9b61eebbbb0961245 diff --git a/cross/nmon/Makefile b/cross/nmon/Makefile index deb010c2511..5580c44140b 100644 --- a/cross/nmon/Makefile +++ b/cross/nmon/Makefile @@ -1,5 +1,5 @@ PKG_NAME = nmon -PKG_VERS = 16n +PKG_VERS = 16q PKG_EXT = c PKG_DIST_NAME = lmon$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://sourceforge.net/projects/nmon/files diff --git a/cross/nmon/digests b/cross/nmon/digests index 6352727ea18..cd3c76e1cec 100644 --- a/cross/nmon/digests +++ b/cross/nmon/digests @@ -1,3 +1,3 @@ -lmon16n.c SHA1 024a3b56179838f0e04bf1706cc9ba56595301a8 -lmon16n.c SHA256 c0012cc2d925dee940c37ceae297abac64ba5a5c30e575e7418b04028613f5f2 -lmon16n.c MD5 a8172601fdc05f3bc58455cbd3f4475e +lmon16q.c SHA1 fe92930a853897e461bb636b18ae4cae98e602f3 +lmon16q.c SHA256 1b78a81672c19291b3d11a6e319dd9b23a022a262dba1efcea008d6df51aca51 +lmon16q.c MD5 476244defc91bb3083342e8ac2571d2a diff --git a/cross/procs/Makefile b/cross/procs/Makefile index 330405028c1..eb84c985bed 100644 --- a/cross/procs/Makefile +++ b/cross/procs/Makefile @@ -1,5 +1,5 @@ PKG_NAME = procs -PKG_VERS = 0.14.0 +PKG_VERS = 0.14.5 PKG_EXT = tar.gz PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/dalance/procs/archive diff --git a/cross/procs/digests b/cross/procs/digests index 5913ed22a98..9fd4263e75e 100644 --- a/cross/procs/digests +++ b/cross/procs/digests @@ -1,3 +1,3 @@ -procs-0.14.0.tar.gz SHA1 b350a226b5fa687098833e0ca93117293d7f73f6 -procs-0.14.0.tar.gz SHA256 fa5af0951dc8aa63c0590f8c5c1136594866057704cfb1cdfc22ac3cc49437c6 -procs-0.14.0.tar.gz MD5 0af8e48544ada3e11e460d79fbf14afa +procs-0.14.5.tar.gz SHA1 08bea8064e3b52cb06b2f469405d9dae74834f28 +procs-0.14.5.tar.gz SHA256 539b88565c775a106063da5cc5148cfdc7e010534f3dbc90cb8f6317d51ca96b +procs-0.14.5.tar.gz MD5 a78ff5efb6bfc7ea31ac1a5a68cdf310 diff --git a/diyspk/htop/Makefile b/diyspk/htop/Makefile index 28238940bc7..d2aef829a7a 100755 --- a/diyspk/htop/Makefile +++ b/diyspk/htop/Makefile @@ -1,18 +1,17 @@ SPK_NAME = htop -SPK_VERS = 3.1.1 -SPK_REV = 4 +SPK_VERS = 3.3.0 +SPK_REV = 1 SPK_ICON = src/htop.png -DEPENDS = cross/$(SPK_NAME) +DEPENDS = cross/htop MAINTAINER = hgy59 -DESCRIPTION = Interactive text-mode process viewer for Unix systems. The package is intended for DSM-5.0 or earlier where it\'s not available. +DESCRIPTION = Interactive text-mode process viewer for Unix systems. The package is intended for DSM 5.0 or earlier where it\'s not available. DISPLAY_NAME = htop STARTABLE = no -CHANGELOG = "Update to version 3.1.1" -HOMEPAGE = http://hisham.hm/htop/ -LICENSE = GPLv2+ +HOMEPAGE = http://hisham.hm/htop/ +LICENSE = GPLv2+ SPK_COMMANDS = bin/htop diff --git a/diyspk/iperf2/Makefile b/diyspk/iperf2/Makefile index 22a7e2a33f7..c3422c1ac51 100644 --- a/diyspk/iperf2/Makefile +++ b/diyspk/iperf2/Makefile @@ -1,9 +1,9 @@ SPK_NAME = iperf2 -SPK_VERS = 2.1.4 -SPK_REV = 3 +SPK_VERS = 2.2.0 +SPK_REV = 1 SPK_ICON = src/iperf2.png -DEPENDS = cross/$(SPK_NAME) +DEPENDS = cross/iperf2 MAINTAINER = hgy59 DESCRIPTION = A tool for measuring TCP and UDP network performance, based on iperf 2.0.5. diff --git a/diyspk/iperf3/Makefile b/diyspk/iperf3/Makefile index b0cf17d96e4..023717fce22 100644 --- a/diyspk/iperf3/Makefile +++ b/diyspk/iperf3/Makefile @@ -1,9 +1,16 @@ SPK_NAME = iperf3 -SPK_VERS = 3.9 -SPK_REV = 2 +SPK_VERS = 3.17.1 +SPK_REV = 1 SPK_ICON = src/iperf3.png -DEPENDS = cross/$(SPK_NAME) +DEPENDS = cross/iperf3 + +include ../../mk/spksrc.archs.mk + +ifeq ($(findstring $(ARCH),$(OLD_PPC_ARCHS) $(ARMv5_ARCHS)),$(ARCH)) +SPK_VERS = 3.15 +endif + MAINTAINER = hgy59 DESCRIPTION = The iperf series of tools perform active measurements to determine the maximum achievable bandwidth on IP networks. It supports tuning of various parameters related to timing, protocols, and buffers. For each test it reports the measured throughput, loss, and other parameters. diff --git a/diyspk/lsof/Makefile b/diyspk/lsof/Makefile new file mode 100644 index 00000000000..9444498c072 --- /dev/null +++ b/diyspk/lsof/Makefile @@ -0,0 +1,16 @@ +SPK_NAME = lsof +SPK_VERS = 4.99.3 +SPK_REV = 1 + +DEPENDS = cross/lsof + +MAINTAINER = SynoCommunity +DESCRIPTION = lsof is a command listing open files. +STARTABLE = no + +HOMEPAGE = https://lsof.readthedocs.io/ +LICENSE = https://github.com/lsof-org/lsof/blob/master/COPYING + +SPK_COMMANDS = bin/lsof + +include ../../mk/spksrc.spk.mk diff --git a/diyspk/net-snmp/Makefile b/diyspk/net-snmp/Makefile new file mode 100644 index 00000000000..8ca79d478fe --- /dev/null +++ b/diyspk/net-snmp/Makefile @@ -0,0 +1,35 @@ +SPK_NAME = net-snmp +SPK_VERS = 5.9.4 +SPK_REV = 1 + +DEPENDS = cross/net-snmp + +MAINTAINER = SynoCommunity +DESCRIPTION = Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6. +DISPLAY_NAME = Net-SNMP +STARTABLE = no + +HOMEPAGE = http://www.net-snmp.org/ +LICENSE = BSD and CMU/UCD (BSD like) + +SPK_COMMANDS = bin/snmpbulkget +SPK_COMMANDS += bin/snmpbulkwalk +SPK_COMMANDS += bin/snmpdelta +SPK_COMMANDS += bin/snmpdf +SPK_COMMANDS += bin/snmpget +SPK_COMMANDS += bin/snmpgetnext +SPK_COMMANDS += bin/snmpinform +SPK_COMMANDS += bin/snmpnetstat +SPK_COMMANDS += bin/snmpping +SPK_COMMANDS += bin/snmpps +SPK_COMMANDS += bin/snmpset +SPK_COMMANDS += bin/snmpstatus +SPK_COMMANDS += bin/snmptable +SPK_COMMANDS += bin/snmptest +SPK_COMMANDS += bin/snmptranslate +SPK_COMMANDS += bin/snmptrap +SPK_COMMANDS += bin/snmpusm +SPK_COMMANDS += bin/snmpvacm +SPK_COMMANDS += bin/snmpwalk + +include ../../mk/spksrc.spk.mk diff --git a/diyspk/nmon/Makefile b/diyspk/nmon/Makefile index 960adae5b04..b4436f9713b 100644 --- a/diyspk/nmon/Makefile +++ b/diyspk/nmon/Makefile @@ -1,9 +1,9 @@ SPK_NAME = nmon -SPK_VERS = 16m +SPK_VERS = 16q SPK_REV = 1 SPK_ICON = src/nmon.png -DEPENDS = cross/$(SPK_NAME) +DEPENDS = cross/nmon MAINTAINER = biyiklioglu DESCRIPTION = nmon \(Nigel\'s performance Monitor\) is a performance monitoring tool for Linux @@ -16,5 +16,4 @@ HELP_URL = http://nmon.sourceforge.net/pmwiki.php SPK_COMMANDS = bin/nmon - include ../../mk/spksrc.spk.mk diff --git a/spk/synocli-monitor/Makefile b/spk/synocli-monitor/Makefile index 81d64d24632..c6765b0568b 100644 --- a/spk/synocli-monitor/Makefile +++ b/spk/synocli-monitor/Makefile @@ -1,11 +1,12 @@ SPK_NAME = synocli-monitor -SPK_VERS = 1.5 -SPK_REV = 7 +SPK_VERS = 1.6 +SPK_REV = 8 SPK_ICON = src/synocli-monitor.png DEPENDS = cross/nmon cross/njmon DEPENDS += cross/iperf2 cross/iperf3 DEPENDS += cross/busybox +DEPENDS += cross/lsof DEPENDS += cross/htop DEPENDS += cross/cpulimit DEPENDS += cross/net-snmp @@ -33,7 +34,7 @@ MAINTAINER = hgy59 DESCRIPTION = SynoCli Monitor Tools provides a set of command-line utilities for system monitoring: nmon, njmon, iperf2, iperf3, htop, ionice, cpulimit, net-snmp tools$(OPTIONAL_DESC). DISPLAY_NAME = SynoCli Monitor Tools STARTABLE = no -CHANGELOG = "1. Add net-snmp v5.9.1.
2. Add njmon v81.
3. Update bottom to v0.9.2.
4. Update htop to v3.2.2.
5. Update iperf2 to v2.1.9.
6. Update iperf3 to v3.13.
7. Update procs to v0.14.0.
8. Update openssl to v1.1.1u." +CHANGELOG = "1. Add actual lsof and drop lsof of busybox.
2. Update bandwhich to v0.22.2.
3. Update bottom to v0.9.6.
4. Update htop to v3.3.0.
5. Update iperf2 to v2.3.0 and iperf3 to v3.17.1 (some models are limited to older iperf3 version).
6. Update net-snmp v5.9.4.
7. Update procs to v0.14.5.
8. Update openssl to v3.1." HOMEPAGE = https://github.com/SynoCommunity/spksrc/wiki/FAQ-SynoCliMonitor LICENSE = Each tool is licensed under it\'s respective license. @@ -46,12 +47,13 @@ SPK_COMMANDS = bin/htop SPK_COMMANDS += bin/nmon bin/njmon SPK_COMMANDS += bin/iperf2 bin/iperf3 SPK_COMMANDS += bin/ionice -SPK_COMMANDS += bin/iostat bin/lsof bin/pgrep bin/pmap bin/watch bin/pstree +SPK_COMMANDS += bin/iostat bin/pgrep bin/pmap bin/watch bin/pstree +SPK_COMMANDS += bin/lsof SPK_COMMANDS += bin/cpulimit SPK_COMMANDS += bin/bandwhich SPK_COMMANDS += bin/btm SPK_COMMANDS += bin/procs SPK_COMMANDS += bin/snmpget bin/snmpgetnext bin/snmpbulkget bin/snmpwalk bin/snmpbulkwalk bin/snmpdelta bin/snmpdf -SPK_COMMANDS += bin/snmpinform bin/snmpnetstat bin/snmpstatus bin/snmptable bin/snmptest bin/snmptranslate +SPK_COMMANDS += bin/snmpinform bin/snmpnetstat bin/snmpps bin/snmpstatus bin/snmptable bin/snmptest bin/snmptranslate include ../../mk/spksrc.spk.mk From c1a463a98041334b0b79da968c3c2662d7fcbf60 Mon Sep 17 00:00:00 2001 From: Michael Reid Date: Sun, 9 Jun 2024 19:42:39 -0400 Subject: [PATCH 24/45] ownCloud: Update to v10.14.0 (#6132) * Update ownCloud to v10.14.0 * Add iconv php module --- cross/owncloud/Makefile | 4 ++-- cross/owncloud/digests | 6 +++--- spk/owncloud/Makefile | 6 +++--- spk/owncloud/src/conf/resource | 1 + spk/owncloud/src/web/owncloud.json | 1 + 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cross/owncloud/Makefile b/cross/owncloud/Makefile index 7c953b1ae48..f9eef549502 100644 --- a/cross/owncloud/Makefile +++ b/cross/owncloud/Makefile @@ -1,6 +1,6 @@ PKG_NAME = owncloud -PKG_VERS = 10.13.4 -PKG_DATE = 20231213 +PKG_VERS = 10.14.0 +PKG_DATE = 20240226 PKG_EXT = tar.bz2 PKG_DIST_NAME = $(PKG_NAME)-complete-$(PKG_DATE).$(PKG_EXT) PKG_DIST_SITE = https://download.owncloud.com/server/stable diff --git a/cross/owncloud/digests b/cross/owncloud/digests index 21c28002544..274b87f6206 100644 --- a/cross/owncloud/digests +++ b/cross/owncloud/digests @@ -1,3 +1,3 @@ -owncloud-complete-20231213.tar.bz2 SHA1 a15cb65c5e4bc78a054a8cf5baa9f9f3b4aa6dbe -owncloud-complete-20231213.tar.bz2 SHA256 4e39c500cd99e2b2a988d593aa43bf67c29e6704ecbe03fc068872f37018f523 -owncloud-complete-20231213.tar.bz2 MD5 a1ace90fcd9d79cd2b443f2730168286 +owncloud-complete-20240226.tar.bz2 SHA1 a2b54593da3caebdcf2212480c8e046b7cbad40b +owncloud-complete-20240226.tar.bz2 SHA256 7b23e7f189f5ceb606fb95e96b5caa202299b3cea90e524fc59bdd3c9c30853c +owncloud-complete-20240226.tar.bz2 MD5 dc135c062cb9c21656e38309306b6067 diff --git a/spk/owncloud/Makefile b/spk/owncloud/Makefile index 7ef74689579..15110df0eba 100644 --- a/spk/owncloud/Makefile +++ b/spk/owncloud/Makefile @@ -1,6 +1,6 @@ SPK_NAME = owncloud -SPK_VERS = 10.13.4 -SPK_REV = 16 +SPK_VERS = 10.14.0 +SPK_REV = 17 SPK_ICON = src/owncloud.png DEPENDS = cross/owncloud @@ -13,7 +13,7 @@ SPK_DEPENDS = WebStation:PHP7.4:Apache2.4 MAINTAINER = ymartin59 DESCRIPTION = ownCloud is a personal cloud which runs on your own server and gives you freedom and control over your own data. DISPLAY_NAME = ownCloud -CHANGELOG = "1. Update ownCloud to 10.13.4." +CHANGELOG = "1. Update ownCloud to 10.14.0." HOMEPAGE = https://owncloud.com/ LICENSE = AGPLv3 diff --git a/spk/owncloud/src/conf/resource b/spk/owncloud/src/conf/resource index a24a3a57205..4286ad3ea47 100644 --- a/spk/owncloud/src/conf/resource +++ b/spk/owncloud/src/conf/resource @@ -34,6 +34,7 @@ "curl", "gd", "gmp", + "iconv", "imagick", "imap", "intl", diff --git a/spk/owncloud/src/web/owncloud.json b/spk/owncloud/src/web/owncloud.json index 17b523dcd6f..1e4c29111dc 100644 --- a/spk/owncloud/src/web/owncloud.json +++ b/spk/owncloud/src/web/owncloud.json @@ -10,6 +10,7 @@ "curl", "gd", "gmp", + "iconv", "imagick", "imap", "intl", From 2b2958e716aa39b2ca841af22516d03e6786f2d8 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Tue, 11 Jun 2024 19:51:51 +0200 Subject: [PATCH 25/45] fix qoriq rust with github build (#6133) * fix toolchain cache keys - use only the matrix.arch specific digests file as cache-key * disable cache for qoriq toolchain - this is mandatory to install custom qoriq rust toolchain --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ee540af8911..b457bcbf692 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,9 +91,11 @@ jobs: - name: Cache toolchains uses: actions/cache@v4 + # Do not cache qoriq toolchain. It must be built every time to install custom rust toolchain + if: ${{ contains(matrix.arch,'qoriq') == false }} with: path: toolchain/*/work - key: toolchain-${{ matrix.arch }}-v3-${{ hashFiles('toolchain/*/digests') }} + key: toolchain-${{ matrix.arch }}-v3-${{ hashFiles(format('toolchain/syno-{0}/digests',matrix.arch)) }} - name: Use cache of downloaded files uses: actions/cache@v4 From c5f5325d7bf01ff302e237a4a02eab08a8267cd9 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 11 Jun 2024 16:57:15 -0400 Subject: [PATCH 26/45] Noarch publish fix (#6134) * github-action: Fix build with publishing for noarch packages --- .github/actions/build.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/actions/build.sh b/.github/actions/build.sh index 0cd84f9aeec..7ebdca3ec65 100755 --- a/.github/actions/build.sh +++ b/.github/actions/build.sh @@ -79,8 +79,14 @@ do else TCVERSION=${GH_ARCH##*-} fi - echo "$ make TCVERSION=${TCVERSION} ARCH= -C ./spk/${package} ${MAKE_ARGS%%-}" >>build.log - make TCVERSION=${TCVERSION} ARCH= -C ./spk/${package} ${MAKE_ARGS%%-} |& tee >(tail -15 >>build.log) + # noarch package must be first built then published + echo "$ make TCVERSION=${TCVERSION} ARCH= -C ./spk/${package}" >>build.log + make TCVERSION=${TCVERSION} ARCH= -C ./spk/${package} |& tee >(tail -15 >>build.log) + + if [ "${package}" == "${PACKAGE_TO_PUBLISH}" ]; then + echo "$ make TCVERSION=${TCVERSION} ARCH= -C ./spk/${package} ${MAKE_ARGS%%-}" >>build.log + make TCVERSION=${TCVERSION} ARCH= -C ./spk/${package} ${MAKE_ARGS%%-} |& tee >(tail -15 >>build.log) + fi fi result=$? From f57435aff200bbc5548f59f46501ed3a0c447d7a Mon Sep 17 00:00:00 2001 From: hgy59 Date: Wed, 12 Jun 2024 21:08:29 +0200 Subject: [PATCH 27/45] synocli-devel: fix autoconf (#6015) (#6079) * fix autoconf (#6015) - fix autoconf to use installed m4 command * synocli-develop: update tools - update binutils to v2.41 for DSM 6 and v2.42 for DSM 7 - update autoconf to v2.72 - update strace to v6.8 * fix binutils for 32-bit archs on DSM 7 * use binutils-latest for all toolchains with c++11 support * update devel tools: - update gdb to v14.2 - update strace to v6.9 --- cross/autoconf/Makefile | 9 +++++++- cross/autoconf/digests | 6 +++--- cross/binutils-2.41/Makefile | 39 ++++++++++++++++++++++++++++++++++ cross/binutils-2.41/PLIST | 27 +++++++++++++++++++++++ cross/binutils-2.41/digests | 3 +++ cross/binutils-latest/Makefile | 21 +++++++++--------- cross/binutils-latest/PLIST | 1 - cross/binutils-latest/digests | 6 +++--- cross/binutils/Makefile | 5 ++++- cross/gdb-latest/Makefile | 2 +- cross/gdb-latest/digests | 6 +++--- cross/mpfr/Makefile | 6 +----- cross/mpfr/PLIST | 2 +- cross/mpfr/digests | 6 +++--- cross/strace/Makefile | 2 +- cross/strace/digests | 6 +++--- diyspk/autoconf/Makefile | 23 ++++++++++++++++++++ diyspk/binutils/Makefile | 28 ++++++++++++++++++++++-- diyspk/gdb/Makefile | 10 ++++----- diyspk/strace/Makefile | 2 +- spk/synocli-devel/Makefile | 6 +++--- 21 files changed, 168 insertions(+), 48 deletions(-) create mode 100644 cross/binutils-2.41/Makefile create mode 100644 cross/binutils-2.41/PLIST create mode 100644 cross/binutils-2.41/digests create mode 100644 diyspk/autoconf/Makefile diff --git a/cross/autoconf/Makefile b/cross/autoconf/Makefile index b2814ebc9e0..2c6d06af865 100644 --- a/cross/autoconf/Makefile +++ b/cross/autoconf/Makefile @@ -1,5 +1,5 @@ PKG_NAME = autoconf -PKG_VERS = 2.71 +PKG_VERS = 2.72 PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://ftp.gnu.org/gnu/autoconf/ @@ -12,5 +12,12 @@ COMMENT = Autoconf is an extensible package of M4 macros that produce shell scr LICENSE = GPLv2 GNU_CONFIGURE = 1 +POST_INSTALL_TARGET = autoconf_post_install include ../../mk/spksrc.cross-cc.mk + +.PHONY: autoconf_post_install +autoconf_post_install: + @$(MSG) Patch scripts to use installed m4 as default + @sed -i.bak -e 's|/usr/bin/m4|$(INSTALL_PREFIX)/bin/m4|g' $(STAGING_INSTALL_PREFIX)/bin/autom4te + @sed -i.bak -e 's|/usr/bin/m4|$(INSTALL_PREFIX)/bin/m4|g' $(STAGING_INSTALL_PREFIX)/bin/autoupdate diff --git a/cross/autoconf/digests b/cross/autoconf/digests index 9f51af271c4..a06f1063b32 100644 --- a/cross/autoconf/digests +++ b/cross/autoconf/digests @@ -1,3 +1,3 @@ -autoconf-2.71.tar.xz SHA1 1b5b1dbed849c6653be47c56d28d26fcf3f7238a -autoconf-2.71.tar.xz SHA256 f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4 -autoconf-2.71.tar.xz MD5 12cfa1687ffa2606337efe1a64416106 +autoconf-2.72.tar.xz SHA1 1d082d999ff4506ec8f92c6ecb9732546f5204fb +autoconf-2.72.tar.xz SHA256 ba885c1319578d6c94d46e9b0dceb4014caafe2490e437a0dbca3f270a223f5a +autoconf-2.72.tar.xz MD5 1be79f7106ab6767f18391c5e22be701 diff --git a/cross/binutils-2.41/Makefile b/cross/binutils-2.41/Makefile new file mode 100644 index 00000000000..febe00d2169 --- /dev/null +++ b/cross/binutils-2.41/Makefile @@ -0,0 +1,39 @@ +PKG_NAME = binutils +PKG_VERS = 2.41 +PKG_EXT = tar.xz +PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://ftp.gnu.org/gnu/binutils +PKG_DIR = $(PKG_NAME)-$(PKG_VERS) + +DEPENDS = cross/zlib cross/mpfr + +HOMEPAGE = https://www.gnu.org/software/binutils/ +COMMENT = GNU Binutils +LICENSE = GPLv2/LGPLv2 + +GNU_CONFIGURE = 1 + +CONFIGURE_ARGS = --disable-static +CONFIGURE_ARGS += --enable-host-shared +CONFIGURE_ARGS += --with-system-zlib +CONFIGURE_ARGS += --enable-gold=yes + +include ../../mk/spksrc.archs.mk + +# embedspu is a tool to "Embed an SPU ELF executable into a PowerPC object file" +# and hence built only for PPC_ARCHS. +# gprofng fails to build on i686 and does not build on other 32-bit archs. +ifeq ($(findstring $(ARCH),$(64bit_ARCHS)),$(ARCH)) +PLIST_TRANSFORM = sed -e '/bin\/embedspu/d' +else +CONFIGURE_ARGS += --disable-gprofng +PLIST_TRANSFORM = sed -e '/bin\/gprofng/d' -e '/bin\/gp\-/d' -e '/lib\/gprofng/d' +ifneq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH)) +PLIST_TRANSFORM += -e '/bin\/embedspu/d' +endif +endif + +# Avoid conflicts with gdb +CONFIGURE_ARGS += --includedir=$(INSTALL_PREFIX)/include/binutils + +include ../../mk/spksrc.cross-cc.mk diff --git a/cross/binutils-2.41/PLIST b/cross/binutils-2.41/PLIST new file mode 100644 index 00000000000..94f1c5b97d7 --- /dev/null +++ b/cross/binutils-2.41/PLIST @@ -0,0 +1,27 @@ +bin:bin/addr2line +bin:bin/ar +bin:bin/as +bin:bin/c++filt +bin:bin/dwp +bin:bin/elfedit +bin:bin/embedspu +bin:bin/gp-archive +bin:bin/gp-collect-app +rsc:bin/gp-display-html +bin:bin/gp-display-src +bin:bin/gp-display-text +bin:bin/gprof +bin:bin/gprofng +bin:bin/ld +bin:bin/ld.bfd +bin:bin/ld.gold +bin:bin/nm +bin:bin/objcopy +bin:bin/objdump +bin:bin/ranlib +bin:bin/readelf +bin:bin/size +bin:bin/strings +bin:bin/strip +lib:lib/bfd-plugins/libdep.so +lib:lib/gprofng/*.so diff --git a/cross/binutils-2.41/digests b/cross/binutils-2.41/digests new file mode 100644 index 00000000000..d76016875bd --- /dev/null +++ b/cross/binutils-2.41/digests @@ -0,0 +1,3 @@ +binutils-2.41.tar.xz SHA1 0e008260a958bbd10182ee3384672ae0a310eece +binutils-2.41.tar.xz SHA256 ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450 +binutils-2.41.tar.xz MD5 256d7e0ad998e423030c84483a7c1e30 diff --git a/cross/binutils-latest/Makefile b/cross/binutils-latest/Makefile index c956ba4ad73..9344e6058ee 100644 --- a/cross/binutils-latest/Makefile +++ b/cross/binutils-latest/Makefile @@ -1,5 +1,5 @@ PKG_NAME = binutils -PKG_VERS = 2.40 +PKG_VERS = 2.42 PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://ftp.gnu.org/gnu/binutils @@ -7,32 +7,33 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DEPENDS = cross/zlib cross/mpfr +# c++11 compiler is required (the real check is in cross/binutils/Makefile) +UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) + HOMEPAGE = https://www.gnu.org/software/binutils/ COMMENT = GNU Binutils LICENSE = GPLv2/LGPLv2 GNU_CONFIGURE = 1 +CONFIGURE_ARGS = --disable-static CONFIGURE_ARGS += --enable-host-shared CONFIGURE_ARGS += --with-system-zlib CONFIGURE_ARGS += --enable-gold=yes include ../../mk/spksrc.archs.mk -# embedspu is a tool to "Embed an SPU ELF executable into a PowerPC object file" -# and hence built only for PPC_ARCHS. -# gprofng fails to build on i686 and does not build on other 32-bit archs. -ifeq ($(findstring $(ARCH),$(64bit_ARCHS)),$(ARCH)) -PLIST_TRANSFORM = sed -e '/bin\/embedspu/d' -else +# gprofng fails to build for i686 +# ./../common/core_pcbe.c:2698:33: error: ‘PERF_COUNT_HW_REF_CPU_CYCLES’ undeclared here +# gprofng is not built for other 32-bit archs +ifeq ($(findstring $(ARCH),$(32bit_ARCHS)),$(ARCH)) CONFIGURE_ARGS += --disable-gprofng PLIST_TRANSFORM = sed -e '/bin\/gprofng/d' -e '/bin\/gp\-/d' -e '/lib\/gprofng/d' -ifneq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH)) -PLIST_TRANSFORM += -e '/bin\/embedspu/d' -endif endif # Avoid conflicts with gdb CONFIGURE_ARGS += --includedir=$(INSTALL_PREFIX)/include/binutils +ADDITIONAL_CXXFLAGS = -std=c++11 + include ../../mk/spksrc.cross-cc.mk diff --git a/cross/binutils-latest/PLIST b/cross/binutils-latest/PLIST index 94f1c5b97d7..c1df069c35e 100644 --- a/cross/binutils-latest/PLIST +++ b/cross/binutils-latest/PLIST @@ -4,7 +4,6 @@ bin:bin/as bin:bin/c++filt bin:bin/dwp bin:bin/elfedit -bin:bin/embedspu bin:bin/gp-archive bin:bin/gp-collect-app rsc:bin/gp-display-html diff --git a/cross/binutils-latest/digests b/cross/binutils-latest/digests index 70cefbc2df0..7c96c7b7761 100644 --- a/cross/binutils-latest/digests +++ b/cross/binutils-latest/digests @@ -1,3 +1,3 @@ -binutils-2.40.tar.xz SHA1 fee4fbef9d632afc1988dd631d7f75d4394b7f8d -binutils-2.40.tar.xz SHA256 0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1 -binutils-2.40.tar.xz MD5 007b59bd908a737c06e5a8d3d2c737eb +binutils-2.42.tar.xz SHA1 44da41792c60419863d7e13fa1deaf6b24dd69b8 +binutils-2.42.tar.xz SHA256 f6e4d41fd5fc778b06b7891457b3620da5ecea1006c6a4a41ae998109f85a800 +binutils-2.42.tar.xz MD5 a075178a9646551379bfb64040487715 diff --git a/cross/binutils/Makefile b/cross/binutils/Makefile index d41a457b49c..84bbe72af46 100644 --- a/cross/binutils/Makefile +++ b/cross/binutils/Makefile @@ -1,12 +1,15 @@ PKG_NAME = binutils-main OPTIONAL_DEPENDS = cross/binutils-latest +OPTIONAL_DEPENDS += cross/binutils-2.41 OPTIONAL_DEPENDS += cross/binutils-2.32 include ../../mk/spksrc.main-depends.mk -ifeq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH)) +ifeq ($(call version_lt, $(TC_GCC), 4.4),1) DEPENDS = cross/binutils-2.32 +else ifeq ($(call version_lt, $(TC_GCC), 4.8.1),1) +DEPENDS = cross/binutils-2.41 else DEPENDS = cross/binutils-latest endif diff --git a/cross/gdb-latest/Makefile b/cross/gdb-latest/Makefile index 04107be56aa..a7a9f9c2d71 100644 --- a/cross/gdb-latest/Makefile +++ b/cross/gdb-latest/Makefile @@ -1,5 +1,5 @@ PKG_NAME = gdb -PKG_VERS = 13.2 +PKG_VERS = 14.2 PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://ftp.gnu.org/gnu/gdb diff --git a/cross/gdb-latest/digests b/cross/gdb-latest/digests index db8f24e3c74..4d9860fb73c 100644 --- a/cross/gdb-latest/digests +++ b/cross/gdb-latest/digests @@ -1,3 +1,3 @@ -gdb-13.2.tar.xz SHA1 bcd6b05a2565f4339e1187dae428fb58a000d690 -gdb-13.2.tar.xz SHA256 fd5bebb7be1833abdb6e023c2f498a354498281df9d05523d8915babeb893f0a -gdb-13.2.tar.xz MD5 fbd3cdae16c581e8a742cb766ba35076 +gdb-14.2.tar.xz SHA1 4f38f7c24d523b6923f22404b7dee4152a00d0d4 +gdb-14.2.tar.xz SHA256 2d4dd8061d8ded12b6c63f55e45344881e8226105f4d2a9b234040efa5ce7772 +gdb-14.2.tar.xz MD5 4452f575d09f94276cb0a1e95ecff856 diff --git a/cross/mpfr/Makefile b/cross/mpfr/Makefile index bd4b8ae56a7..f6102c2538b 100644 --- a/cross/mpfr/Makefile +++ b/cross/mpfr/Makefile @@ -1,5 +1,5 @@ PKG_NAME = mpfr -PKG_VERS = 4.2.0 +PKG_VERS = 4.2.1 PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://ftp.gnu.org/gnu/mpfr @@ -13,10 +13,6 @@ LICENSE = GNU Lesser GPL GNU_CONFIGURE = 1 -# Cumulative patches for version 4.1.1-p1 -# https://www.mpfr.org/mpfr-4.1.1/allpatches -#PATCHES_LEVEL = 1 - CONFIGURE_ARGS = --with-gmp=$(STAGING_INSTALL_PREFIX) CONFIGURE_ARGS += --disable-static diff --git a/cross/mpfr/PLIST b/cross/mpfr/PLIST index 96cd1757cc7..c794b1fcb1f 100644 --- a/cross/mpfr/PLIST +++ b/cross/mpfr/PLIST @@ -1,3 +1,3 @@ lnk:lib/libmpfr.so lnk:lib/libmpfr.so.6 -lib:lib/libmpfr.so.6.2.0 +lib:lib/libmpfr.so.6.2.1 diff --git a/cross/mpfr/digests b/cross/mpfr/digests index 1448b84a907..3e35e8f7224 100644 --- a/cross/mpfr/digests +++ b/cross/mpfr/digests @@ -1,3 +1,3 @@ -mpfr-4.2.0.tar.xz SHA1 4f734ca3ebceac28e2f944b131a47133b19e2c5e -mpfr-4.2.0.tar.xz SHA256 06a378df13501248c1b2db5aa977a2c8126ae849a9d9b7be2546fb4a9c26d993 -mpfr-4.2.0.tar.xz MD5 a25091f337f25830c16d2054d74b5af7 +mpfr-4.2.1.tar.xz SHA1 31ffb4244cb469e2b4937cce1f50150300971dfb +mpfr-4.2.1.tar.xz SHA256 277807353a6726978996945af13e52829e3abd7a9a5b7fb2793894e18f1fcbb2 +mpfr-4.2.1.tar.xz MD5 523c50c6318dde6f9dc523bc0244690a diff --git a/cross/strace/Makefile b/cross/strace/Makefile index b0101d152e8..9936f643bca 100644 --- a/cross/strace/Makefile +++ b/cross/strace/Makefile @@ -1,5 +1,5 @@ PKG_NAME = strace -PKG_VERS = 6.5 +PKG_VERS = 6.9 PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/strace/strace/releases/download/v$(PKG_VERS) diff --git a/cross/strace/digests b/cross/strace/digests index 2c937602609..a205b284171 100644 --- a/cross/strace/digests +++ b/cross/strace/digests @@ -1,3 +1,3 @@ -strace-6.5.tar.xz SHA1 9a887797c47a1d91e0c74bca4965f42204103ebf -strace-6.5.tar.xz SHA256 dfb051702389e1979a151892b5901afc9e93bbc1c70d84c906ade3224ca91980 -strace-6.5.tar.xz MD5 e2a7651192053b4df3acd4cea0ec64ef +strace-6.9.tar.xz SHA1 5e93f598be33815cf973038ef662a56388e1e2ae +strace-6.9.tar.xz SHA256 da189e990a82e3ca3a5a4631012f7ecfd489dab459854d82d8caf6a865c1356a +strace-6.9.tar.xz MD5 395900d4de0b6b8c4707045a9782134c diff --git a/diyspk/autoconf/Makefile b/diyspk/autoconf/Makefile new file mode 100644 index 00000000000..13d176187e6 --- /dev/null +++ b/diyspk/autoconf/Makefile @@ -0,0 +1,23 @@ +SPK_NAME = autoconf +SPK_VERS = 2.72 +SPK_REV = 1 + +DEPENDS = cross/autoconf + +MAINTAINER = SynoCommunity +DESCRIPTION = Autoconf is an extensible package of M4 macros that produce shell scripts to automatically configure software source code packages. +LICENSE = GPLv2 +DISPLAY_NAME = autoconf +STARTABLE = no + +HOMEPAGE = https://www.gnu.org/software/autoconf/ + +SPK_COMMANDS = bin/autoconf +SPK_COMMANDS += bin/autoheader +SPK_COMMANDS += bin/autom4te +SPK_COMMANDS += bin/autoreconf +SPK_COMMANDS += bin/autoscan +SPK_COMMANDS += bin/autoupdate +SPK_COMMANDS += bin/ifnames + +include ../../mk/spksrc.spk.mk diff --git a/diyspk/binutils/Makefile b/diyspk/binutils/Makefile index 50b73195a54..8dd5a8b18a2 100644 --- a/diyspk/binutils/Makefile +++ b/diyspk/binutils/Makefile @@ -1,5 +1,5 @@ SPK_NAME = binutils -SPK_VERS = 2.40 +SPK_VERS = 2.42 SPK_REV = 1 DEPENDS = cross/binutils @@ -11,6 +11,30 @@ STARTABLE = no HOMEPAGE = https://www.gnu.org/software/binutils/ LICENSE = GPLv2/LGPLv2 -SPK_COMMANDS = bin/strace bin/strace-log-merge +SPK_COMMANDS = bin/addr2line +SPK_COMMANDS += bin/ar +SPK_COMMANDS += bin/as +SPK_COMMANDS += bin/c++filt +SPK_COMMANDS += bin/dwp +SPK_COMMANDS += bin/elfedit +SPK_COMMANDS += bin/embedspu +SPK_COMMANDS += bin/gp-archive +SPK_COMMANDS += bin/gp-collect-app +SPK_COMMANDS += bin/gp-display-html +SPK_COMMANDS += bin/gp-display-src +SPK_COMMANDS += bin/gp-display-text +SPK_COMMANDS += bin/gprof +SPK_COMMANDS += bin/gprofng +SPK_COMMANDS += bin/ld +SPK_COMMANDS += bin/ld.bfd +SPK_COMMANDS += bin/ld.gold +SPK_COMMANDS += bin/nm +SPK_COMMANDS += bin/objcopy +SPK_COMMANDS += bin/objdump +SPK_COMMANDS += bin/ranlib +SPK_COMMANDS += bin/readelf +SPK_COMMANDS += bin/size +SPK_COMMANDS += bin/strings +SPK_COMMANDS += bin/strip include ../../mk/spksrc.spk.mk diff --git a/diyspk/gdb/Makefile b/diyspk/gdb/Makefile index 8a52670f3d8..28dfcff2c7f 100644 --- a/diyspk/gdb/Makefile +++ b/diyspk/gdb/Makefile @@ -4,19 +4,17 @@ SPK_ICON = src/gdb.png DEPENDS = cross/gdb -include ../../mk/spksrc.archs.mk +include ../../mk/spksrc.common.mk ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH)) SPK_VERS = 7.12.1 -else -ifeq ($(call version_lt, $(TC_GCC), 4.8),1) +else ifeq ($(call version_lt, $(TC_GCC), 4.8),1) SPK_VERS = 7.12.1 else -SPK_VERS = 13.2 -endif +SPK_VERS = 14.2 endif MAINTAINER = th0ma7 -DESCRIPTION = The GNU Debugger (GDB) is a portable debugger that runs on many Unix-like systems and works for many programming languages, including Ada, C, C++, Objective-C, Free Pascal, Fortran, Go and partially others. +DESCRIPTION = The GNU Debugger \(GDB\) is a portable debugger that runs on many Unix-like systems and works for many programming languages, including Ada, C, C++, Objective-C, Free Pascal, Fortran, Go and partially others. STARTABLE = no HOMEPAGE = https://www.sourceware.org/gdb/ diff --git a/diyspk/strace/Makefile b/diyspk/strace/Makefile index 694124b00b3..fc25e48f0fe 100644 --- a/diyspk/strace/Makefile +++ b/diyspk/strace/Makefile @@ -1,5 +1,5 @@ SPK_NAME = strace -SPK_VERS = 6.4 +SPK_VERS = 6.9 SPK_REV = 1 DEPENDS = cross/strace diff --git a/spk/synocli-devel/Makefile b/spk/synocli-devel/Makefile index 7ec37c8947d..b4e84a04fec 100644 --- a/spk/synocli-devel/Makefile +++ b/spk/synocli-devel/Makefile @@ -1,8 +1,8 @@ SPK_NAME = synocli-devel -SPK_VERS = 1.2 -SPK_REV = 3 +SPK_VERS = 1.3 +SPK_REV = 4 SPK_ICON = src/synocli-devel.png -CHANGELOG = "1. Update strace to v6.5.
2. Add support for PPC archs." +CHANGELOG = "1. Fix autoconf to use installed m4 command.
2. Update autoconf to v2.72.
3. Update binutils to v2.42.
4. Update gdb to v14.2.
5. Update strace to v6.9." MAINTAINER = SynoCommunity DESCRIPTION = SynoCli Development Tools provides a set of command-line utilities for system development and debugging: automake 1.65.5, autoconf 2.71, binutils 2.40$(OPTIONAL_DESC), make 4.4.1, pkg-config 0.29.2, libtree 3.1.1, strace 6.5 From b19c77de771370a143f6393a327312e4399a2d44 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Thu, 13 Jun 2024 07:09:25 +0200 Subject: [PATCH 28/45] native/go: update to v1.22.4 (#6141) - this is a security update for #6140 and others --- native/go/Makefile | 2 +- native/go/digests | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/native/go/Makefile b/native/go/Makefile index 2a1d21873cf..2b62e560b6a 100644 --- a/native/go/Makefile +++ b/native/go/Makefile @@ -1,5 +1,5 @@ PKG_NAME = go -PKG_VERS = 1.22.3 +PKG_VERS = 1.22.4 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)$(PKG_VERS).linux-amd64.$(PKG_EXT) PKG_DIST_SITE = https://go.dev/dl diff --git a/native/go/digests b/native/go/digests index d950fe507d9..0ea09ac7c46 100644 --- a/native/go/digests +++ b/native/go/digests @@ -1,3 +1,3 @@ -go1.22.3.linux-amd64.tar.gz SHA1 eac5030e85c878d40d59a485ac2aacf3e292384e -go1.22.3.linux-amd64.tar.gz SHA256 8920ea521bad8f6b7bc377b4824982e011c19af27df88a815e3586ea895f1b36 -go1.22.3.linux-amd64.tar.gz MD5 4d6b67c3e7bfd4ecb71571c0ddf2e908 +go1.22.4.linux-amd64.tar.gz SHA1 804f375125af264c3cb838901d3fcf3265a40168 +go1.22.4.linux-amd64.tar.gz SHA256 ba79d4526102575196273416239cca418a651e049c2b099f3159db85e7bade7d +go1.22.4.linux-amd64.tar.gz MD5 2079d840368615eec74877e6f4f2a043 From 9955fd3b1069fa94c97318b94c6f8434ffa06601 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Thu, 13 Jun 2024 21:34:01 +0200 Subject: [PATCH 29/45] cloudflared: update to 2024.6.0 (#6140) - update cloudflared - rename displayed package name to "Cloudflare Tunnel" --- cross/cloudflared/Makefile | 13 +++++++------ cross/cloudflared/digests | 6 +++--- spk/cloudflared/Makefile | 10 +++++----- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/cross/cloudflared/Makefile b/cross/cloudflared/Makefile index 24d9e4e362b..29ca3cdc220 100644 --- a/cross/cloudflared/Makefile +++ b/cross/cloudflared/Makefile @@ -1,5 +1,5 @@ PKG_NAME = cloudflared -PKG_VERS = 2024.3.0 +PKG_VERS = 2024.6.0 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/cloudflare/cloudflared/archive @@ -9,7 +9,7 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS) BUILD_DEPENDS = native/go HOMEPAGE = https://github.com/cloudflare/cloudflared -COMMENT = Cloudflare Tunnel client (formerly Argo Tunnel) +COMMENT = Cloudflare Tunnel provides you with a secure way to connect your resources to Cloudflare without a publicly routable IP address. LICENSE = Apache-2.0 GO_SRC_DIR = $(WORK_DIR)/$(PKG_NAME)-$(PKG_VERS) @@ -18,12 +18,13 @@ COMPILE_TARGET = cloudflared_compile include ../../mk/spksrc.cross-go.mk +GOROOT_BOOTSTRAP=$(WORK_DIR)/../../../native/go/work-native/go/ + .PHONY: cloudflared_compile cloudflared_compile: ifeq (,$(wildcard /tmp/go)) - @$(MSG) " Call install-cloudflare-go.sh" - @$(RUN) GOARCH= GOOS= GOROOT_BOOTSTRAP=$(WORK_DIR)/../../../native/go/work-native/go/ \ - .teamcity/install-cloudflare-go.sh + @$(MSG) "- Call install-cloudflare-go.sh" + @$(RUN) GOARCH= GOOS= GOROOT_BOOTSTRAP=$(GOROOT_BOOTSTRAP) .teamcity/install-cloudflare-go.sh endif - @$(MSG) " Build cloudflared" + @$(MSG) "- Build cloudflared" @$(RUN) $(MAKE) PATH="/tmp/go/bin:${PATH}" VERSION=$(PKG_VERS) LINK_FLAGS="-s -w" cloudflared diff --git a/cross/cloudflared/digests b/cross/cloudflared/digests index 224ab264b06..3ec6987d143 100644 --- a/cross/cloudflared/digests +++ b/cross/cloudflared/digests @@ -1,3 +1,3 @@ -cloudflared-2024.3.0.tar.gz SHA1 419a6b21baf89b6e15eab654e4228de48419a5c7 -cloudflared-2024.3.0.tar.gz SHA256 6e5fda072d81b2d40208a0d244b44aaf607f26709711e157e23f44f812594e93 -cloudflared-2024.3.0.tar.gz MD5 7c3f1d60d1d9b4471ac6d93019095102 +cloudflared-2024.6.0.tar.gz SHA1 ea76a4a5df9198fde1a879fdabd44ebc623b9762 +cloudflared-2024.6.0.tar.gz SHA256 e75eec7eaf61320f7b5f9f6abc0891285bd3eeebad46b4a5cb53765281a8d88e +cloudflared-2024.6.0.tar.gz MD5 5942d076798577ab687786986598990a diff --git a/spk/cloudflared/Makefile b/spk/cloudflared/Makefile index 282857d47f7..40c5769ddf5 100644 --- a/spk/cloudflared/Makefile +++ b/spk/cloudflared/Makefile @@ -1,17 +1,17 @@ SPK_NAME = cloudflared -SPK_VERS = 2024.3.0 -SPK_REV = 12 +SPK_VERS = 2024.6.0 +SPK_REV = 13 SPK_ICON = src/cloudflared.png DEPENDS = cross/cloudflared UNSUPPORTED_ARCHS = $(PPC_ARCHS) MAINTAINER = karasevm -DISPLAY_NAME = cloudflared -DESCRIPTION = "Cloudflare Tunnel client \(formerly Argo Tunnel\)." +DISPLAY_NAME = Cloudflare Tunnel +DESCRIPTION = "Cloudflare Tunnel provides you with a secure way to connect your resources to Cloudflare without a publicly routable IP address. With Tunnel, you do not send traffic to an external IP - instead, a lightweight daemon in your infrastructure \('cloudflared'\) creates outbound-only connections to Cloudflare\'s global network. Cloudflare Tunnel can connect HTTP web servers, SSH servers, remote desktops, and other protocols safely to Cloudflare. This way, your origins can serve traffic through Cloudflare without being vulnerable to attacks that bypass Cloudflare." HOMEPAGE = https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/ LICENSE = Apache-2.0 -CHANGELOG = "Update to 2024.3.0" +CHANGELOG = "Update to v2024.6.0, built with go 1.22" WIZARDS_DIR = src/wizard/ From 51c7dd3ec8409b03d8a3b9a93f2e9eaa6e58a7a9 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Thu, 13 Jun 2024 21:39:52 +0200 Subject: [PATCH 30/45] synocli-devel: fix build of gdb for OLD_PPC_ARCHS (#6142) * synocli-devel: fix build of gdb for OLD_PPC_ARCHS * synocli-devel: fix for OLD_PPC AND ARMv5 archs - add patch to cross/strace to fix build for OLD_PPC_ARCHS - arrange the order of dependent packages --- cross/strace/Makefile | 3 ++ ...n-to-disable-kernel_v4l2_have_time32.patch | 29 +++++++++++++++++++ spk/synocli-devel/Makefile | 15 ++++++---- 3 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 cross/strace/patches/001-add-option-to-disable-kernel_v4l2_have_time32.patch diff --git a/cross/strace/Makefile b/cross/strace/Makefile index 9936f643bca..6d050563ddf 100644 --- a/cross/strace/Makefile +++ b/cross/strace/Makefile @@ -36,6 +36,9 @@ CONFIGURE_ARGS = --disable-mpers endif ifeq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH)) STRACE_ARCH = powerpc +ifeq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH)) +ADDITIONAL_CFLAGS = -DDISABLE_KERNEL_V4L2_HAVE_TIME32 +endif endif ifeq ($(strip $(STRACE_ARCH)),) diff --git a/cross/strace/patches/001-add-option-to-disable-kernel_v4l2_have_time32.patch b/cross/strace/patches/001-add-option-to-disable-kernel_v4l2_have_time32.patch new file mode 100644 index 00000000000..6042bf0def5 --- /dev/null +++ b/cross/strace/patches/001-add-option-to-disable-kernel_v4l2_have_time32.patch @@ -0,0 +1,29 @@ +# add option to avoid definition of KERNEL_V4L2_HAVE_TIME32 +# +# since strace v6.7: +# build fails on OLD_PPC_ARCHS when KERNEL_V4L2_HAVE_TIME32 is defined +# +--- src/kernel_v4l2_types.h.orig 2024-03-19 13:00:00.000000000 +0100 ++++ src/kernel_v4l2_types.h 2024-06-13 20:21:42.778741158 +0200 +@@ -47,8 +47,9 @@ + }; + } kernel_v4l2_buffer_t; + +-# if HAVE_ARCH_TIME32_SYSCALLS || HAVE_ARCH_TIMESPEC32 +-# define KERNEL_V4L2_HAVE_TIME32 1 ++# if !defined DISABLE_KERNEL_V4L2_HAVE_TIME32 ++# if HAVE_ARCH_TIME32_SYSCALLS || HAVE_ARCH_TIMESPEC32 ++# define KERNEL_V4L2_HAVE_TIME32 1 + + /* + * On all 32-bit architectures and on 64-bit ones with COMPAT enabled +@@ -87,7 +88,8 @@ + uint32_t reserved; + }; + } kernel_v4l2_buffer_time32_t; +-# endif /* HAVE_ARCH_TIME32_SYSCALLS || HAVE_ARCH_TIMESPEC32 */ ++# endif /* HAVE_ARCH_TIME32_SYSCALLS || HAVE_ARCH_TIMESPEC32 */ ++# endif /* !defined DISABLE_KERNEL_V4L2_HAVE_TIME32 */ + + typedef struct { + uint32_t type; diff --git a/spk/synocli-devel/Makefile b/spk/synocli-devel/Makefile index b4e84a04fec..3c430d9de9b 100644 --- a/spk/synocli-devel/Makefile +++ b/spk/synocli-devel/Makefile @@ -22,18 +22,21 @@ ifneq ($(call version_lt, $(TC_GCC), 4.8.1),1) DEPENDS += cross/llvm endif -# build pkg-config before autoconf otherwise -# glib fails on libiconv on some platforms -# (to investigate ...) -DEPENDS += cross/pkg-config -DEPENDS += cross/autoconf -DEPENDS += cross/automake +# build binutils bofore the following +# otherwise it fails to build for ARMv5 DEPENDS += cross/binutils +DEPENDS += cross/pkg-config DEPENDS += cross/gdb DEPENDS += cross/make DEPENDS += cross/libtree DEPENDS += cross/strace +# build autotools last +# otherwise glib and gdb fail on libiconv on some platforms +# (to investigate ...) +DEPENDS += cross/autoconf +DEPENDS += cross/automake + ## ## autoconf ## From 3d05cc5b652712c10f59d91b02b656a764360a9b Mon Sep 17 00:00:00 2001 From: wkobiela <12174429+wkobiela@users.noreply.github.com> Date: Fri, 14 Jun 2024 10:04:07 +0200 Subject: [PATCH 31/45] Update Gitea to v1.22.0 (#6104) * Update Gitea to v1.22.0 * Mark armv5 as unsupported --- cross/gitea/Makefile | 4 +++- cross/gitea/digests | 6 +++--- spk/gitea/Makefile | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cross/gitea/Makefile b/cross/gitea/Makefile index 1d016ca65e2..91593e1d6fc 100644 --- a/cross/gitea/Makefile +++ b/cross/gitea/Makefile @@ -1,11 +1,13 @@ PKG_NAME = gitea -PKG_VERS = 1.21.11 +PKG_VERS = 1.22.0 PKG_EXT = tar.gz PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/go-gitea/gitea/archive PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) +UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) + BUILD_DEPENDS = native/go native/nodejs HOMEPAGE = https://gitea.io/ diff --git a/cross/gitea/digests b/cross/gitea/digests index 226b03af937..2cf272d2c65 100644 --- a/cross/gitea/digests +++ b/cross/gitea/digests @@ -1,3 +1,3 @@ -gitea-1.21.11.tar.gz SHA1 7450cace7d94b00f06da5c3607bfb115c3c0f68f -gitea-1.21.11.tar.gz SHA256 9828409e71c9fcf46bbe8f858974d5b863dfc4a7e539165cef98890ac6bd2e2f -gitea-1.21.11.tar.gz MD5 442dbfa079d4febd2fdd7a9c5b753dec +gitea-1.22.0.tar.gz SHA1 a991acc7b4fb2b36ac005634b8538ee100f1a011 +gitea-1.22.0.tar.gz SHA256 427dcd8aee04caca0be2a0f42eee6665f9e9c97fda0a35497b4cf5ac6db96646 +gitea-1.22.0.tar.gz MD5 6531f7500abec56bb99cd003aa81b84b diff --git a/spk/gitea/Makefile b/spk/gitea/Makefile index 4dc09dbad52..55c7a69b930 100644 --- a/spk/gitea/Makefile +++ b/spk/gitea/Makefile @@ -1,12 +1,12 @@ SPK_NAME = gitea -SPK_VERS = 1.21.11 -SPK_REV = 13 +SPK_VERS = 1.22.0 +SPK_REV = 14 SPK_ICON = src/gitea.png MAINTAINER = wkobiela DESCRIPTION = Gitea is a community managed lightweight code hosting solution written in Go. DISPLAY_NAME = Gitea -CHANGELOG = "1. Update to v1.21.11." +CHANGELOG = "1. Update to v1.22.0." LICENSE = MIT From a0aa33ff4a238af4f6c1121da7c446bfd3a6a4a3 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Sat, 15 Jun 2024 19:41:25 +0200 Subject: [PATCH 32/45] update image and font libraries (#6143) * update image and font libraries - update some image libraries in preparation for updating the ImageMagick package - update fontconfig to v2.15.0 - update freetype to v2.13.2 - update giflib to v5.2.2 - update libpng to v1.6.43 - update libtiff to v4.6.0 - update libwebp to v1.4.0 - update openjpeg to v2.5.2 - fix pngcrush to build with updated libpng * pixman: update to v0.42.2 * x265: update to v3.6 - remove patches that are applied upstream * update pngquant and libimagequant - update libimagequant to v2.18.0 - update pngquant to v2.18.0 --- cross/fontconfig/Makefile | 2 +- cross/fontconfig/PLIST | 2 +- cross/fontconfig/digests | 6 ++-- cross/freetype/Makefile | 2 +- cross/freetype/PLIST | 2 +- cross/freetype/digests | 6 ++-- cross/giflib/Makefile | 2 +- cross/giflib/digests | 6 ++-- .../patches/001-configurable-Makefile.patch | 28 +++++++++---------- cross/libimagequant/Makefile | 4 +-- cross/libimagequant/digests | 6 ++-- cross/libpng/Makefile | 3 +- cross/libpng/PLIST | 2 +- cross/libpng/digests | 6 ++-- cross/libtiff/Makefile | 2 +- cross/libtiff/PLIST | 8 +++--- cross/libtiff/digests | 6 ++-- cross/libwebp/Makefile | 2 +- cross/libwebp/PLIST | 8 +++--- cross/libwebp/digests | 6 ++-- cross/openjpeg/Makefile | 2 +- cross/openjpeg/PLIST | 2 +- cross/openjpeg/digests | 6 ++-- cross/pixman/Makefile | 2 +- cross/pixman/PLIST | 2 +- cross/pixman/digests | 6 ++-- cross/pngcrush/Makefile | 5 ++-- cross/pngquant/Makefile | 11 ++++---- cross/pngquant/digests | 6 ++-- cross/x265/Makefile | 2 +- cross/x265/PLIST | 2 +- cross/x265/digests | 6 ++-- .../001-fix-dynamicHDR-flags-arm64.patch | 17 ----------- .../patches/002-detect512-on-all-archs.patch | 8 +++--- .../patches/003-fix-version-info-arm64.patch | 14 ---------- diyspk/image-optim/Makefile | 6 ++-- 36 files changed, 87 insertions(+), 119 deletions(-) delete mode 100644 cross/x265/patches/001-fix-dynamicHDR-flags-arm64.patch delete mode 100644 cross/x265/patches/003-fix-version-info-arm64.patch diff --git a/cross/fontconfig/Makefile b/cross/fontconfig/Makefile index 6391eb41b38..fc8f220009e 100644 --- a/cross/fontconfig/Makefile +++ b/cross/fontconfig/Makefile @@ -1,5 +1,5 @@ PKG_NAME = fontconfig -PKG_VERS = 2.14.2 +PKG_VERS = 2.15.0 PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.freedesktop.org/software/fontconfig/release diff --git a/cross/fontconfig/PLIST b/cross/fontconfig/PLIST index be00c57eb05..8ccb94b0b66 100644 --- a/cross/fontconfig/PLIST +++ b/cross/fontconfig/PLIST @@ -11,6 +11,6 @@ rsc:etc/fonts/conf.d/ rsc:etc/fonts/fonts.conf lnk:lib/libfontconfig.so lnk:lib/libfontconfig.so.1 -lib:lib/libfontconfig.so.1.13.0 +lib:lib/libfontconfig.so.1.14.0 rsc:share/fontconfig/conf.avail/ rsc:share/xml/fontconfig/fonts.dtd diff --git a/cross/fontconfig/digests b/cross/fontconfig/digests index 300166681aa..f3fccfb79ac 100644 --- a/cross/fontconfig/digests +++ b/cross/fontconfig/digests @@ -1,3 +1,3 @@ -fontconfig-2.14.2.tar.xz SHA1 3631a6a6ccb870d88149538cf9e6ad3fa27e056b -fontconfig-2.14.2.tar.xz SHA256 dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b -fontconfig-2.14.2.tar.xz MD5 95261910ea727b5dd116b06fbfd84b1f +fontconfig-2.15.0.tar.xz SHA1 b6137ee5d542c0fe5c96a7724884f2e8e212d275 +fontconfig-2.15.0.tar.xz SHA256 63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e +fontconfig-2.15.0.tar.xz MD5 5bb3a2829aecb22ae553c39099bd0d6a diff --git a/cross/freetype/Makefile b/cross/freetype/Makefile index 4b3ec00037a..218b73e7c21 100644 --- a/cross/freetype/Makefile +++ b/cross/freetype/Makefile @@ -1,5 +1,5 @@ PKG_NAME = freetype -PKG_VERS = 2.13.0 +PKG_VERS = 2.13.2 PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://de.freedif.org/savannah/freetype diff --git a/cross/freetype/PLIST b/cross/freetype/PLIST index 36d776a78bd..775b219ce9d 100644 --- a/cross/freetype/PLIST +++ b/cross/freetype/PLIST @@ -1,3 +1,3 @@ lnk:lib/libfreetype.so lnk:lib/libfreetype.so.6 -lib:lib/libfreetype.so.6.19.0 +lib:lib/libfreetype.so.6.20.1 diff --git a/cross/freetype/digests b/cross/freetype/digests index eddfade8b48..cd867266fd1 100644 --- a/cross/freetype/digests +++ b/cross/freetype/digests @@ -1,3 +1,3 @@ -freetype-2.13.0.tar.xz SHA1 6393c1451c2f1c5f83aed5ea92d280af078e27d9 -freetype-2.13.0.tar.xz SHA256 5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c -freetype-2.13.0.tar.xz MD5 fe73327ebbf0b629f3ad24be656d59de +freetype-2.13.2.tar.xz SHA1 2d8d5917a1983ebd04921f2993a88858d6f72dec +freetype-2.13.2.tar.xz SHA256 12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d +freetype-2.13.2.tar.xz MD5 1f625f0a913c449551b1e3790a1817d7 diff --git a/cross/giflib/Makefile b/cross/giflib/Makefile index fbcd43fab02..6c9d518ea0a 100644 --- a/cross/giflib/Makefile +++ b/cross/giflib/Makefile @@ -1,5 +1,5 @@ PKG_NAME = giflib -PKG_VERS = 5.2.1 +PKG_VERS = 5.2.2 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://downloads.sourceforge.net/project/giflib diff --git a/cross/giflib/digests b/cross/giflib/digests index 9ee0edc06ba..03de4938185 100644 --- a/cross/giflib/digests +++ b/cross/giflib/digests @@ -1,3 +1,3 @@ -giflib-5.2.1.tar.gz SHA1 c3f774dcbdf26afded7788979c8081d33c6426dc -giflib-5.2.1.tar.gz SHA256 31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd -giflib-5.2.1.tar.gz MD5 6f03aee4ebe54ac2cc1ab3e4b0a049e5 +giflib-5.2.2.tar.gz SHA1 608ba98d2dd8d03dfa7476f434d57de50a33e10b +giflib-5.2.2.tar.gz SHA256 be7ffbd057cadebe2aa144542fd90c6838c6a083b5e8a9048b8ee3b66b29d5fb +giflib-5.2.2.tar.gz MD5 913dd251492134e235ee3c9a91987a4d diff --git a/cross/giflib/patches/001-configurable-Makefile.patch b/cross/giflib/patches/001-configurable-Makefile.patch index e9bb6c622c7..c42aa624a56 100644 --- a/cross/giflib/patches/001-configurable-Makefile.patch +++ b/cross/giflib/patches/001-configurable-Makefile.patch @@ -3,8 +3,8 @@ # - make PREFIX overwritable # - add targets to build shared libraries only # ---- Makefile.orig 2019-06-24 16:08:57.000000000 +0000 -+++ Makefile 2022-09-06 05:28:43.957220363 +0000 +--- Makefile.orig 2024-02-19 01:01:50.000000000 +0000 ++++ Makefile 2024-06-07 15:21:30.693835603 +0000 @@ -8,13 +8,13 @@ # OFLAGS = -O0 -g @@ -21,24 +21,24 @@ BINDIR = $(PREFIX)/bin INCDIR = $(PREFIX)/include LIBDIR = $(PREFIX)/lib -@@ -66,6 +66,8 @@ +@@ -95,6 +95,8 @@ $(UTILS):: libgif.a libutil.a +shared-lib: libgif.so libutil.so + - libgif.so: $(OBJECTS) $(HEADERS) - $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS) - -@@ -102,6 +104,11 @@ - $(INSTALL) -m 755 libgif.so "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)" - ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)" - ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so" + $(LIBGIFSO): $(OBJECTS) $(HEADERS) + ifeq ($(UNAME), Darwin) + $(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(OBJECTS) -o $(LIBGIFSO) +@@ -147,6 +149,11 @@ + $(INSTALL) -m 755 $(LIBGIFSO) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOVER)" + ln -sf $(LIBGIFSOVER) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOMAJOR)" + ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)" +install-shared-lib: install-include + $(INSTALL) -d "$(DESTDIR)$(LIBDIR)" -+ $(INSTALL) -m 755 libgif.so "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)" -+ ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)" -+ ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so" ++ $(INSTALL) -m 755 $(LIBGIFSO) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOVER)" ++ ln -sf $(LIBGIFSOVER) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOMAJOR)" ++ ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)" install-man: $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" - $(INSTALL) -m 644 doc/*.1 "$(DESTDIR)$(MANDIR)/man1" + $(INSTALL) -m 644 $(MANUAL_PAGES) "$(DESTDIR)$(MANDIR)/man1" diff --git a/cross/libimagequant/Makefile b/cross/libimagequant/Makefile index b03b4d6aa27..30c2cd73375 100644 --- a/cross/libimagequant/Makefile +++ b/cross/libimagequant/Makefile @@ -1,8 +1,8 @@ PKG_NAME = libimagequant -PKG_VERS = 2.17.0 +PKG_VERS = 2.18.0 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://github.com/ImageOptim/$(PKG_NAME)/archive +PKG_DIST_SITE = https://github.com/ImageOptim/libimagequant/archive PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) diff --git a/cross/libimagequant/digests b/cross/libimagequant/digests index 34a36849376..6742969b13a 100644 --- a/cross/libimagequant/digests +++ b/cross/libimagequant/digests @@ -1,3 +1,3 @@ -libimagequant-2.17.0.tar.gz SHA1 8ccb742e817e9d50317685af529410d7d7e3b0c8 -libimagequant-2.17.0.tar.gz SHA256 9f6cc50182be4d2ece75118aa0b0fd3e9bbad06e94fd6b9eb3a4c08129c2dd26 -libimagequant-2.17.0.tar.gz MD5 0447f0de4c68aef5f342ddec58a46e7c +libimagequant-2.18.0.tar.gz SHA1 eb90c754027b33af9e5414a4d1ea65fbbf56765b +libimagequant-2.18.0.tar.gz SHA256 790d2593a587f9a27cec6245ee7a212b34b0aa63cac6383e550eda01236be636 +libimagequant-2.18.0.tar.gz MD5 bc0870e98d02fef68f65ef770d0d5c30 diff --git a/cross/libpng/Makefile b/cross/libpng/Makefile index 6f0f39bd0e9..057c3233b69 100644 --- a/cross/libpng/Makefile +++ b/cross/libpng/Makefile @@ -1,5 +1,5 @@ PKG_NAME = libpng -PKG_VERS = 1.6.38 +PKG_VERS = 1.6.43 PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://download.sourceforge.net/libpng @@ -12,7 +12,6 @@ COMMENT = Portable Network Graphics Library LICENSE = http://www.libpng.org/pub/png/src/libpng-LICENSE.txt CMAKE_ARGS += -DPNG_STATIC=OFF -CMAKE_ARGS += -DHAVE_LD_VERSION_SCRIPT=OFF ADDITIONAL_CFLAGS = -O -lm include ../../mk/spksrc.cross-cmake.mk diff --git a/cross/libpng/PLIST b/cross/libpng/PLIST index a1f709a8715..643c3bc0f6d 100644 --- a/cross/libpng/PLIST +++ b/cross/libpng/PLIST @@ -1,4 +1,4 @@ lnk:lib/libpng16.so lnk:lib/libpng16.so.16 -lib:lib/libpng16.so.16.38.0 +lib:lib/libpng16.so.16.43.0 lnk:lib/libpng.so diff --git a/cross/libpng/digests b/cross/libpng/digests index 8d55192bce5..cb706b0ea21 100644 --- a/cross/libpng/digests +++ b/cross/libpng/digests @@ -1,3 +1,3 @@ -libpng-1.6.38.tar.xz SHA1 60960ed110094843e5efa221df6a7d21614a4dba -libpng-1.6.38.tar.xz SHA256 b3683e8b8111ebf6f1ac004ebb6b0c975cd310ec469d98364388e9cedbfa68be -libpng-1.6.38.tar.xz MD5 122e6b7837811698563083b352bc8ca2 +libpng-1.6.43.tar.xz SHA1 ad9f087b73acf01e2c252920810b005ee69d3e0e +libpng-1.6.43.tar.xz SHA256 6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c +libpng-1.6.43.tar.xz MD5 22b8362d16c3724eba9c1fb8d187320a diff --git a/cross/libtiff/Makefile b/cross/libtiff/Makefile index 7e8ef220d77..307d403ff58 100644 --- a/cross/libtiff/Makefile +++ b/cross/libtiff/Makefile @@ -1,5 +1,5 @@ PKG_NAME = tiff -PKG_VERS = 4.3.0 +PKG_VERS = 4.6.0 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = http://download.osgeo.org/libtiff diff --git a/cross/libtiff/PLIST b/cross/libtiff/PLIST index 78179c1eb6a..745534d38dc 100644 --- a/cross/libtiff/PLIST +++ b/cross/libtiff/PLIST @@ -1,6 +1,6 @@ lnk:lib/libtiff.so -lnk:lib/libtiff.so.5 -lib:lib/libtiff.so.5.7.0 +lnk:lib/libtiff.so.6 +lib:lib/libtiff.so.6.0.2 lnk:lib/libtiffxx.so -lnk:lib/libtiffxx.so.5 -lib:lib/libtiffxx.so.5.7.0 +lnk:lib/libtiffxx.so.6 +lib:lib/libtiffxx.so.6.0.2 diff --git a/cross/libtiff/digests b/cross/libtiff/digests index 82b118b1c4f..617f7690c74 100644 --- a/cross/libtiff/digests +++ b/cross/libtiff/digests @@ -1,3 +1,3 @@ -tiff-4.3.0.tar.gz SHA1 c03f6cb05b64ff496b3a5c733a0af6296aead051 -tiff-4.3.0.tar.gz SHA256 0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8 -tiff-4.3.0.tar.gz MD5 0a2e4744d1426a8fc8211c0cdbc3a1b3 +tiff-4.6.0.tar.gz SHA1 5eda840cc24e1c74c6a9d92faa86a0851f7de7d5 +tiff-4.6.0.tar.gz SHA256 88b3979e6d5c7e32b50d7ec72fb15af724f6ab2cbf7e10880c360a77e4b5d99a +tiff-4.6.0.tar.gz MD5 fc7d49a9348b890b29f91a4ecadd5b49 diff --git a/cross/libwebp/Makefile b/cross/libwebp/Makefile index a35463f8f01..819ba501caa 100644 --- a/cross/libwebp/Makefile +++ b/cross/libwebp/Makefile @@ -1,5 +1,5 @@ PKG_NAME = libwebp -PKG_VERS = 1.2.4 +PKG_VERS = 1.4.0 PKG_EXT = tar.gz PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/webmproject/libwebp/archive diff --git a/cross/libwebp/PLIST b/cross/libwebp/PLIST index 2c5a360d906..0907be82349 100644 --- a/cross/libwebp/PLIST +++ b/cross/libwebp/PLIST @@ -2,13 +2,13 @@ bin:bin/cwebp bin:bin/dwebp lnk:lib/libwebp.so lnk:lib/libwebp.so.7 -lib:lib/libwebp.so.7.1.5 +lib:lib/libwebp.so.7.1.9 lnk:lib/libwebpdecoder.so lnk:lib/libwebpdecoder.so.3 -lib:lib/libwebpdecoder.so.3.1.5 +lib:lib/libwebpdecoder.so.3.1.9 lnk:lib/libwebpdemux.so lnk:lib/libwebpdemux.so.2 -lib:lib/libwebpdemux.so.2.0.11 +lib:lib/libwebpdemux.so.2.0.15 lnk:lib/libwebpmux.so lnk:lib/libwebpmux.so.3 -lib:lib/libwebpmux.so.3.0.10 +lib:lib/libwebpmux.so.3.1.0 diff --git a/cross/libwebp/digests b/cross/libwebp/digests index 808969414a6..2a91cfb09e0 100644 --- a/cross/libwebp/digests +++ b/cross/libwebp/digests @@ -1,3 +1,3 @@ -libwebp-1.2.4.tar.gz SHA1 21c195131f9d45a1d94182411c488b1e82aab8cb -libwebp-1.2.4.tar.gz SHA256 dfe7bff3390cd4958da11e760b65318f0a48c32913e4d5bc5e8d55abaaa2d32e -libwebp-1.2.4.tar.gz MD5 4f08244f88a39816c3e0719ca16c7a92 +libwebp-1.4.0.tar.gz SHA1 2baf78f0e23748632bf949a564660f07ea9e0a44 +libwebp-1.4.0.tar.gz SHA256 12af50c45530f0a292d39a88d952637e43fb2d4ab1883c44ae729840f7273381 +libwebp-1.4.0.tar.gz MD5 9778f9be63f04f16f9ca3a4f36503399 diff --git a/cross/openjpeg/Makefile b/cross/openjpeg/Makefile index c9d28e6be99..39ed5e9d181 100644 --- a/cross/openjpeg/Makefile +++ b/cross/openjpeg/Makefile @@ -1,5 +1,5 @@ PKG_NAME = openjpeg -PKG_VERS = 2.5.0 +PKG_VERS = 2.5.2 PKG_EXT = tar.gz PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/uclouvain/openjpeg/archive diff --git a/cross/openjpeg/PLIST b/cross/openjpeg/PLIST index d5eef50aca4..b0b782d9c00 100644 --- a/cross/openjpeg/PLIST +++ b/cross/openjpeg/PLIST @@ -1,3 +1,3 @@ lnk:lib/libopenjp2.so -lib:lib/libopenjp2.so.2.5.0 +lib:lib/libopenjp2.so.2.5.2 lnk:lib/libopenjp2.so.7 diff --git a/cross/openjpeg/digests b/cross/openjpeg/digests index e301c988e54..5d60bdeeef4 100644 --- a/cross/openjpeg/digests +++ b/cross/openjpeg/digests @@ -1,3 +1,3 @@ -openjpeg-2.5.0.tar.gz SHA1 ed4c9cf56b74a5bf380db3d88e402d3e0d85e7a7 -openjpeg-2.5.0.tar.gz SHA256 0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a -openjpeg-2.5.0.tar.gz MD5 5cbb822a1203dd75b85639da4f4ecaab +openjpeg-2.5.2.tar.gz SHA1 82c7aa51b94684ab537eca26d55731830ecf0a74 +openjpeg-2.5.2.tar.gz SHA256 90e3896fed910c376aaf79cdd98bdfdaf98c6472efd8e1debf0a854938cbda6a +openjpeg-2.5.2.tar.gz MD5 f9ee64845881a15109ed0aa73a12202f diff --git a/cross/pixman/Makefile b/cross/pixman/Makefile index 5737873004f..0fe8bcd4152 100644 --- a/cross/pixman/Makefile +++ b/cross/pixman/Makefile @@ -1,5 +1,5 @@ PKG_NAME = pixman -PKG_VERS = 0.40.0 +PKG_VERS = 0.42.2 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.cairographics.org/releases/ diff --git a/cross/pixman/PLIST b/cross/pixman/PLIST index 79d642b3cb7..6aeb8751a10 100644 --- a/cross/pixman/PLIST +++ b/cross/pixman/PLIST @@ -1,3 +1,3 @@ lnk:lib/libpixman-1.so lnk:lib/libpixman-1.so.0 -lib:lib/libpixman-1.so.0.40.0 +lib:lib/libpixman-1.so.0.42.2 diff --git a/cross/pixman/digests b/cross/pixman/digests index df6250909e2..f2dbcd097df 100644 --- a/cross/pixman/digests +++ b/cross/pixman/digests @@ -1,3 +1,3 @@ -pixman-0.40.0.tar.gz SHA1 d7baa6377b6f48e29db011c669788bb1268d08ad -pixman-0.40.0.tar.gz SHA256 6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc -pixman-0.40.0.tar.gz MD5 73858c0862dd9896fb5f62ae267084a4 +pixman-0.42.2.tar.gz SHA1 7063429f9952fd8c4fcbc887c3210b35adb6a6c7 +pixman-0.42.2.tar.gz SHA256 ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e +pixman-0.42.2.tar.gz MD5 a0f6ab8a1d8e0e2cd80e935525e2a864 diff --git a/cross/pngcrush/Makefile b/cross/pngcrush/Makefile index 420a13e2ba4..d73ede21f67 100644 --- a/cross/pngcrush/Makefile +++ b/cross/pngcrush/Makefile @@ -16,7 +16,8 @@ CONFIGURE_TARGET = nop COMPILE_MAKE_OPTIONS = -f Makefile-nolib LIBS="-L$(STAGING_INSTALL_PREFIX) -lpng -lz" INSTALL_MAKE_OPTIONS = -f Makefile-nolib install DESTDIR=$(INSTALL_DIR) prefix=$(INSTALL_PREFIX) -#ENV += LIBS="-L$(STAGING_INSTALL_PREFIX) -lpng -lz" -#GNU_CONFIGURE = 1 +# libpng >= 1.6.41 +# pngcrush.c:5523:46: error: ‘PNG_IGNORE_ADLER32’ undeclared (first use in this function) +ADDITIONAL_CFLAGS = -DPNG_SET_OPTION_SUPPORTED -DPNG_DISABLE_ADLER32_CHECK_SUPPORTED include ../../mk/spksrc.cross-cc.mk diff --git a/cross/pngquant/Makefile b/cross/pngquant/Makefile index d7e829cf3c2..b00a7ae4f28 100644 --- a/cross/pngquant/Makefile +++ b/cross/pngquant/Makefile @@ -1,17 +1,16 @@ PKG_NAME = pngquant -PKG_VERS = 2.17.0 +PKG_VERS = 2.18.0 PKG_EXT = tar.gz -PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS)-src.$(PKG_EXT) -PKG_DIST_SITE = http://sources.buildroot.net/pngquant -# Many connection timed out using official source -#PKG_DIST_SITE = https://pngquant.org +PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://github.com/kornelski/pngquant/archive +PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DEPENDS = cross/libpng cross/libimagequant HOMEPAGE = https://pngquant.org/ COMMENT = pngquant is a command-line utility and a library for lossy compression of PNG images. -LICENSE = GPL +LICENSE = GPLv3 GNU_CONFIGURE = 1 ADDITIONAL_CFLAGS = -O3 diff --git a/cross/pngquant/digests b/cross/pngquant/digests index 7c16469d22c..0305b2f80a4 100644 --- a/cross/pngquant/digests +++ b/cross/pngquant/digests @@ -1,3 +1,3 @@ -pngquant-2.17.0-src.tar.gz SHA1 886af39c9b7c2f55f4835cced7fb56f1371c9967 -pngquant-2.17.0-src.tar.gz SHA256 a27cf0e64db499ccb3ddae9b36036e881f78293e46ec27a9e7a86a3802fcda66 -pngquant-2.17.0-src.tar.gz MD5 e18dd9cc2114c28f85b04b376512c267 +pngquant-2.18.0.tar.gz SHA1 c413ee1d77d65bd355f8af5e4c0de7124ed0e62d +pngquant-2.18.0.tar.gz SHA256 424ff432e51dfc3cf5ff8001ad1b64198850686c5e3c26ecd477e4b69ef4fade +pngquant-2.18.0.tar.gz MD5 1a66807386c879e467db38e26fddf100 diff --git a/cross/x265/Makefile b/cross/x265/Makefile index ecf50817aea..b91c97df2c7 100644 --- a/cross/x265/Makefile +++ b/cross/x265/Makefile @@ -1,5 +1,5 @@ PKG_NAME = x265 -PKG_VERS = 3.5 +PKG_VERS = 3.6 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)_$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://bitbucket.org/multicoreware/x265_git/downloads diff --git a/cross/x265/PLIST b/cross/x265/PLIST index 547dec16899..5261cc6a20e 100644 --- a/cross/x265/PLIST +++ b/cross/x265/PLIST @@ -1,4 +1,4 @@ bin:bin/x265 lib:lib/libhdr10plus.so lnk:lib/libx265.so -lib:lib/libx265.so.199 +lib:lib/libx265.so.209 diff --git a/cross/x265/digests b/cross/x265/digests index df87711ec8f..c033cf03a82 100644 --- a/cross/x265/digests +++ b/cross/x265/digests @@ -1,3 +1,3 @@ -x265_3.5.tar.gz SHA1 dc8e70f441991289a9a34fd37e1649d59435bfae -x265_3.5.tar.gz SHA256 e70a3335cacacbba0b3a20ec6fecd6783932288ebc8163ad74bcc9606477cae8 -x265_3.5.tar.gz MD5 deb5df5cb2ec17bdbae6ac6bbc3b1eef +x265_3.6.tar.gz SHA1 51fc4592a9f1e340d87a51233361cc5a3ffd739d +x265_3.6.tar.gz SHA256 663531f341c5389f460d730e62e10a4fcca3428ca2ca109693867bc5fe2e2807 +x265_3.6.tar.gz MD5 99997ecc8ee4d3575ba7715c759ad3bb diff --git a/cross/x265/patches/001-fix-dynamicHDR-flags-arm64.patch b/cross/x265/patches/001-fix-dynamicHDR-flags-arm64.patch deleted file mode 100644 index edc24a5af16..00000000000 --- a/cross/x265/patches/001-fix-dynamicHDR-flags-arm64.patch +++ /dev/null @@ -1,17 +0,0 @@ -# set ARM64 flags the same way as in parent CMakeLists.txt -# ---- source/dynamicHDR10/CMakeLists.txt.orig 2021-03-16 12:53:00.000000000 +0000 -+++ source/dynamicHDR10/CMakeLists.txt 2022-03-26 13:06:56.201819727 +0000 -@@ -43,7 +43,11 @@ - endif() - endif() - if(ARM AND CROSS_COMPILE_ARM) -- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) -+ if(ARM64) -+ set(ARM_ARGS -fPIC) -+ else() -+ set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) -+ endif() - elseif(ARM) - find_package(Neon) - if(CPU_HAS_NEON) diff --git a/cross/x265/patches/002-detect512-on-all-archs.patch b/cross/x265/patches/002-detect512-on-all-archs.patch index 73063703e81..3f2194e9baf 100644 --- a/cross/x265/patches/002-detect512-on-all-archs.patch +++ b/cross/x265/patches/002-detect512-on-all-archs.patch @@ -1,6 +1,6 @@ ---- source/common/cpu.cpp-orig 2019-12-10 22:31:19.000525673 -0500 -+++ source/common/cpu.cpp 2019-12-10 22:28:41.983368481 -0500 -@@ -110,6 +110,11 @@ const cpu_name_t cpu_names[] = +--- source/common/cpu.cpp.orig 2024-04-04 09:39:50.000000000 +0000 ++++ source/common/cpu.cpp 2024-06-15 07:20:37.644785266 +0000 +@@ -122,6 +122,11 @@ { "", 0 }, }; @@ -12,7 +12,7 @@ #if X265_ARCH_X86 extern "C" { -@@ -123,11 +128,6 @@ uint64_t PFX(cpu_xgetbv)(int xcr); +@@ -135,11 +140,6 @@ #pragma warning(disable: 4309) // truncation of constant value #endif diff --git a/cross/x265/patches/003-fix-version-info-arm64.patch b/cross/x265/patches/003-fix-version-info-arm64.patch deleted file mode 100644 index dce11059a12..00000000000 --- a/cross/x265/patches/003-fix-version-info-arm64.patch +++ /dev/null @@ -1,14 +0,0 @@ -# fix version info for ARM64 -# https://bitbucket.org/multicoreware/x265_git/issues/604/linux-arm-aarch64-build-failing-for-high -# ---- source/common/version.cpp.orig 2021-03-16 12:53:00.000000000 +0000 -+++ source/common/version.cpp 2022-03-26 13:24:42.935435144 +0000 -@@ -71,7 +71,7 @@ - #define ONOS "[Unk-OS]" - #endif - --#if X86_64 -+#if X86_64 || defined(__aarch64__) - #define BITS "[64 bit]" - #else - #define BITS "[32 bit]" diff --git a/diyspk/image-optim/Makefile b/diyspk/image-optim/Makefile index ca6f42e1b91..c680bccbc41 100644 --- a/diyspk/image-optim/Makefile +++ b/diyspk/image-optim/Makefile @@ -2,15 +2,15 @@ SPK_NAME = image-optim SPK_VERS = 1.0 SPK_REV = 1 -DEPENDS = cross/jpegoptim cross/pngcrush cross/advancecomp +DEPENDS = cross/jpegoptim cross/pngcrush cross/advancecomp cross/pngquant MAINTAINER = SynoCommunity DESCRIPTION = Several utilities for image optimization \(jpegoptim, pngcrush, advancecomp\) DISPLAY_NAME = Image Optimizers STARTABLE = no -LICENSE = GPLv2 +LICENSE = GPLv3 -SPK_COMMANDS = bin/jpegoptim bin/pngcrush bin/advmng bin/advpng +SPK_COMMANDS = bin/jpegoptim bin/pngcrush bin/advmng bin/advpng bin/pngquant include ../../mk/spksrc.spk.mk From dec856ffa848f14d869a9c562c7d0063c4758b43 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 16 Jun 2024 06:15:39 -0400 Subject: [PATCH 33/45] kernel.mk: Fix regression build issue since #6002 (#6089) * kernel.mk: First attempt to fix build issue since #6002 * kernel.mk: Include changes from PR #5790 to include new kernels * kernel.mk: Update to using actual DSM-7.2 kernel files * kernel.mk: Filter out unsupported kernel archs * kernel: Remove DSM-7.1 fixes not applicable anymore on DSM-7.2 * synokernel-cdrom: Bump package version and mark arch as unsupported * synokernel-usbserial: Bump spk vers. and mark arch as unsupported * kernel.mk: Yet another round of fixes * kernel.mk: Other round of fixes simplifying the overall processing * spk.mk: Oversight missing tc_vars.meson into the spkclean call * kernel.mk: Other round of fixes and optimizations * kernel.mk: Fix kernel source tree remove post module build * kernel.mk: Fix building generic arch -> skip at toolchain * kernel.mk: Fix kernel build-tree removal after modules are built * kernel.mk: Remove dependency-kernel-list call * kernel.mk: Fix re-installing toolchain at clean call * kernel.mk: Layout fix * kernel.mk: Remove now unecessary SUPPORTED_KERNEL_VERSIONS * kernel.mk: Fix building rtd1619b (and partial fix for epyc7002) * kernel.mk: Fix epyc7002 and rtd1619b kernel configuration path * synokernel-*: Only remain epyc7002 which does not build yet --- kernel/syno-88f6281-6.2.4/Makefile | 3 +- kernel/syno-aarch64-6.2.4/Makefile | 1 + kernel/syno-aarch64-7.1/Makefile | 10 ++ kernel/syno-aarch64-7.1/digests | 3 + kernel/syno-aarch64-7.2/Makefile | 10 ++ kernel/syno-aarch64-7.2/digests | 3 + kernel/syno-alpine-6.2.4/Makefile | 1 + kernel/syno-alpine-7.1/Makefile | 8 ++ kernel/syno-alpine-7.1/digests | 3 + ...duplicate-YYLTYPE-yylloc-declaration.patch | 11 ++ kernel/syno-alpine-7.2/Makefile | 8 ++ kernel/syno-alpine-7.2/digests | 3 + ...duplicate-YYLTYPE-yylloc-declaration.patch | 11 ++ kernel/syno-alpine4k-6.2.4/Makefile | 1 + kernel/syno-alpine4k-7.1/Makefile | 8 ++ kernel/syno-alpine4k-7.1/digests | 3 + ...duplicate-YYLTYPE-yylloc-declaration.patch | 11 ++ kernel/syno-alpine4k-7.2/Makefile | 8 ++ kernel/syno-alpine4k-7.2/digests | 3 + ...duplicate-YYLTYPE-yylloc-declaration.patch | 11 ++ kernel/syno-apollolake-6.2.4/Makefile | 1 + kernel/syno-apollolake-7.1/Makefile | 8 ++ kernel/syno-apollolake-7.1/digests | 3 + kernel/syno-apollolake-7.2/Makefile | 8 ++ kernel/syno-apollolake-7.2/digests | 3 + kernel/syno-armada370-6.2.4/Makefile | 1 + kernel/syno-armada370-7.1/Makefile | 8 ++ kernel/syno-armada370-7.1/digests | 3 + kernel/syno-armada375-6.2.4/Makefile | 1 + kernel/syno-armada375-7.1/Makefile | 14 ++ kernel/syno-armada375-7.1/digests | 3 + kernel/syno-armada37xx-6.2.4/Makefile | 1 + kernel/syno-armada37xx-7.1/Makefile | 8 ++ kernel/syno-armada37xx-7.1/digests | 3 + ...duplicate-YYLTYPE-yylloc-declaration.patch | 11 ++ kernel/syno-armada37xx-7.2/Makefile | 8 ++ kernel/syno-armada37xx-7.2/digests | 3 + kernel/syno-armada38x-6.2.4/Makefile | 1 + kernel/syno-armada38x-7.1/Makefile | 8 ++ kernel/syno-armada38x-7.1/digests | 3 + ...duplicate-YYLTYPE-yylloc-declaration.patch | 11 ++ kernel/syno-armada38x-7.2/Makefile | 8 ++ kernel/syno-armada38x-7.2/digests | 3 + ...duplicate-YYLTYPE-yylloc-declaration.patch | 11 ++ kernel/syno-armadaxp-6.2.4/Makefile | 1 + kernel/syno-armadaxp-7.1/Makefile | 8 ++ kernel/syno-armadaxp-7.1/digests | 3 + kernel/syno-armv7-6.2.4/Makefile | 1 + kernel/syno-armv7-7.1/Makefile | 10 ++ kernel/syno-armv7-7.1/digests | 3 + kernel/syno-armv7-7.2/Makefile | 10 ++ kernel/syno-armv7-7.2/digests | 3 + kernel/syno-avoton-6.2.4/Makefile | 1 + kernel/syno-avoton-7.1/Makefile | 8 ++ kernel/syno-avoton-7.1/digests | 3 + ...1-define-per_cpu_load_addr-as-static.patch | 21 +++ kernel/syno-avoton-7.2/Makefile | 8 ++ kernel/syno-avoton-7.2/digests | 3 + ...1-define-per_cpu_load_addr-as-static.patch | 21 +++ kernel/syno-braswell-6.2.4/Makefile | 1 + kernel/syno-braswell-7.1/Makefile | 8 ++ kernel/syno-braswell-7.1/digests | 3 + ...1-define-per_cpu_load_addr-as-static.patch | 21 +++ kernel/syno-braswell-7.2/Makefile | 8 ++ kernel/syno-braswell-7.2/digests | 3 + ...1-define-per_cpu_load_addr-as-static.patch | 21 +++ kernel/syno-broadwell-6.2.4/Makefile | 1 + kernel/syno-broadwell-7.1/Makefile | 8 ++ kernel/syno-broadwell-7.1/digests | 3 + kernel/syno-broadwell-7.2/Makefile | 8 ++ kernel/syno-broadwell-7.2/digests | 3 + kernel/syno-broadwellnk-6.2.4/Makefile | 1 + kernel/syno-broadwellnk-7.1/Makefile | 8 ++ kernel/syno-broadwellnk-7.1/digests | 3 + kernel/syno-broadwellnk-7.2/Makefile | 8 ++ kernel/syno-broadwellnk-7.2/digests | 3 + kernel/syno-broadwellnkv2-7.1/Makefile | 8 ++ kernel/syno-broadwellnkv2-7.1/digests | 3 + ...duplicate-YYLTYPE-yylloc-declaration.patch | 11 ++ kernel/syno-broadwellnkv2-7.2/Makefile | 8 ++ kernel/syno-broadwellnkv2-7.2/digests | 3 + kernel/syno-broadwellntbap-7.1/Makefile | 8 ++ kernel/syno-broadwellntbap-7.1/digests | 3 + kernel/syno-broadwellntbap-7.2/Makefile | 8 ++ kernel/syno-broadwellntbap-7.2/digests | 3 + kernel/syno-bromolow-6.2.4/Makefile | 1 + kernel/syno-bromolow-7.1/Makefile | 8 ++ kernel/syno-bromolow-7.1/digests | 3 + ...1-define-per_cpu_load_addr-as-static.patch | 21 +++ kernel/syno-bromolow-7.2/Makefile | 8 ++ kernel/syno-bromolow-7.2/digests | 3 + ...1-define-per_cpu_load_addr-as-static.patch | 21 +++ kernel/syno-cedarview-6.2.4/Makefile | 1 + kernel/syno-cedarview-7.1/Makefile | 8 ++ kernel/syno-cedarview-7.1/digests | 3 + ...1-define-per_cpu_load_addr-as-static.patch | 21 +++ kernel/syno-comcerto2k-6.2.4/Makefile | 1 + kernel/syno-comcerto2k-7.1/Makefile | 8 ++ kernel/syno-comcerto2k-7.1/digests | 3 + kernel/syno-denverton-6.2.4/Makefile | 1 + kernel/syno-denverton-7.1/Makefile | 8 ++ kernel/syno-denverton-7.1/digests | 3 + kernel/syno-denverton-7.2/Makefile | 8 ++ kernel/syno-denverton-7.2/digests | 3 + kernel/syno-epyc7002-7.1/Makefile | 9 ++ kernel/syno-epyc7002-7.1/digests | 3 + kernel/syno-epyc7002-7.2/Makefile | 9 ++ kernel/syno-epyc7002-7.2/digests | 3 + kernel/syno-evansport-6.2.4/Makefile | 1 + kernel/syno-evansport-7.1/Makefile | 8 ++ kernel/syno-evansport-7.1/digests | 3 + kernel/syno-geminilake-6.2.4/Makefile | 1 + kernel/syno-geminilake-7.1/Makefile | 8 ++ kernel/syno-geminilake-7.1/digests | 3 + ...duplicate-YYLTYPE-yylloc-declaration.patch | 11 ++ kernel/syno-geminilake-7.2/Makefile | 8 ++ kernel/syno-geminilake-7.2/digests | 3 + kernel/syno-grantley-6.2.4/Makefile | 1 + kernel/syno-grantley-7.1/Makefile | 8 ++ kernel/syno-grantley-7.1/digests | 3 + ...1-define-per_cpu_load_addr-as-static.patch | 21 +++ kernel/syno-grantley-7.2/Makefile | 8 ++ kernel/syno-grantley-7.2/digests | 3 + ...1-define-per_cpu_load_addr-as-static.patch | 21 +++ kernel/syno-hi3535-6.2.4/Makefile | 1 + kernel/syno-kvmx64-6.2.4/Makefile | 1 + kernel/syno-kvmx64-7.1/Makefile | 8 ++ kernel/syno-kvmx64-7.1/digests | 3 + kernel/syno-kvmx64-7.2/Makefile | 8 ++ kernel/syno-kvmx64-7.2/digests | 3 + kernel/syno-monaco-6.2.4/Makefile | 1 + kernel/syno-monaco-7.1/Makefile | 8 ++ kernel/syno-monaco-7.1/digests | 3 + ...duplicate-YYLTYPE-yylloc-declaration.patch | 11 ++ kernel/syno-monaco-7.2/Makefile | 8 ++ kernel/syno-monaco-7.2/digests | 3 + ...duplicate-YYLTYPE-yylloc-declaration.patch | 11 ++ kernel/syno-purley-6.2.4/Makefile | 1 + kernel/syno-purley-7.1/Makefile | 8 ++ kernel/syno-purley-7.1/digests | 3 + ...duplicate-YYLTYPE-yylloc-declaration.patch | 11 ++ kernel/syno-purley-7.2/Makefile | 8 ++ kernel/syno-purley-7.2/digests | 3 + kernel/syno-qoriq-6.2.4/Makefile | 1 + kernel/syno-r1000-7.1/Makefile | 8 ++ kernel/syno-r1000-7.1/digests | 3 + ...duplicate-YYLTYPE-yylloc-declaration.patch | 11 ++ kernel/syno-r1000-7.2/Makefile | 8 ++ kernel/syno-r1000-7.2/digests | 3 + kernel/syno-rtd1296-6.2.4/Makefile | 1 + kernel/syno-rtd1296-7.1/Makefile | 8 ++ kernel/syno-rtd1296-7.1/digests | 3 + ...duplicate-YYLTYPE-yylloc-declaration.patch | 11 ++ kernel/syno-rtd1296-7.2/Makefile | 8 ++ kernel/syno-rtd1296-7.2/digests | 3 + kernel/syno-rtd1619b-7.1/Makefile | 9 ++ kernel/syno-rtd1619b-7.1/digests | 3 + kernel/syno-rtd1619b-7.2/Makefile | 9 ++ kernel/syno-rtd1619b-7.2/digests | 3 + kernel/syno-v1000-6.2.4/Makefile | 1 + kernel/syno-v1000-7.1/Makefile | 8 ++ kernel/syno-v1000-7.1/digests | 3 + ...duplicate-YYLTYPE-yylloc-declaration.patch | 11 ++ kernel/syno-v1000-7.2/Makefile | 8 ++ kernel/syno-v1000-7.2/digests | 3 + kernel/syno-x64-6.2.4/Makefile | 1 + kernel/syno-x86-6.2.4/Makefile | 3 +- mk/spksrc.common-rules.mk | 2 +- mk/spksrc.common.mk | 1 - mk/spksrc.cross-env.mk | 22 +-- mk/spksrc.cross-kernel-configure.mk | 6 +- mk/spksrc.cross-kernel.mk | 83 ----------- mk/spksrc.depend.mk | 20 +-- mk/spksrc.dependency-tree.mk | 6 +- mk/spksrc.kernel-env.mk | 27 ++++ ...kernel-flags.mk => spksrc.kernel-flags.mk} | 6 +- mk/spksrc.kernel-modules.mk | 27 ++++ mk/spksrc.kernel-required.mk | 23 ++++ mk/spksrc.kernel.mk | 129 ++++++++++++------ mk/spksrc.spk.mk | 1 + mk/spksrc.supported.mk | 4 - mk/spksrc.test-rules.mk | 1 - spk/synokernel-cdrom/Makefile | 8 +- spk/synokernel-usbserial/Makefile | 8 +- 184 files changed, 1226 insertions(+), 171 deletions(-) create mode 100644 kernel/syno-aarch64-7.1/Makefile create mode 100644 kernel/syno-aarch64-7.1/digests create mode 100644 kernel/syno-aarch64-7.2/Makefile create mode 100644 kernel/syno-aarch64-7.2/digests create mode 100644 kernel/syno-alpine-7.1/Makefile create mode 100644 kernel/syno-alpine-7.1/digests create mode 100644 kernel/syno-alpine-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch create mode 100644 kernel/syno-alpine-7.2/Makefile create mode 100644 kernel/syno-alpine-7.2/digests create mode 100644 kernel/syno-alpine-7.2/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch create mode 100644 kernel/syno-alpine4k-7.1/Makefile create mode 100644 kernel/syno-alpine4k-7.1/digests create mode 100644 kernel/syno-alpine4k-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch create mode 100644 kernel/syno-alpine4k-7.2/Makefile create mode 100644 kernel/syno-alpine4k-7.2/digests create mode 100644 kernel/syno-alpine4k-7.2/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch create mode 100644 kernel/syno-apollolake-7.1/Makefile create mode 100644 kernel/syno-apollolake-7.1/digests create mode 100644 kernel/syno-apollolake-7.2/Makefile create mode 100644 kernel/syno-apollolake-7.2/digests create mode 100644 kernel/syno-armada370-7.1/Makefile create mode 100644 kernel/syno-armada370-7.1/digests create mode 100644 kernel/syno-armada375-7.1/Makefile create mode 100644 kernel/syno-armada375-7.1/digests create mode 100644 kernel/syno-armada37xx-7.1/Makefile create mode 100644 kernel/syno-armada37xx-7.1/digests create mode 100644 kernel/syno-armada37xx-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch create mode 100644 kernel/syno-armada37xx-7.2/Makefile create mode 100644 kernel/syno-armada37xx-7.2/digests create mode 100644 kernel/syno-armada38x-7.1/Makefile create mode 100644 kernel/syno-armada38x-7.1/digests create mode 100644 kernel/syno-armada38x-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch create mode 100644 kernel/syno-armada38x-7.2/Makefile create mode 100644 kernel/syno-armada38x-7.2/digests create mode 100644 kernel/syno-armada38x-7.2/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch create mode 100644 kernel/syno-armadaxp-7.1/Makefile create mode 100644 kernel/syno-armadaxp-7.1/digests create mode 100644 kernel/syno-armv7-7.1/Makefile create mode 100644 kernel/syno-armv7-7.1/digests create mode 100644 kernel/syno-armv7-7.2/Makefile create mode 100644 kernel/syno-armv7-7.2/digests create mode 100644 kernel/syno-avoton-7.1/Makefile create mode 100644 kernel/syno-avoton-7.1/digests create mode 100644 kernel/syno-avoton-7.1/patches/001-define-per_cpu_load_addr-as-static.patch create mode 100644 kernel/syno-avoton-7.2/Makefile create mode 100644 kernel/syno-avoton-7.2/digests create mode 100644 kernel/syno-avoton-7.2/patches/001-define-per_cpu_load_addr-as-static.patch create mode 100644 kernel/syno-braswell-7.1/Makefile create mode 100644 kernel/syno-braswell-7.1/digests create mode 100644 kernel/syno-braswell-7.1/patches/001-define-per_cpu_load_addr-as-static.patch create mode 100644 kernel/syno-braswell-7.2/Makefile create mode 100644 kernel/syno-braswell-7.2/digests create mode 100644 kernel/syno-braswell-7.2/patches/001-define-per_cpu_load_addr-as-static.patch create mode 100644 kernel/syno-broadwell-7.1/Makefile create mode 100644 kernel/syno-broadwell-7.1/digests create mode 100644 kernel/syno-broadwell-7.2/Makefile create mode 100644 kernel/syno-broadwell-7.2/digests create mode 100644 kernel/syno-broadwellnk-7.1/Makefile create mode 100644 kernel/syno-broadwellnk-7.1/digests create mode 100644 kernel/syno-broadwellnk-7.2/Makefile create mode 100644 kernel/syno-broadwellnk-7.2/digests create mode 100644 kernel/syno-broadwellnkv2-7.1/Makefile create mode 100644 kernel/syno-broadwellnkv2-7.1/digests create mode 100644 kernel/syno-broadwellnkv2-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch create mode 100644 kernel/syno-broadwellnkv2-7.2/Makefile create mode 100644 kernel/syno-broadwellnkv2-7.2/digests create mode 100644 kernel/syno-broadwellntbap-7.1/Makefile create mode 100644 kernel/syno-broadwellntbap-7.1/digests create mode 100644 kernel/syno-broadwellntbap-7.2/Makefile create mode 100644 kernel/syno-broadwellntbap-7.2/digests create mode 100644 kernel/syno-bromolow-7.1/Makefile create mode 100644 kernel/syno-bromolow-7.1/digests create mode 100644 kernel/syno-bromolow-7.1/patches/001-define-per_cpu_load_addr-as-static.patch create mode 100644 kernel/syno-bromolow-7.2/Makefile create mode 100644 kernel/syno-bromolow-7.2/digests create mode 100644 kernel/syno-bromolow-7.2/patches/001-define-per_cpu_load_addr-as-static.patch create mode 100644 kernel/syno-cedarview-7.1/Makefile create mode 100644 kernel/syno-cedarview-7.1/digests create mode 100644 kernel/syno-cedarview-7.1/patches/001-define-per_cpu_load_addr-as-static.patch create mode 100644 kernel/syno-comcerto2k-7.1/Makefile create mode 100644 kernel/syno-comcerto2k-7.1/digests create mode 100644 kernel/syno-denverton-7.1/Makefile create mode 100644 kernel/syno-denverton-7.1/digests create mode 100644 kernel/syno-denverton-7.2/Makefile create mode 100644 kernel/syno-denverton-7.2/digests create mode 100644 kernel/syno-epyc7002-7.1/Makefile create mode 100644 kernel/syno-epyc7002-7.1/digests create mode 100644 kernel/syno-epyc7002-7.2/Makefile create mode 100644 kernel/syno-epyc7002-7.2/digests create mode 100644 kernel/syno-evansport-7.1/Makefile create mode 100644 kernel/syno-evansport-7.1/digests create mode 100644 kernel/syno-geminilake-7.1/Makefile create mode 100644 kernel/syno-geminilake-7.1/digests create mode 100644 kernel/syno-geminilake-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch create mode 100644 kernel/syno-geminilake-7.2/Makefile create mode 100644 kernel/syno-geminilake-7.2/digests create mode 100644 kernel/syno-grantley-7.1/Makefile create mode 100644 kernel/syno-grantley-7.1/digests create mode 100644 kernel/syno-grantley-7.1/patches/001-define-per_cpu_load_addr-as-static.patch create mode 100644 kernel/syno-grantley-7.2/Makefile create mode 100644 kernel/syno-grantley-7.2/digests create mode 100644 kernel/syno-grantley-7.2/patches/001-define-per_cpu_load_addr-as-static.patch create mode 100644 kernel/syno-kvmx64-7.1/Makefile create mode 100644 kernel/syno-kvmx64-7.1/digests create mode 100644 kernel/syno-kvmx64-7.2/Makefile create mode 100644 kernel/syno-kvmx64-7.2/digests create mode 100644 kernel/syno-monaco-7.1/Makefile create mode 100644 kernel/syno-monaco-7.1/digests create mode 100644 kernel/syno-monaco-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch create mode 100644 kernel/syno-monaco-7.2/Makefile create mode 100644 kernel/syno-monaco-7.2/digests create mode 100644 kernel/syno-monaco-7.2/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch create mode 100644 kernel/syno-purley-7.1/Makefile create mode 100644 kernel/syno-purley-7.1/digests create mode 100644 kernel/syno-purley-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch create mode 100644 kernel/syno-purley-7.2/Makefile create mode 100644 kernel/syno-purley-7.2/digests create mode 100644 kernel/syno-r1000-7.1/Makefile create mode 100644 kernel/syno-r1000-7.1/digests create mode 100644 kernel/syno-r1000-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch create mode 100644 kernel/syno-r1000-7.2/Makefile create mode 100644 kernel/syno-r1000-7.2/digests create mode 100644 kernel/syno-rtd1296-7.1/Makefile create mode 100644 kernel/syno-rtd1296-7.1/digests create mode 100644 kernel/syno-rtd1296-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch create mode 100644 kernel/syno-rtd1296-7.2/Makefile create mode 100644 kernel/syno-rtd1296-7.2/digests create mode 100644 kernel/syno-rtd1619b-7.1/Makefile create mode 100644 kernel/syno-rtd1619b-7.1/digests create mode 100644 kernel/syno-rtd1619b-7.2/Makefile create mode 100644 kernel/syno-rtd1619b-7.2/digests create mode 100644 kernel/syno-v1000-7.1/Makefile create mode 100644 kernel/syno-v1000-7.1/digests create mode 100644 kernel/syno-v1000-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch create mode 100644 kernel/syno-v1000-7.2/Makefile create mode 100644 kernel/syno-v1000-7.2/digests delete mode 100644 mk/spksrc.cross-kernel.mk create mode 100644 mk/spksrc.kernel-env.mk rename mk/{spksrc.cross-kernel-flags.mk => spksrc.kernel-flags.mk} (94%) create mode 100644 mk/spksrc.kernel-modules.mk create mode 100644 mk/spksrc.kernel-required.mk diff --git a/kernel/syno-88f6281-6.2.4/Makefile b/kernel/syno-88f6281-6.2.4/Makefile index a58f399aea1..e131a3b51be 100644 --- a/kernel/syno-88f6281-6.2.4/Makefile +++ b/kernel/syno-88f6281-6.2.4/Makefile @@ -2,7 +2,8 @@ KERNEL_ARCH = 88f6281 KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-2.6.32 -KERNEL_URL_DIR = 6281 KERNEL_BASE_ARCH = arm +KERNEL_URL_DIR = 6281 +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-aarch64-6.2.4/Makefile b/kernel/syno-aarch64-6.2.4/Makefile index edcf99cbcf3..f3f022de9f9 100644 --- a/kernel/syno-aarch64-6.2.4/Makefile +++ b/kernel/syno-aarch64-6.2.4/Makefile @@ -4,6 +4,7 @@ KERNEL_BUILD = 25556 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = arm64 KERNEL_URL_DIR = rtd1296 +KERNEL_URL_VERSION = 6.2 KERNEL_CONFIG = synoconfigs/rtd1296 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-aarch64-7.1/Makefile b/kernel/syno-aarch64-7.1/Makefile new file mode 100644 index 00000000000..04ff6213316 --- /dev/null +++ b/kernel/syno-aarch64-7.1/Makefile @@ -0,0 +1,10 @@ +KERNEL_ARCH = aarch64 +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = arm64 +KERNEL_URL_DIR = rtd1296 +KERNEL_URL_VERSION = 7.1.1 +KERNEL_CONFIG = synoconfigs/rtd1296 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-aarch64-7.1/digests b/kernel/syno-aarch64-7.1/digests new file mode 100644 index 00000000000..5bea384ea09 --- /dev/null +++ b/kernel/syno-aarch64-7.1/digests @@ -0,0 +1,3 @@ +aarch64-linux-4.4.x.txz SHA1 ada941d2c56cfdbd0c42eb9afdcfc2d9febd13b7 +aarch64-linux-4.4.x.txz SHA256 f44392c870892e5c0b88eaddf9796fcbbee1785bcb7b48b8910bc23f91293b2f +aarch64-linux-4.4.x.txz MD5 44f2594e785f9c74d4a6b1ae81e76221 diff --git a/kernel/syno-aarch64-7.2/Makefile b/kernel/syno-aarch64-7.2/Makefile new file mode 100644 index 00000000000..5c9e3d683b4 --- /dev/null +++ b/kernel/syno-aarch64-7.2/Makefile @@ -0,0 +1,10 @@ +KERNEL_ARCH = aarch64 +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = arm64 +KERNEL_URL_DIR = rtd1296 +KERNEL_URL_VERSION = 7.2 +KERNEL_CONFIG = synoconfigs/rtd1296 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-aarch64-7.2/digests b/kernel/syno-aarch64-7.2/digests new file mode 100644 index 00000000000..a90b9d5973b --- /dev/null +++ b/kernel/syno-aarch64-7.2/digests @@ -0,0 +1,3 @@ +aarch64-linux-4.4.x.txz SHA1 35dbb41704e671dfa35e39632c5b1605e856aaab +aarch64-linux-4.4.x.txz SHA256 4c45cdcc1ba3f3403e2a617fe342c0e73bf3d809cdd9260d6b4d6708fa95daa0 +aarch64-linux-4.4.x.txz MD5 4cb3e0f2b19e98699fcc5dfc9ac08d92 diff --git a/kernel/syno-alpine-6.2.4/Makefile b/kernel/syno-alpine-6.2.4/Makefile index f854a2eac9c..616114780ba 100644 --- a/kernel/syno-alpine-6.2.4/Makefile +++ b/kernel/syno-alpine-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-3.10.x-bsp KERNEL_BASE_ARCH = arm +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-alpine-7.1/Makefile b/kernel/syno-alpine-7.1/Makefile new file mode 100644 index 00000000000..7bc6bc5915d --- /dev/null +++ b/kernel/syno-alpine-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = alpine +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-3.10.x-bsp +KERNEL_BASE_ARCH = arm +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-alpine-7.1/digests b/kernel/syno-alpine-7.1/digests new file mode 100644 index 00000000000..87b9960dd87 --- /dev/null +++ b/kernel/syno-alpine-7.1/digests @@ -0,0 +1,3 @@ +alpine-linux-3.10.x-bsp.txz SHA1 337ba847d1b5ba0cb6c61a1c02203acb5b60654c +alpine-linux-3.10.x-bsp.txz SHA256 e74108fe78f59a17980b375d6f5a9f8ec59be91671b9357a161961996e0ad731 +alpine-linux-3.10.x-bsp.txz MD5 66ce0d95a2c3b7348bf842b450af2db7 diff --git a/kernel/syno-alpine-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch b/kernel/syno-alpine-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch new file mode 100644 index 00000000000..836290fac0e --- /dev/null +++ b/kernel/syno-alpine-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch @@ -0,0 +1,11 @@ +--- scripts/dtc/dtc-parser.tab.c_shipped.orig 2021-02-17 07:08:23.000000000 +0000 ++++ scripts/dtc/dtc-parser.tab.c_shipped 2023-05-24 21:48:52.259896446 +0000 +@@ -73,7 +73,7 @@ + #include "dtc.h" + #include "srcpos.h" + +-YYLTYPE yylloc; ++extern YYLTYPE yylloc; + + extern int yylex(void); + extern void print_error(char const *fmt, ...); diff --git a/kernel/syno-alpine-7.2/Makefile b/kernel/syno-alpine-7.2/Makefile new file mode 100644 index 00000000000..12a64f49e8a --- /dev/null +++ b/kernel/syno-alpine-7.2/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = alpine +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-3.10.x-bsp +KERNEL_BASE_ARCH = arm +KERNEL_URL_VERSION = 7.2 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-alpine-7.2/digests b/kernel/syno-alpine-7.2/digests new file mode 100644 index 00000000000..a60d78ba01a --- /dev/null +++ b/kernel/syno-alpine-7.2/digests @@ -0,0 +1,3 @@ +alpine-linux-3.10.x-bsp.txz SHA1 df7b890273b6c719592d106472982e3d4b1941f2 +alpine-linux-3.10.x-bsp.txz SHA256 68d9bcfa12336c4d09819172c3368689b9b8b5e54da414f9365da3b1b32ac8fd +alpine-linux-3.10.x-bsp.txz MD5 d9eb200404618a307af671b26c90e5d1 diff --git a/kernel/syno-alpine-7.2/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch b/kernel/syno-alpine-7.2/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch new file mode 100644 index 00000000000..836290fac0e --- /dev/null +++ b/kernel/syno-alpine-7.2/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch @@ -0,0 +1,11 @@ +--- scripts/dtc/dtc-parser.tab.c_shipped.orig 2021-02-17 07:08:23.000000000 +0000 ++++ scripts/dtc/dtc-parser.tab.c_shipped 2023-05-24 21:48:52.259896446 +0000 +@@ -73,7 +73,7 @@ + #include "dtc.h" + #include "srcpos.h" + +-YYLTYPE yylloc; ++extern YYLTYPE yylloc; + + extern int yylex(void); + extern void print_error(char const *fmt, ...); diff --git a/kernel/syno-alpine4k-6.2.4/Makefile b/kernel/syno-alpine4k-6.2.4/Makefile index cdff1e9ca5b..425d7c719be 100644 --- a/kernel/syno-alpine4k-6.2.4/Makefile +++ b/kernel/syno-alpine4k-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-3.10.x-bsp KERNEL_BASE_ARCH = arm +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-alpine4k-7.1/Makefile b/kernel/syno-alpine4k-7.1/Makefile new file mode 100644 index 00000000000..a34e76e7fc0 --- /dev/null +++ b/kernel/syno-alpine4k-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = alpine4k +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-3.10.x-bsp +KERNEL_BASE_ARCH = arm +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-alpine4k-7.1/digests b/kernel/syno-alpine4k-7.1/digests new file mode 100644 index 00000000000..4e335370eb1 --- /dev/null +++ b/kernel/syno-alpine4k-7.1/digests @@ -0,0 +1,3 @@ +alpine4k-linux-3.10.x-bsp.txz SHA1 f08ad4cd82c70b17c93f534cf0ce229b8a4a67a7 +alpine4k-linux-3.10.x-bsp.txz SHA256 db18a5f2ab2ece921d701097488c88bf6f8be21faa9c8ae3d7bbe6aba9c6787d +alpine4k-linux-3.10.x-bsp.txz MD5 26164d94c72f6f12fdd0e786a7817c79 diff --git a/kernel/syno-alpine4k-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch b/kernel/syno-alpine4k-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch new file mode 100644 index 00000000000..836290fac0e --- /dev/null +++ b/kernel/syno-alpine4k-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch @@ -0,0 +1,11 @@ +--- scripts/dtc/dtc-parser.tab.c_shipped.orig 2021-02-17 07:08:23.000000000 +0000 ++++ scripts/dtc/dtc-parser.tab.c_shipped 2023-05-24 21:48:52.259896446 +0000 +@@ -73,7 +73,7 @@ + #include "dtc.h" + #include "srcpos.h" + +-YYLTYPE yylloc; ++extern YYLTYPE yylloc; + + extern int yylex(void); + extern void print_error(char const *fmt, ...); diff --git a/kernel/syno-alpine4k-7.2/Makefile b/kernel/syno-alpine4k-7.2/Makefile new file mode 100644 index 00000000000..1ea6a0770b8 --- /dev/null +++ b/kernel/syno-alpine4k-7.2/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = alpine4k +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-3.10.x-bsp +KERNEL_BASE_ARCH = arm +KERNEL_URL_VERSION = 7.2 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-alpine4k-7.2/digests b/kernel/syno-alpine4k-7.2/digests new file mode 100644 index 00000000000..be804d0cdd4 --- /dev/null +++ b/kernel/syno-alpine4k-7.2/digests @@ -0,0 +1,3 @@ +alpine4k-linux-3.10.x-bsp.txz SHA1 265b82b618d539118d56677f176b9fcf02d10ad4 +alpine4k-linux-3.10.x-bsp.txz SHA256 163aa73f0f619501e6b72847dedacafd18642d4ba8d084e64d3e22b4dcb10f30 +alpine4k-linux-3.10.x-bsp.txz MD5 ce8e712bbf84b22245f0d51e803c55e7 diff --git a/kernel/syno-alpine4k-7.2/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch b/kernel/syno-alpine4k-7.2/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch new file mode 100644 index 00000000000..836290fac0e --- /dev/null +++ b/kernel/syno-alpine4k-7.2/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch @@ -0,0 +1,11 @@ +--- scripts/dtc/dtc-parser.tab.c_shipped.orig 2021-02-17 07:08:23.000000000 +0000 ++++ scripts/dtc/dtc-parser.tab.c_shipped 2023-05-24 21:48:52.259896446 +0000 +@@ -73,7 +73,7 @@ + #include "dtc.h" + #include "srcpos.h" + +-YYLTYPE yylloc; ++extern YYLTYPE yylloc; + + extern int yylex(void); + extern void print_error(char const *fmt, ...); diff --git a/kernel/syno-apollolake-6.2.4/Makefile b/kernel/syno-apollolake-6.2.4/Makefile index 4728c8642fc..e8fed291de6 100644 --- a/kernel/syno-apollolake-6.2.4/Makefile +++ b/kernel/syno-apollolake-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-apollolake-7.1/Makefile b/kernel/syno-apollolake-7.1/Makefile new file mode 100644 index 00000000000..780eb1dfbac --- /dev/null +++ b/kernel/syno-apollolake-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = apollolake +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-apollolake-7.1/digests b/kernel/syno-apollolake-7.1/digests new file mode 100644 index 00000000000..b20a2451a64 --- /dev/null +++ b/kernel/syno-apollolake-7.1/digests @@ -0,0 +1,3 @@ +apollolake-linux-4.4.x.txz SHA1 d96b5177046524ce04235371a6fc2dfbea54ae89 +apollolake-linux-4.4.x.txz SHA256 1946f1438acd220dc3e18cc593ecfd5cf416378231506fd321228286f6892d7d +apollolake-linux-4.4.x.txz MD5 d57c469f8c68fc1c12ff29fe910cc263 diff --git a/kernel/syno-apollolake-7.2/Makefile b/kernel/syno-apollolake-7.2/Makefile new file mode 100644 index 00000000000..7cc36e669df --- /dev/null +++ b/kernel/syno-apollolake-7.2/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = apollolake +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.2 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-apollolake-7.2/digests b/kernel/syno-apollolake-7.2/digests new file mode 100644 index 00000000000..cdb93a93799 --- /dev/null +++ b/kernel/syno-apollolake-7.2/digests @@ -0,0 +1,3 @@ +apollolake-linux-4.4.x.txz SHA1 f81fe86806eef8ce5e49095101830fee7e3e3e3a +apollolake-linux-4.4.x.txz SHA256 724518519fe79882c33b683b9ed35e29f3339c628a03bdc58dfa8c149c6b2112 +apollolake-linux-4.4.x.txz MD5 8e60e8e5810180ec920a6aeca0fb4a21 diff --git a/kernel/syno-armada370-6.2.4/Makefile b/kernel/syno-armada370-6.2.4/Makefile index c15b75f3f1c..f3bec62d8a5 100644 --- a/kernel/syno-armada370-6.2.4/Makefile +++ b/kernel/syno-armada370-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-3.x KERNEL_BASE_ARCH = arm +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-armada370-7.1/Makefile b/kernel/syno-armada370-7.1/Makefile new file mode 100644 index 00000000000..4071922bc9e --- /dev/null +++ b/kernel/syno-armada370-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = armada370 +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-3.x +KERNEL_BASE_ARCH = arm +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-armada370-7.1/digests b/kernel/syno-armada370-7.1/digests new file mode 100644 index 00000000000..388f43c49a1 --- /dev/null +++ b/kernel/syno-armada370-7.1/digests @@ -0,0 +1,3 @@ +armada370-linux-3.x.txz SHA1 a7dc200ec005459f1253f9ec5c1234b1de85028c +armada370-linux-3.x.txz SHA256 d0d62b5544330e5b5c340326280060d6819f3417c5a6edc830fa0f2b0b7c111d +armada370-linux-3.x.txz MD5 a0686ccb76bc25bfbf45f17941e62369 diff --git a/kernel/syno-armada375-6.2.4/Makefile b/kernel/syno-armada375-6.2.4/Makefile index 01c946fc828..668c1e8d456 100644 --- a/kernel/syno-armada375-6.2.4/Makefile +++ b/kernel/syno-armada375-6.2.4/Makefile @@ -3,6 +3,7 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-3.x KERNEL_BASE_ARCH = arm +KERNEL_URL_VERSION = 6.2 PRE_COMPILE_TARGET = kernel_platv2_pre_compile include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-armada375-7.1/Makefile b/kernel/syno-armada375-7.1/Makefile new file mode 100644 index 00000000000..2b183a6059b --- /dev/null +++ b/kernel/syno-armada375-7.1/Makefile @@ -0,0 +1,14 @@ +KERNEL_ARCH = armada375 +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-3.x +KERNEL_BASE_ARCH = arm +KERNEL_URL_VERSION = 7.1.1 + +PRE_COMPILE_TARGET = kernel_platv2_pre_compile + +include ../../mk/spksrc.kernel.mk + +PHONY: kernel_platv2_pre_compile +kernel_platv2_pre_compile: + cd $(KERNEL_DIR)/arch/arm/ && rm -rf plat-armada && ln -s plat-armada-v2 plat-armada diff --git a/kernel/syno-armada375-7.1/digests b/kernel/syno-armada375-7.1/digests new file mode 100644 index 00000000000..31c132f7531 --- /dev/null +++ b/kernel/syno-armada375-7.1/digests @@ -0,0 +1,3 @@ +armada375-linux-3.x.txz SHA1 3a3274f7ace5356ebd58624fe43462733cf93b18 +armada375-linux-3.x.txz SHA256 a6013db9f870bb30795deac50b98ba9781cb1f8cdd3e25ccfb9bfc904be24707 +armada375-linux-3.x.txz MD5 a72bffc29f7cd280f6375b27bbeda275 diff --git a/kernel/syno-armada37xx-6.2.4/Makefile b/kernel/syno-armada37xx-6.2.4/Makefile index 84ae336f716..66b29455b1f 100644 --- a/kernel/syno-armada37xx-6.2.4/Makefile +++ b/kernel/syno-armada37xx-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = arm64 +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-armada37xx-7.1/Makefile b/kernel/syno-armada37xx-7.1/Makefile new file mode 100644 index 00000000000..679994f96fe --- /dev/null +++ b/kernel/syno-armada37xx-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = armada37xx +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = arm64 +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-armada37xx-7.1/digests b/kernel/syno-armada37xx-7.1/digests new file mode 100644 index 00000000000..d5a9ca0d011 --- /dev/null +++ b/kernel/syno-armada37xx-7.1/digests @@ -0,0 +1,3 @@ +armada37xx-linux-4.4.x.txz SHA1 23281f6254a07930088a0e1413813f55a45c0bd5 +armada37xx-linux-4.4.x.txz SHA256 7e95a7fb554721fe38bdba13c669970176b6f71958ac490c0c0da146fc811062 +armada37xx-linux-4.4.x.txz MD5 5d65fd0a710ac92835ac7b884aad66d9 diff --git a/kernel/syno-armada37xx-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch b/kernel/syno-armada37xx-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch new file mode 100644 index 00000000000..ed716296065 --- /dev/null +++ b/kernel/syno-armada37xx-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch @@ -0,0 +1,11 @@ +--- scripts/dtc/dtc-parser.tab.c_shipped.orig 2021-02-17 07:10:09.000000000 +0000 ++++ scripts/dtc/dtc-parser.tab.c_shipped 2023-05-23 23:22:41.400125887 +0000 +@@ -1196,7 +1196,7 @@ int yychar; + /* The semantic value of the lookahead symbol. */ + YYSTYPE yylval; + /* Location data for the lookahead symbol. */ +-YYLTYPE yylloc ++//YYLTYPE yylloc + # if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL + = { 1, 1, 1, 1 } + # endif diff --git a/kernel/syno-armada37xx-7.2/Makefile b/kernel/syno-armada37xx-7.2/Makefile new file mode 100644 index 00000000000..aac35d5ece4 --- /dev/null +++ b/kernel/syno-armada37xx-7.2/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = armada37xx +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = arm64 +KERNEL_URL_VERSION = 7.2 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-armada37xx-7.2/digests b/kernel/syno-armada37xx-7.2/digests new file mode 100644 index 00000000000..ad43d5f599a --- /dev/null +++ b/kernel/syno-armada37xx-7.2/digests @@ -0,0 +1,3 @@ +armada37xx-linux-4.4.x.txz SHA1 75d8c3cbb34acbe93b0a569e98bc66a08f61e046 +armada37xx-linux-4.4.x.txz SHA256 8f9d3378b7e519d356b4b794dbeb6418be75de2e8a0ec96387ff122dd3e55342 +armada37xx-linux-4.4.x.txz MD5 ea6e6516bc96adccdb1634dce57311be diff --git a/kernel/syno-armada38x-6.2.4/Makefile b/kernel/syno-armada38x-6.2.4/Makefile index 483e780d3b2..9bc04263b21 100644 --- a/kernel/syno-armada38x-6.2.4/Makefile +++ b/kernel/syno-armada38x-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-3.10.x-bsp KERNEL_BASE_ARCH = arm +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-armada38x-7.1/Makefile b/kernel/syno-armada38x-7.1/Makefile new file mode 100644 index 00000000000..c62f8551260 --- /dev/null +++ b/kernel/syno-armada38x-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = armada38x +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-3.10.x-bsp +KERNEL_BASE_ARCH = arm +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-armada38x-7.1/digests b/kernel/syno-armada38x-7.1/digests new file mode 100644 index 00000000000..d7c05e792a7 --- /dev/null +++ b/kernel/syno-armada38x-7.1/digests @@ -0,0 +1,3 @@ +armada38x-linux-3.10.x-bsp.txz SHA1 cf58c8d663ad0c1e7438a6ead820afc17d1e82e7 +armada38x-linux-3.10.x-bsp.txz SHA256 1f96fd357f18b4974a6585b035e21a5b698355b8a60d9e042b079a16fb909921 +armada38x-linux-3.10.x-bsp.txz MD5 1f24005049e9e15327f0a6b866750abd diff --git a/kernel/syno-armada38x-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch b/kernel/syno-armada38x-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch new file mode 100644 index 00000000000..836290fac0e --- /dev/null +++ b/kernel/syno-armada38x-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch @@ -0,0 +1,11 @@ +--- scripts/dtc/dtc-parser.tab.c_shipped.orig 2021-02-17 07:08:23.000000000 +0000 ++++ scripts/dtc/dtc-parser.tab.c_shipped 2023-05-24 21:48:52.259896446 +0000 +@@ -73,7 +73,7 @@ + #include "dtc.h" + #include "srcpos.h" + +-YYLTYPE yylloc; ++extern YYLTYPE yylloc; + + extern int yylex(void); + extern void print_error(char const *fmt, ...); diff --git a/kernel/syno-armada38x-7.2/Makefile b/kernel/syno-armada38x-7.2/Makefile new file mode 100644 index 00000000000..6b7365815bd --- /dev/null +++ b/kernel/syno-armada38x-7.2/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = armada38x +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-3.10.x-bsp +KERNEL_BASE_ARCH = arm +KERNEL_URL_VERSION = 7.2 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-armada38x-7.2/digests b/kernel/syno-armada38x-7.2/digests new file mode 100644 index 00000000000..147c0a26225 --- /dev/null +++ b/kernel/syno-armada38x-7.2/digests @@ -0,0 +1,3 @@ +armada38x-linux-3.10.x-bsp.txz SHA1 2644f87a67d05e7c06ca867748778b4b28b26755 +armada38x-linux-3.10.x-bsp.txz SHA256 9f5f70014309d5051dceb7a43c767a7b126ca461ef4f8d54444aab63a04dd482 +armada38x-linux-3.10.x-bsp.txz MD5 76cc946d696d51ba3904d01240e2e9a9 diff --git a/kernel/syno-armada38x-7.2/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch b/kernel/syno-armada38x-7.2/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch new file mode 100644 index 00000000000..836290fac0e --- /dev/null +++ b/kernel/syno-armada38x-7.2/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch @@ -0,0 +1,11 @@ +--- scripts/dtc/dtc-parser.tab.c_shipped.orig 2021-02-17 07:08:23.000000000 +0000 ++++ scripts/dtc/dtc-parser.tab.c_shipped 2023-05-24 21:48:52.259896446 +0000 +@@ -73,7 +73,7 @@ + #include "dtc.h" + #include "srcpos.h" + +-YYLTYPE yylloc; ++extern YYLTYPE yylloc; + + extern int yylex(void); + extern void print_error(char const *fmt, ...); diff --git a/kernel/syno-armadaxp-6.2.4/Makefile b/kernel/syno-armadaxp-6.2.4/Makefile index da5f3ee265a..88f8905aa8b 100644 --- a/kernel/syno-armadaxp-6.2.4/Makefile +++ b/kernel/syno-armadaxp-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-3.x KERNEL_BASE_ARCH = arm +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-armadaxp-7.1/Makefile b/kernel/syno-armadaxp-7.1/Makefile new file mode 100644 index 00000000000..de422bada5c --- /dev/null +++ b/kernel/syno-armadaxp-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = armadaxp +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-3.x +KERNEL_BASE_ARCH = arm +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-armadaxp-7.1/digests b/kernel/syno-armadaxp-7.1/digests new file mode 100644 index 00000000000..71ff8d3d5cb --- /dev/null +++ b/kernel/syno-armadaxp-7.1/digests @@ -0,0 +1,3 @@ +armadaxp-linux-3.x.txz SHA1 6663e75ece88fe23540e936fbc222ca74222c637 +armadaxp-linux-3.x.txz SHA256 08ebfedc0fd33e8330e03cae97b571342e1e2c5234bdc8a295ccff1b1e6e30f1 +armadaxp-linux-3.x.txz MD5 8dd82e925de1e5ee74b8afc4068af58c diff --git a/kernel/syno-armv7-6.2.4/Makefile b/kernel/syno-armv7-6.2.4/Makefile index 8f6f3995291..843c78fc149 100644 --- a/kernel/syno-armv7-6.2.4/Makefile +++ b/kernel/syno-armv7-6.2.4/Makefile @@ -4,6 +4,7 @@ KERNEL_BUILD = 25556 KERNEL_DIST = linux-3.10.x-bsp KERNEL_BASE_ARCH = arm KERNEL_URL_DIR = armada38x +KERNEL_URL_VERSION = 6.2 KERNEL_CONFIG = synoconfigs/armada38x include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-armv7-7.1/Makefile b/kernel/syno-armv7-7.1/Makefile new file mode 100644 index 00000000000..148888c4e75 --- /dev/null +++ b/kernel/syno-armv7-7.1/Makefile @@ -0,0 +1,10 @@ +KERNEL_ARCH = armv7 +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-3.10.x-bsp +KERNEL_BASE_ARCH = arm +KERNEL_URL_DIR = armada38x +KERNEL_URL_VERSION = 7.1.1 +KERNEL_CONFIG = synoconfigs/armada38x + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-armv7-7.1/digests b/kernel/syno-armv7-7.1/digests new file mode 100644 index 00000000000..8883be29f86 --- /dev/null +++ b/kernel/syno-armv7-7.1/digests @@ -0,0 +1,3 @@ +armv7-linux-3.10.x-bsp.txz SHA1 cf58c8d663ad0c1e7438a6ead820afc17d1e82e7 +armv7-linux-3.10.x-bsp.txz SHA256 1f96fd357f18b4974a6585b035e21a5b698355b8a60d9e042b079a16fb909921 +armv7-linux-3.10.x-bsp.txz MD5 1f24005049e9e15327f0a6b866750abd diff --git a/kernel/syno-armv7-7.2/Makefile b/kernel/syno-armv7-7.2/Makefile new file mode 100644 index 00000000000..39e104120c5 --- /dev/null +++ b/kernel/syno-armv7-7.2/Makefile @@ -0,0 +1,10 @@ +KERNEL_ARCH = armv7 +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-3.10.x-bsp +KERNEL_BASE_ARCH = arm +KERNEL_URL_DIR = armada38x +KERNEL_URL_VERSION = 7.2 +KERNEL_CONFIG = synoconfigs/armada38x + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-armv7-7.2/digests b/kernel/syno-armv7-7.2/digests new file mode 100644 index 00000000000..f4d87b840b4 --- /dev/null +++ b/kernel/syno-armv7-7.2/digests @@ -0,0 +1,3 @@ +armv7-linux-3.10.x-bsp.txz SHA1 2644f87a67d05e7c06ca867748778b4b28b26755 +armv7-linux-3.10.x-bsp.txz SHA256 9f5f70014309d5051dceb7a43c767a7b126ca461ef4f8d54444aab63a04dd482 +armv7-linux-3.10.x-bsp.txz MD5 76cc946d696d51ba3904d01240e2e9a9 diff --git a/kernel/syno-avoton-6.2.4/Makefile b/kernel/syno-avoton-6.2.4/Makefile index bf5e576ed2a..2edb8e67b5e 100644 --- a/kernel/syno-avoton-6.2.4/Makefile +++ b/kernel/syno-avoton-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-3.10.x KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-avoton-7.1/Makefile b/kernel/syno-avoton-7.1/Makefile new file mode 100644 index 00000000000..6f7aa5823df --- /dev/null +++ b/kernel/syno-avoton-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = avoton +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-3.10.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-avoton-7.1/digests b/kernel/syno-avoton-7.1/digests new file mode 100644 index 00000000000..5997fb39690 --- /dev/null +++ b/kernel/syno-avoton-7.1/digests @@ -0,0 +1,3 @@ +avoton-linux-3.10.x.txz SHA1 a07d1651b81e8e2bb4195d4e2fd4aaec788e2713 +avoton-linux-3.10.x.txz SHA256 28e26b46dbf20b3f38b6e729c17ee2fbea34b0427ed1c92d20f106c82b757ca5 +avoton-linux-3.10.x.txz MD5 9b55f46065c4509ac6a53dcf715f9edf diff --git a/kernel/syno-avoton-7.1/patches/001-define-per_cpu_load_addr-as-static.patch b/kernel/syno-avoton-7.1/patches/001-define-per_cpu_load_addr-as-static.patch new file mode 100644 index 00000000000..b228075c091 --- /dev/null +++ b/kernel/syno-avoton-7.1/patches/001-define-per_cpu_load_addr-as-static.patch @@ -0,0 +1,21 @@ +per_cpu_load_addr is only used for 64-bit relocations, but is declared +in both configurations of relocs.c - with different types. This has +undefined behaviour in general. GNU ld is documented to use the +larger size in this case, but other tools may differ and some warn +about this. + +References: https://bugs.debian.org/748577 +Reported-by: Michael Tautschnig +Signed-off-by: Ben Hutchings + +--- arch/x86/tools/relocs.c.orig 2021-07-01 14:26:53.000000000 +0000 ++++ arch/x86/tools/relocs.c 2023-05-24 22:57:21.794016972 +0000 +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(s + * + */ + static int per_cpu_shndx = -1; +-Elf_Addr per_cpu_load_addr; ++static Elf_Addr per_cpu_load_addr; + + static void percpu_init(void) + { diff --git a/kernel/syno-avoton-7.2/Makefile b/kernel/syno-avoton-7.2/Makefile new file mode 100644 index 00000000000..31563712ad3 --- /dev/null +++ b/kernel/syno-avoton-7.2/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = avoton +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-3.10.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.2 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-avoton-7.2/digests b/kernel/syno-avoton-7.2/digests new file mode 100644 index 00000000000..ba4311df41d --- /dev/null +++ b/kernel/syno-avoton-7.2/digests @@ -0,0 +1,3 @@ +avoton-linux-3.10.x.txz SHA1 0571bf634fa8b72ea28c038cd9823fb56a411bed +avoton-linux-3.10.x.txz SHA256 8a1f9decfd26bcba4c2f045e54bad089109ec3ba034a84e5f8957ffcb346f56a +avoton-linux-3.10.x.txz MD5 7d43a64849b922bc9fcdc15737d91e1b diff --git a/kernel/syno-avoton-7.2/patches/001-define-per_cpu_load_addr-as-static.patch b/kernel/syno-avoton-7.2/patches/001-define-per_cpu_load_addr-as-static.patch new file mode 100644 index 00000000000..b228075c091 --- /dev/null +++ b/kernel/syno-avoton-7.2/patches/001-define-per_cpu_load_addr-as-static.patch @@ -0,0 +1,21 @@ +per_cpu_load_addr is only used for 64-bit relocations, but is declared +in both configurations of relocs.c - with different types. This has +undefined behaviour in general. GNU ld is documented to use the +larger size in this case, but other tools may differ and some warn +about this. + +References: https://bugs.debian.org/748577 +Reported-by: Michael Tautschnig +Signed-off-by: Ben Hutchings + +--- arch/x86/tools/relocs.c.orig 2021-07-01 14:26:53.000000000 +0000 ++++ arch/x86/tools/relocs.c 2023-05-24 22:57:21.794016972 +0000 +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(s + * + */ + static int per_cpu_shndx = -1; +-Elf_Addr per_cpu_load_addr; ++static Elf_Addr per_cpu_load_addr; + + static void percpu_init(void) + { diff --git a/kernel/syno-braswell-6.2.4/Makefile b/kernel/syno-braswell-6.2.4/Makefile index 456ec36e38b..48b9bffabf2 100644 --- a/kernel/syno-braswell-6.2.4/Makefile +++ b/kernel/syno-braswell-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-3.10.x KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-braswell-7.1/Makefile b/kernel/syno-braswell-7.1/Makefile new file mode 100644 index 00000000000..3b0265bde64 --- /dev/null +++ b/kernel/syno-braswell-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = braswell +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-3.10.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-braswell-7.1/digests b/kernel/syno-braswell-7.1/digests new file mode 100644 index 00000000000..6bc4b6e459e --- /dev/null +++ b/kernel/syno-braswell-7.1/digests @@ -0,0 +1,3 @@ +braswell-linux-3.10.x.txz SHA1 09afe3c42c4af32b5fce1e14ad659b812a02e79a +braswell-linux-3.10.x.txz SHA256 dd70c3ca88f10b0ddb53845100a02e302c2950dab181937eeec9154d3d6d792d +braswell-linux-3.10.x.txz MD5 7b92ffa4c7646350dfa160dd00dbeb43 diff --git a/kernel/syno-braswell-7.1/patches/001-define-per_cpu_load_addr-as-static.patch b/kernel/syno-braswell-7.1/patches/001-define-per_cpu_load_addr-as-static.patch new file mode 100644 index 00000000000..b228075c091 --- /dev/null +++ b/kernel/syno-braswell-7.1/patches/001-define-per_cpu_load_addr-as-static.patch @@ -0,0 +1,21 @@ +per_cpu_load_addr is only used for 64-bit relocations, but is declared +in both configurations of relocs.c - with different types. This has +undefined behaviour in general. GNU ld is documented to use the +larger size in this case, but other tools may differ and some warn +about this. + +References: https://bugs.debian.org/748577 +Reported-by: Michael Tautschnig +Signed-off-by: Ben Hutchings + +--- arch/x86/tools/relocs.c.orig 2021-07-01 14:26:53.000000000 +0000 ++++ arch/x86/tools/relocs.c 2023-05-24 22:57:21.794016972 +0000 +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(s + * + */ + static int per_cpu_shndx = -1; +-Elf_Addr per_cpu_load_addr; ++static Elf_Addr per_cpu_load_addr; + + static void percpu_init(void) + { diff --git a/kernel/syno-braswell-7.2/Makefile b/kernel/syno-braswell-7.2/Makefile new file mode 100644 index 00000000000..2e5815c74d4 --- /dev/null +++ b/kernel/syno-braswell-7.2/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = braswell +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-3.10.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.2 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-braswell-7.2/digests b/kernel/syno-braswell-7.2/digests new file mode 100644 index 00000000000..041565a80b2 --- /dev/null +++ b/kernel/syno-braswell-7.2/digests @@ -0,0 +1,3 @@ +braswell-linux-3.10.x.txz SHA1 42bb5d803baefaeadc9b02a6f1d476a06987fc62 +braswell-linux-3.10.x.txz SHA256 ab147360bd9c09e5d3547faf0f202bf7ba818ee023a2adff5c6e244e9db99edc +braswell-linux-3.10.x.txz MD5 b6489caa31d9a826762570c14defcb3c diff --git a/kernel/syno-braswell-7.2/patches/001-define-per_cpu_load_addr-as-static.patch b/kernel/syno-braswell-7.2/patches/001-define-per_cpu_load_addr-as-static.patch new file mode 100644 index 00000000000..b228075c091 --- /dev/null +++ b/kernel/syno-braswell-7.2/patches/001-define-per_cpu_load_addr-as-static.patch @@ -0,0 +1,21 @@ +per_cpu_load_addr is only used for 64-bit relocations, but is declared +in both configurations of relocs.c - with different types. This has +undefined behaviour in general. GNU ld is documented to use the +larger size in this case, but other tools may differ and some warn +about this. + +References: https://bugs.debian.org/748577 +Reported-by: Michael Tautschnig +Signed-off-by: Ben Hutchings + +--- arch/x86/tools/relocs.c.orig 2021-07-01 14:26:53.000000000 +0000 ++++ arch/x86/tools/relocs.c 2023-05-24 22:57:21.794016972 +0000 +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(s + * + */ + static int per_cpu_shndx = -1; +-Elf_Addr per_cpu_load_addr; ++static Elf_Addr per_cpu_load_addr; + + static void percpu_init(void) + { diff --git a/kernel/syno-broadwell-6.2.4/Makefile b/kernel/syno-broadwell-6.2.4/Makefile index d1e07d5a8f1..8f2f69bf2c7 100644 --- a/kernel/syno-broadwell-6.2.4/Makefile +++ b/kernel/syno-broadwell-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-3.10.x KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-broadwell-7.1/Makefile b/kernel/syno-broadwell-7.1/Makefile new file mode 100644 index 00000000000..de1a4beb746 --- /dev/null +++ b/kernel/syno-broadwell-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = broadwell +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-broadwell-7.1/digests b/kernel/syno-broadwell-7.1/digests new file mode 100644 index 00000000000..dcc627ae9bb --- /dev/null +++ b/kernel/syno-broadwell-7.1/digests @@ -0,0 +1,3 @@ +broadwell-linux-4.4.x.txz SHA1 a68c8faec9b4f80297250f6e3b7aa2ca667fbe42 +broadwell-linux-4.4.x.txz SHA256 e62f5dae0102497064be5bf73dcd80242cc63692600fb797c076eb59d6546fc6 +broadwell-linux-4.4.x.txz MD5 a7083f70b91b76c3d024afa2f472e13a diff --git a/kernel/syno-broadwell-7.2/Makefile b/kernel/syno-broadwell-7.2/Makefile new file mode 100644 index 00000000000..22063d052bd --- /dev/null +++ b/kernel/syno-broadwell-7.2/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = broadwell +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.2 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-broadwell-7.2/digests b/kernel/syno-broadwell-7.2/digests new file mode 100644 index 00000000000..d75e7882567 --- /dev/null +++ b/kernel/syno-broadwell-7.2/digests @@ -0,0 +1,3 @@ +broadwell-linux-4.4.x.txz SHA1 8f77ec68621b97652035936d13b0efb5a05e6829 +broadwell-linux-4.4.x.txz SHA256 9f7f8449576b205488812e3a65c272d6f28551130561a39d85e0cd8cdaacdd05 +broadwell-linux-4.4.x.txz MD5 703353073bed8e4d27cdd1454f741d78 diff --git a/kernel/syno-broadwellnk-6.2.4/Makefile b/kernel/syno-broadwellnk-6.2.4/Makefile index 64497d4720e..0a4d03c8cfb 100644 --- a/kernel/syno-broadwellnk-6.2.4/Makefile +++ b/kernel/syno-broadwellnk-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-broadwellnk-7.1/Makefile b/kernel/syno-broadwellnk-7.1/Makefile new file mode 100644 index 00000000000..4719c671fed --- /dev/null +++ b/kernel/syno-broadwellnk-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = broadwellnk +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-broadwellnk-7.1/digests b/kernel/syno-broadwellnk-7.1/digests new file mode 100644 index 00000000000..272b4eac859 --- /dev/null +++ b/kernel/syno-broadwellnk-7.1/digests @@ -0,0 +1,3 @@ +broadwellnk-linux-4.4.x.txz SHA1 c4e3b3fcc86ea60b3a08f0170d9b263e06ab4119 +broadwellnk-linux-4.4.x.txz SHA256 ff1465be5626005c510de9071eac82ad1b1f6c8fb836ecf979f31c18fa778ae1 +broadwellnk-linux-4.4.x.txz MD5 d1f3b484802f06fa158fde712093cf3a diff --git a/kernel/syno-broadwellnk-7.2/Makefile b/kernel/syno-broadwellnk-7.2/Makefile new file mode 100644 index 00000000000..771c0eb2fdd --- /dev/null +++ b/kernel/syno-broadwellnk-7.2/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = broadwellnk +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.2 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-broadwellnk-7.2/digests b/kernel/syno-broadwellnk-7.2/digests new file mode 100644 index 00000000000..48a71f5bb78 --- /dev/null +++ b/kernel/syno-broadwellnk-7.2/digests @@ -0,0 +1,3 @@ +broadwellnk-linux-4.4.x.txz SHA1 2876bcab6053772cc17febb57bedb48e9f83af1d +broadwellnk-linux-4.4.x.txz SHA256 3f304760bf89a616b75b5a4078e61b089d7e5e3b67727a907c867ccba1a17243 +broadwellnk-linux-4.4.x.txz MD5 570f893b15ace3dc86a56a1895c2df9f diff --git a/kernel/syno-broadwellnkv2-7.1/Makefile b/kernel/syno-broadwellnkv2-7.1/Makefile new file mode 100644 index 00000000000..952217a3e47 --- /dev/null +++ b/kernel/syno-broadwellnkv2-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = broadwellnkv2 +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-broadwellnkv2-7.1/digests b/kernel/syno-broadwellnkv2-7.1/digests new file mode 100644 index 00000000000..b6c673324b4 --- /dev/null +++ b/kernel/syno-broadwellnkv2-7.1/digests @@ -0,0 +1,3 @@ +broadwellnkv2-linux-4.4.x.txz SHA1 ae8b24504547212b2538a54af745c4f2e9c5219a +broadwellnkv2-linux-4.4.x.txz SHA256 f5d5d3ff4c1eb2b28433d9b5ff2d7b631e9028ddcb1f94495fed459695c6b13d +broadwellnkv2-linux-4.4.x.txz MD5 c65d808bcfeb3260385f75fdb456f4fc diff --git a/kernel/syno-broadwellnkv2-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch b/kernel/syno-broadwellnkv2-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch new file mode 100644 index 00000000000..ed716296065 --- /dev/null +++ b/kernel/syno-broadwellnkv2-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch @@ -0,0 +1,11 @@ +--- scripts/dtc/dtc-parser.tab.c_shipped.orig 2021-02-17 07:10:09.000000000 +0000 ++++ scripts/dtc/dtc-parser.tab.c_shipped 2023-05-23 23:22:41.400125887 +0000 +@@ -1196,7 +1196,7 @@ int yychar; + /* The semantic value of the lookahead symbol. */ + YYSTYPE yylval; + /* Location data for the lookahead symbol. */ +-YYLTYPE yylloc ++//YYLTYPE yylloc + # if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL + = { 1, 1, 1, 1 } + # endif diff --git a/kernel/syno-broadwellnkv2-7.2/Makefile b/kernel/syno-broadwellnkv2-7.2/Makefile new file mode 100644 index 00000000000..e8e3b2d0dc1 --- /dev/null +++ b/kernel/syno-broadwellnkv2-7.2/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = broadwellnkv2 +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.2 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-broadwellnkv2-7.2/digests b/kernel/syno-broadwellnkv2-7.2/digests new file mode 100644 index 00000000000..5e16f8119df --- /dev/null +++ b/kernel/syno-broadwellnkv2-7.2/digests @@ -0,0 +1,3 @@ +broadwellnkv2-linux-4.4.x.txz SHA1 615566db08715429be41a0f588262fd81de73dfd +broadwellnkv2-linux-4.4.x.txz SHA256 96e74f40e87dfe88ce0b7033aa3d2fe5ca1879358dbeee9d78c37c71bc030814 +broadwellnkv2-linux-4.4.x.txz MD5 c9c4eaf2c36a2df5a6649e7aae148b93 diff --git a/kernel/syno-broadwellntbap-7.1/Makefile b/kernel/syno-broadwellntbap-7.1/Makefile new file mode 100644 index 00000000000..1fd62355114 --- /dev/null +++ b/kernel/syno-broadwellntbap-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = broadwellntbap +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-broadwellntbap-7.1/digests b/kernel/syno-broadwellntbap-7.1/digests new file mode 100644 index 00000000000..faac3337ec0 --- /dev/null +++ b/kernel/syno-broadwellntbap-7.1/digests @@ -0,0 +1,3 @@ +broadwellntbap-linux-4.4.x.txz SHA1 8a047457f7fcc817f83d70ddb6b1e4936215e1d6 +broadwellntbap-linux-4.4.x.txz SHA256 57f51527f878d584a30db9b6576e5a1b435f99d10d254b97aa0502a85b95dfe1 +broadwellntbap-linux-4.4.x.txz MD5 ed9349a0a1f604292221c8a2278e29fd diff --git a/kernel/syno-broadwellntbap-7.2/Makefile b/kernel/syno-broadwellntbap-7.2/Makefile new file mode 100644 index 00000000000..282641af638 --- /dev/null +++ b/kernel/syno-broadwellntbap-7.2/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = broadwellntbap +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.2 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-broadwellntbap-7.2/digests b/kernel/syno-broadwellntbap-7.2/digests new file mode 100644 index 00000000000..77a51265ef7 --- /dev/null +++ b/kernel/syno-broadwellntbap-7.2/digests @@ -0,0 +1,3 @@ +broadwellntbap-linux-4.4.x.txz SHA1 5023a469780d3e000b1284ad82bd748bda9da8c2 +broadwellntbap-linux-4.4.x.txz SHA256 8a51290755a4223df7b0870d9044850f1ce49084634a6c549c9068919bdd7f40 +broadwellntbap-linux-4.4.x.txz MD5 2c9845655e269e77461fc64f9662d7da diff --git a/kernel/syno-bromolow-6.2.4/Makefile b/kernel/syno-bromolow-6.2.4/Makefile index 78234966667..ad64b21aca6 100644 --- a/kernel/syno-bromolow-6.2.4/Makefile +++ b/kernel/syno-bromolow-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-3.10.x KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-bromolow-7.1/Makefile b/kernel/syno-bromolow-7.1/Makefile new file mode 100644 index 00000000000..4c7502fbc20 --- /dev/null +++ b/kernel/syno-bromolow-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = bromolow +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-3.10.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-bromolow-7.1/digests b/kernel/syno-bromolow-7.1/digests new file mode 100644 index 00000000000..4513c8f1e1f --- /dev/null +++ b/kernel/syno-bromolow-7.1/digests @@ -0,0 +1,3 @@ +bromolow-linux-3.10.x.txz SHA1 5a5702c7d4ef38a9e5db8207a9fd1b45e0f07a85 +bromolow-linux-3.10.x.txz SHA256 f6af3d24eb4d8b17870d7182c155e57d401782ad5d035a93210e3643d02b8e0b +bromolow-linux-3.10.x.txz MD5 a5844d4150f80ea191f2fca1c37cae8c diff --git a/kernel/syno-bromolow-7.1/patches/001-define-per_cpu_load_addr-as-static.patch b/kernel/syno-bromolow-7.1/patches/001-define-per_cpu_load_addr-as-static.patch new file mode 100644 index 00000000000..b228075c091 --- /dev/null +++ b/kernel/syno-bromolow-7.1/patches/001-define-per_cpu_load_addr-as-static.patch @@ -0,0 +1,21 @@ +per_cpu_load_addr is only used for 64-bit relocations, but is declared +in both configurations of relocs.c - with different types. This has +undefined behaviour in general. GNU ld is documented to use the +larger size in this case, but other tools may differ and some warn +about this. + +References: https://bugs.debian.org/748577 +Reported-by: Michael Tautschnig +Signed-off-by: Ben Hutchings + +--- arch/x86/tools/relocs.c.orig 2021-07-01 14:26:53.000000000 +0000 ++++ arch/x86/tools/relocs.c 2023-05-24 22:57:21.794016972 +0000 +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(s + * + */ + static int per_cpu_shndx = -1; +-Elf_Addr per_cpu_load_addr; ++static Elf_Addr per_cpu_load_addr; + + static void percpu_init(void) + { diff --git a/kernel/syno-bromolow-7.2/Makefile b/kernel/syno-bromolow-7.2/Makefile new file mode 100644 index 00000000000..e210f7bd57e --- /dev/null +++ b/kernel/syno-bromolow-7.2/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = bromolow +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-3.10.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.2 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-bromolow-7.2/digests b/kernel/syno-bromolow-7.2/digests new file mode 100644 index 00000000000..fbe8b1fcbec --- /dev/null +++ b/kernel/syno-bromolow-7.2/digests @@ -0,0 +1,3 @@ +bromolow-linux-3.10.x.txz SHA1 1a7b7d6b33758d23d883c366bde15ca94dde9adf +bromolow-linux-3.10.x.txz SHA256 e3c974312c8f99084fe311622713e8b995fe37f8ba471be81d23984e74a96a14 +bromolow-linux-3.10.x.txz MD5 6b96dd0d7d68412b1f7de7eea5b126f7 diff --git a/kernel/syno-bromolow-7.2/patches/001-define-per_cpu_load_addr-as-static.patch b/kernel/syno-bromolow-7.2/patches/001-define-per_cpu_load_addr-as-static.patch new file mode 100644 index 00000000000..b228075c091 --- /dev/null +++ b/kernel/syno-bromolow-7.2/patches/001-define-per_cpu_load_addr-as-static.patch @@ -0,0 +1,21 @@ +per_cpu_load_addr is only used for 64-bit relocations, but is declared +in both configurations of relocs.c - with different types. This has +undefined behaviour in general. GNU ld is documented to use the +larger size in this case, but other tools may differ and some warn +about this. + +References: https://bugs.debian.org/748577 +Reported-by: Michael Tautschnig +Signed-off-by: Ben Hutchings + +--- arch/x86/tools/relocs.c.orig 2021-07-01 14:26:53.000000000 +0000 ++++ arch/x86/tools/relocs.c 2023-05-24 22:57:21.794016972 +0000 +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(s + * + */ + static int per_cpu_shndx = -1; +-Elf_Addr per_cpu_load_addr; ++static Elf_Addr per_cpu_load_addr; + + static void percpu_init(void) + { diff --git a/kernel/syno-cedarview-6.2.4/Makefile b/kernel/syno-cedarview-6.2.4/Makefile index 30ffb5bb4d0..2f2cb1c2717 100644 --- a/kernel/syno-cedarview-6.2.4/Makefile +++ b/kernel/syno-cedarview-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-3.10.x KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-cedarview-7.1/Makefile b/kernel/syno-cedarview-7.1/Makefile new file mode 100644 index 00000000000..0341c9afcfa --- /dev/null +++ b/kernel/syno-cedarview-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = cedarview +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-3.10.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-cedarview-7.1/digests b/kernel/syno-cedarview-7.1/digests new file mode 100644 index 00000000000..9719d076f6f --- /dev/null +++ b/kernel/syno-cedarview-7.1/digests @@ -0,0 +1,3 @@ +cedarview-linux-3.10.x.txz SHA1 8e3f5c9137b75cf04212b7a5fa117270192fb117 +cedarview-linux-3.10.x.txz SHA256 35ba213d1e602ca3a569855bbd4f9cd9c235bd27fdd1a4d3565f790bfd114e72 +cedarview-linux-3.10.x.txz MD5 c0541dd777fbc4501f7123890c9cfeb4 diff --git a/kernel/syno-cedarview-7.1/patches/001-define-per_cpu_load_addr-as-static.patch b/kernel/syno-cedarview-7.1/patches/001-define-per_cpu_load_addr-as-static.patch new file mode 100644 index 00000000000..b228075c091 --- /dev/null +++ b/kernel/syno-cedarview-7.1/patches/001-define-per_cpu_load_addr-as-static.patch @@ -0,0 +1,21 @@ +per_cpu_load_addr is only used for 64-bit relocations, but is declared +in both configurations of relocs.c - with different types. This has +undefined behaviour in general. GNU ld is documented to use the +larger size in this case, but other tools may differ and some warn +about this. + +References: https://bugs.debian.org/748577 +Reported-by: Michael Tautschnig +Signed-off-by: Ben Hutchings + +--- arch/x86/tools/relocs.c.orig 2021-07-01 14:26:53.000000000 +0000 ++++ arch/x86/tools/relocs.c 2023-05-24 22:57:21.794016972 +0000 +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(s + * + */ + static int per_cpu_shndx = -1; +-Elf_Addr per_cpu_load_addr; ++static Elf_Addr per_cpu_load_addr; + + static void percpu_init(void) + { diff --git a/kernel/syno-comcerto2k-6.2.4/Makefile b/kernel/syno-comcerto2k-6.2.4/Makefile index 9482e00bc75..005900a7fcb 100644 --- a/kernel/syno-comcerto2k-6.2.4/Makefile +++ b/kernel/syno-comcerto2k-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-3.x KERNEL_BASE_ARCH = arm +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-comcerto2k-7.1/Makefile b/kernel/syno-comcerto2k-7.1/Makefile new file mode 100644 index 00000000000..98331afc5c2 --- /dev/null +++ b/kernel/syno-comcerto2k-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = comcerto2k +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-3.x +KERNEL_BASE_ARCH = arm +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-comcerto2k-7.1/digests b/kernel/syno-comcerto2k-7.1/digests new file mode 100644 index 00000000000..d0d04541602 --- /dev/null +++ b/kernel/syno-comcerto2k-7.1/digests @@ -0,0 +1,3 @@ +comcerto2k-linux-3.x.txz SHA1 bfb95016cb372b47a6759247eaeebea52ba71581 +comcerto2k-linux-3.x.txz SHA256 09eca36847712b3cea421add0190efa51a3b49fbed4c50d3491ce1f20b24dd91 +comcerto2k-linux-3.x.txz MD5 b4963e88c4c289585b505316bb0dc361 diff --git a/kernel/syno-denverton-6.2.4/Makefile b/kernel/syno-denverton-6.2.4/Makefile index 854aa091839..5239e7d3d11 100644 --- a/kernel/syno-denverton-6.2.4/Makefile +++ b/kernel/syno-denverton-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-denverton-7.1/Makefile b/kernel/syno-denverton-7.1/Makefile new file mode 100644 index 00000000000..b69637058f4 --- /dev/null +++ b/kernel/syno-denverton-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = denverton +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-denverton-7.1/digests b/kernel/syno-denverton-7.1/digests new file mode 100644 index 00000000000..a3b1033951a --- /dev/null +++ b/kernel/syno-denverton-7.1/digests @@ -0,0 +1,3 @@ +denverton-linux-4.4.x.txz SHA1 c03cf17d0a44365716090488e1b1163ec080e556 +denverton-linux-4.4.x.txz SHA256 a56c2eb42b1e85756071c1907ff22374344babffc179fa8886de79aa116671ee +denverton-linux-4.4.x.txz MD5 be822e49fe79023151d2b20db4597e4c diff --git a/kernel/syno-denverton-7.2/Makefile b/kernel/syno-denverton-7.2/Makefile new file mode 100644 index 00000000000..43d41239203 --- /dev/null +++ b/kernel/syno-denverton-7.2/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = denverton +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.2 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-denverton-7.2/digests b/kernel/syno-denverton-7.2/digests new file mode 100644 index 00000000000..214a449678d --- /dev/null +++ b/kernel/syno-denverton-7.2/digests @@ -0,0 +1,3 @@ +denverton-linux-4.4.x.txz SHA1 a2d94dc276cb757d356caafa3828da152988ab5a +denverton-linux-4.4.x.txz SHA256 5fbec4ccbfcba050f9fa67e4fd3913ec9ffd9669a0a904b85cc523182dd7a53b +denverton-linux-4.4.x.txz MD5 fa5606798b0dabf4094adb0896e7e1f7 diff --git a/kernel/syno-epyc7002-7.1/Makefile b/kernel/syno-epyc7002-7.1/Makefile new file mode 100644 index 00000000000..904ebc4bf07 --- /dev/null +++ b/kernel/syno-epyc7002-7.1/Makefile @@ -0,0 +1,9 @@ +KERNEL_ARCH = epyc7002 +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-5.10.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.1.1 +KERNEL_CONFIG = synology/synoconfigs/$(KERNEL_ARCH) + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-epyc7002-7.1/digests b/kernel/syno-epyc7002-7.1/digests new file mode 100644 index 00000000000..be6a681d552 --- /dev/null +++ b/kernel/syno-epyc7002-7.1/digests @@ -0,0 +1,3 @@ +epyc7002-linux-5.10.x.txz SHA1 2361c7e0dd9d36012c68a8b03abcddc4adf6fde1 +epyc7002-linux-5.10.x.txz SHA256 23ffd00b4ab04d5c5a23d37907117e79f495888e1b849de48f1df6c447c49c3d +epyc7002-linux-5.10.x.txz MD5 bef60e71caae59f2e314cb9e39930760 diff --git a/kernel/syno-epyc7002-7.2/Makefile b/kernel/syno-epyc7002-7.2/Makefile new file mode 100644 index 00000000000..c9fee421302 --- /dev/null +++ b/kernel/syno-epyc7002-7.2/Makefile @@ -0,0 +1,9 @@ +KERNEL_ARCH = epyc7002 +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-5.10.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.2 +KERNEL_CONFIG = synology/synoconfigs/$(KERNEL_ARCH) + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-epyc7002-7.2/digests b/kernel/syno-epyc7002-7.2/digests new file mode 100644 index 00000000000..6a60fb6e2e8 --- /dev/null +++ b/kernel/syno-epyc7002-7.2/digests @@ -0,0 +1,3 @@ +epyc7002-linux-5.10.x.txz SHA1 907f957ee0c7bcd89a10d8aa68510bd902fede08 +epyc7002-linux-5.10.x.txz SHA256 006b116f4736210c501c60e502bfbe6684765238b917084eee40f35a1f3b4f24 +epyc7002-linux-5.10.x.txz MD5 cffe2344fcc09e0a6e3207bd0f51e26d diff --git a/kernel/syno-evansport-6.2.4/Makefile b/kernel/syno-evansport-6.2.4/Makefile index 007f9a87197..d2128f5cacf 100644 --- a/kernel/syno-evansport-6.2.4/Makefile +++ b/kernel/syno-evansport-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-3.x KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-evansport-7.1/Makefile b/kernel/syno-evansport-7.1/Makefile new file mode 100644 index 00000000000..edf77597b41 --- /dev/null +++ b/kernel/syno-evansport-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = evansport +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-3.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-evansport-7.1/digests b/kernel/syno-evansport-7.1/digests new file mode 100644 index 00000000000..703ce303f30 --- /dev/null +++ b/kernel/syno-evansport-7.1/digests @@ -0,0 +1,3 @@ +evansport-linux-3.x.txz SHA1 89ce480e78846cb8507676ec145198e347dc7514 +evansport-linux-3.x.txz SHA256 59f4b75ac9a68a89db5604d9aae8bb4d0361758c6a1728f27729aa907a54be5c +evansport-linux-3.x.txz MD5 f527a2bc0c86c8daeb065fa66c6caa02 diff --git a/kernel/syno-geminilake-6.2.4/Makefile b/kernel/syno-geminilake-6.2.4/Makefile index 0caa1f48cf7..5cd632a40a0 100644 --- a/kernel/syno-geminilake-6.2.4/Makefile +++ b/kernel/syno-geminilake-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-geminilake-7.1/Makefile b/kernel/syno-geminilake-7.1/Makefile new file mode 100644 index 00000000000..14f009f5922 --- /dev/null +++ b/kernel/syno-geminilake-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = geminilake +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-geminilake-7.1/digests b/kernel/syno-geminilake-7.1/digests new file mode 100644 index 00000000000..83bb1098e64 --- /dev/null +++ b/kernel/syno-geminilake-7.1/digests @@ -0,0 +1,3 @@ +geminilake-linux-4.4.x.txz SHA1 30e9161a9623f8a06f22cc23caa39702da2af519 +geminilake-linux-4.4.x.txz SHA256 468e7b4ba40b96778da4cf70cd9b728194e89a52c058c53f17afd9df8ca2c9c1 +geminilake-linux-4.4.x.txz MD5 a21be59e1c5860a99cf942c2489de046 diff --git a/kernel/syno-geminilake-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch b/kernel/syno-geminilake-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch new file mode 100644 index 00000000000..ed716296065 --- /dev/null +++ b/kernel/syno-geminilake-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch @@ -0,0 +1,11 @@ +--- scripts/dtc/dtc-parser.tab.c_shipped.orig 2021-02-17 07:10:09.000000000 +0000 ++++ scripts/dtc/dtc-parser.tab.c_shipped 2023-05-23 23:22:41.400125887 +0000 +@@ -1196,7 +1196,7 @@ int yychar; + /* The semantic value of the lookahead symbol. */ + YYSTYPE yylval; + /* Location data for the lookahead symbol. */ +-YYLTYPE yylloc ++//YYLTYPE yylloc + # if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL + = { 1, 1, 1, 1 } + # endif diff --git a/kernel/syno-geminilake-7.2/Makefile b/kernel/syno-geminilake-7.2/Makefile new file mode 100644 index 00000000000..a89deeb042b --- /dev/null +++ b/kernel/syno-geminilake-7.2/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = geminilake +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.2 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-geminilake-7.2/digests b/kernel/syno-geminilake-7.2/digests new file mode 100644 index 00000000000..d365abfaa61 --- /dev/null +++ b/kernel/syno-geminilake-7.2/digests @@ -0,0 +1,3 @@ +geminilake-linux-4.4.x.txz SHA1 857e2b416d4182c6481f58b9f2d991941705f980 +geminilake-linux-4.4.x.txz SHA256 65b07566ac646dee082b8ca4246ab11162a7c7091c21094df28227612a315e77 +geminilake-linux-4.4.x.txz MD5 b53f9c52b5f1a19c46293dfb64f7b82e diff --git a/kernel/syno-grantley-6.2.4/Makefile b/kernel/syno-grantley-6.2.4/Makefile index cf3057ba75b..2b948ca9150 100644 --- a/kernel/syno-grantley-6.2.4/Makefile +++ b/kernel/syno-grantley-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-3.10.x KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-grantley-7.1/Makefile b/kernel/syno-grantley-7.1/Makefile new file mode 100644 index 00000000000..cf82d9d6bde --- /dev/null +++ b/kernel/syno-grantley-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = grantley +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-3.10.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-grantley-7.1/digests b/kernel/syno-grantley-7.1/digests new file mode 100644 index 00000000000..82c9cf6d752 --- /dev/null +++ b/kernel/syno-grantley-7.1/digests @@ -0,0 +1,3 @@ +grantley-linux-3.10.x.txz SHA1 abe46672f9be94d22211c89b5d037c12b629f245 +grantley-linux-3.10.x.txz SHA256 1ecac12220e379f59c2d908e24ab3df4e389f44d17bbbbcdac26d4b6a25729ee +grantley-linux-3.10.x.txz MD5 b8b50d7f8a329cf32c4c2a4c7ca22ec4 diff --git a/kernel/syno-grantley-7.1/patches/001-define-per_cpu_load_addr-as-static.patch b/kernel/syno-grantley-7.1/patches/001-define-per_cpu_load_addr-as-static.patch new file mode 100644 index 00000000000..b228075c091 --- /dev/null +++ b/kernel/syno-grantley-7.1/patches/001-define-per_cpu_load_addr-as-static.patch @@ -0,0 +1,21 @@ +per_cpu_load_addr is only used for 64-bit relocations, but is declared +in both configurations of relocs.c - with different types. This has +undefined behaviour in general. GNU ld is documented to use the +larger size in this case, but other tools may differ and some warn +about this. + +References: https://bugs.debian.org/748577 +Reported-by: Michael Tautschnig +Signed-off-by: Ben Hutchings + +--- arch/x86/tools/relocs.c.orig 2021-07-01 14:26:53.000000000 +0000 ++++ arch/x86/tools/relocs.c 2023-05-24 22:57:21.794016972 +0000 +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(s + * + */ + static int per_cpu_shndx = -1; +-Elf_Addr per_cpu_load_addr; ++static Elf_Addr per_cpu_load_addr; + + static void percpu_init(void) + { diff --git a/kernel/syno-grantley-7.2/Makefile b/kernel/syno-grantley-7.2/Makefile new file mode 100644 index 00000000000..cbbda411d40 --- /dev/null +++ b/kernel/syno-grantley-7.2/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = grantley +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-3.10.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.2 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-grantley-7.2/digests b/kernel/syno-grantley-7.2/digests new file mode 100644 index 00000000000..6d1730283e7 --- /dev/null +++ b/kernel/syno-grantley-7.2/digests @@ -0,0 +1,3 @@ +grantley-linux-3.10.x.txz SHA1 73cd9c6a9cc0f7d57a854c05225632e746586ff9 +grantley-linux-3.10.x.txz SHA256 be828946befc244e57db7438371b8ad105f919634977681d4fe06d6e86b1af7b +grantley-linux-3.10.x.txz MD5 c3765e986cb9d15b4dcab2ac316d615e diff --git a/kernel/syno-grantley-7.2/patches/001-define-per_cpu_load_addr-as-static.patch b/kernel/syno-grantley-7.2/patches/001-define-per_cpu_load_addr-as-static.patch new file mode 100644 index 00000000000..b228075c091 --- /dev/null +++ b/kernel/syno-grantley-7.2/patches/001-define-per_cpu_load_addr-as-static.patch @@ -0,0 +1,21 @@ +per_cpu_load_addr is only used for 64-bit relocations, but is declared +in both configurations of relocs.c - with different types. This has +undefined behaviour in general. GNU ld is documented to use the +larger size in this case, but other tools may differ and some warn +about this. + +References: https://bugs.debian.org/748577 +Reported-by: Michael Tautschnig +Signed-off-by: Ben Hutchings + +--- arch/x86/tools/relocs.c.orig 2021-07-01 14:26:53.000000000 +0000 ++++ arch/x86/tools/relocs.c 2023-05-24 22:57:21.794016972 +0000 +@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(s + * + */ + static int per_cpu_shndx = -1; +-Elf_Addr per_cpu_load_addr; ++static Elf_Addr per_cpu_load_addr; + + static void percpu_init(void) + { diff --git a/kernel/syno-hi3535-6.2.4/Makefile b/kernel/syno-hi3535-6.2.4/Makefile index ed3b9658220..1adf7b706b8 100644 --- a/kernel/syno-hi3535-6.2.4/Makefile +++ b/kernel/syno-hi3535-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-3.4.x KERNEL_BASE_ARCH = arm +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-kvmx64-6.2.4/Makefile b/kernel/syno-kvmx64-6.2.4/Makefile index d52f5653594..3e766909774 100644 --- a/kernel/syno-kvmx64-6.2.4/Makefile +++ b/kernel/syno-kvmx64-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-kvmx64-7.1/Makefile b/kernel/syno-kvmx64-7.1/Makefile new file mode 100644 index 00000000000..8c183fdf908 --- /dev/null +++ b/kernel/syno-kvmx64-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = kvmx64 +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-kvmx64-7.1/digests b/kernel/syno-kvmx64-7.1/digests new file mode 100644 index 00000000000..e386c7151bc --- /dev/null +++ b/kernel/syno-kvmx64-7.1/digests @@ -0,0 +1,3 @@ +kvmx64-linux-4.4.x.txz SHA1 81458f5a9bf0360ce9cb0d5ccc8c9656fac44e23 +kvmx64-linux-4.4.x.txz SHA256 62a9e1b8d54a836308a9baf853cc4c4f02ca7225155b3c85076fb3ed8dc25a56 +kvmx64-linux-4.4.x.txz MD5 ba1fd1f0c76aca1ef7585367509e2525 diff --git a/kernel/syno-kvmx64-7.2/Makefile b/kernel/syno-kvmx64-7.2/Makefile new file mode 100644 index 00000000000..9bc196fec2f --- /dev/null +++ b/kernel/syno-kvmx64-7.2/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = kvmx64 +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.2 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-kvmx64-7.2/digests b/kernel/syno-kvmx64-7.2/digests new file mode 100644 index 00000000000..68f4c2b4f31 --- /dev/null +++ b/kernel/syno-kvmx64-7.2/digests @@ -0,0 +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 diff --git a/kernel/syno-monaco-6.2.4/Makefile b/kernel/syno-monaco-6.2.4/Makefile index a13a84564fc..46b73ad918c 100644 --- a/kernel/syno-monaco-6.2.4/Makefile +++ b/kernel/syno-monaco-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-3.10.x-bsp KERNEL_BASE_ARCH = arm +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-monaco-7.1/Makefile b/kernel/syno-monaco-7.1/Makefile new file mode 100644 index 00000000000..00417d344fe --- /dev/null +++ b/kernel/syno-monaco-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = monaco +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-3.10.x-bsp +KERNEL_BASE_ARCH = arm +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-monaco-7.1/digests b/kernel/syno-monaco-7.1/digests new file mode 100644 index 00000000000..81c990caeb9 --- /dev/null +++ b/kernel/syno-monaco-7.1/digests @@ -0,0 +1,3 @@ +monaco-linux-3.10.x-bsp.txz SHA1 ce4608fc7de47427d51ee0bee9f1aad2a9a1e89b +monaco-linux-3.10.x-bsp.txz SHA256 e282f22fbe4c054eb11a0736ec8ea5a6af4a3fc74c2915c444a522f79ec1a1cc +monaco-linux-3.10.x-bsp.txz MD5 1f97107937f5fa3e5c05ec6c583e7b68 diff --git a/kernel/syno-monaco-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch b/kernel/syno-monaco-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch new file mode 100644 index 00000000000..836290fac0e --- /dev/null +++ b/kernel/syno-monaco-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch @@ -0,0 +1,11 @@ +--- scripts/dtc/dtc-parser.tab.c_shipped.orig 2021-02-17 07:08:23.000000000 +0000 ++++ scripts/dtc/dtc-parser.tab.c_shipped 2023-05-24 21:48:52.259896446 +0000 +@@ -73,7 +73,7 @@ + #include "dtc.h" + #include "srcpos.h" + +-YYLTYPE yylloc; ++extern YYLTYPE yylloc; + + extern int yylex(void); + extern void print_error(char const *fmt, ...); diff --git a/kernel/syno-monaco-7.2/Makefile b/kernel/syno-monaco-7.2/Makefile new file mode 100644 index 00000000000..0459711c98b --- /dev/null +++ b/kernel/syno-monaco-7.2/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = monaco +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-3.10.x-bsp +KERNEL_BASE_ARCH = arm +KERNEL_URL_VERSION = 7.2 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-monaco-7.2/digests b/kernel/syno-monaco-7.2/digests new file mode 100644 index 00000000000..a5ed59c84e8 --- /dev/null +++ b/kernel/syno-monaco-7.2/digests @@ -0,0 +1,3 @@ +monaco-linux-3.10.x-bsp.txz SHA1 4c71d1c9926cea5edb141cfb9e17e7703c021144 +monaco-linux-3.10.x-bsp.txz SHA256 49f2ffbe9d94c7f480e5978db15bf406ea7ac1f68b84b6c3c8b807d21e0a57f3 +monaco-linux-3.10.x-bsp.txz MD5 cf1a2a6ae6a0fb72b1d779d1a81b8639 diff --git a/kernel/syno-monaco-7.2/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch b/kernel/syno-monaco-7.2/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch new file mode 100644 index 00000000000..836290fac0e --- /dev/null +++ b/kernel/syno-monaco-7.2/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch @@ -0,0 +1,11 @@ +--- scripts/dtc/dtc-parser.tab.c_shipped.orig 2021-02-17 07:08:23.000000000 +0000 ++++ scripts/dtc/dtc-parser.tab.c_shipped 2023-05-24 21:48:52.259896446 +0000 +@@ -73,7 +73,7 @@ + #include "dtc.h" + #include "srcpos.h" + +-YYLTYPE yylloc; ++extern YYLTYPE yylloc; + + extern int yylex(void); + extern void print_error(char const *fmt, ...); diff --git a/kernel/syno-purley-6.2.4/Makefile b/kernel/syno-purley-6.2.4/Makefile index bce49dcfb91..73d54933a59 100644 --- a/kernel/syno-purley-6.2.4/Makefile +++ b/kernel/syno-purley-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-purley-7.1/Makefile b/kernel/syno-purley-7.1/Makefile new file mode 100644 index 00000000000..f2600115f7b --- /dev/null +++ b/kernel/syno-purley-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = purley +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-purley-7.1/digests b/kernel/syno-purley-7.1/digests new file mode 100644 index 00000000000..252ce88ef03 --- /dev/null +++ b/kernel/syno-purley-7.1/digests @@ -0,0 +1,3 @@ +purley-linux-4.4.x.txz SHA1 8b09c8fbd4cc51dc496d11c6495917b6a2c42db3 +purley-linux-4.4.x.txz SHA256 af9abec3cc39ea36e3f64ef777662a1f8261980898df33222a6418a98732a04f +purley-linux-4.4.x.txz MD5 ff222a1fafe969dca69f34a77a6f6c7b diff --git a/kernel/syno-purley-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch b/kernel/syno-purley-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch new file mode 100644 index 00000000000..ed716296065 --- /dev/null +++ b/kernel/syno-purley-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch @@ -0,0 +1,11 @@ +--- scripts/dtc/dtc-parser.tab.c_shipped.orig 2021-02-17 07:10:09.000000000 +0000 ++++ scripts/dtc/dtc-parser.tab.c_shipped 2023-05-23 23:22:41.400125887 +0000 +@@ -1196,7 +1196,7 @@ int yychar; + /* The semantic value of the lookahead symbol. */ + YYSTYPE yylval; + /* Location data for the lookahead symbol. */ +-YYLTYPE yylloc ++//YYLTYPE yylloc + # if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL + = { 1, 1, 1, 1 } + # endif diff --git a/kernel/syno-purley-7.2/Makefile b/kernel/syno-purley-7.2/Makefile new file mode 100644 index 00000000000..3301ef3d0c3 --- /dev/null +++ b/kernel/syno-purley-7.2/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = purley +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.2 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-purley-7.2/digests b/kernel/syno-purley-7.2/digests new file mode 100644 index 00000000000..2e5cb92f9be --- /dev/null +++ b/kernel/syno-purley-7.2/digests @@ -0,0 +1,3 @@ +purley-linux-4.4.x.txz SHA1 df4fb5988e44c773a6c0fd850cd1b4b107a1d930 +purley-linux-4.4.x.txz SHA256 373c2c12e262638b404e62ddc650278bee9e0e350023cfe168130f73b8b5952f +purley-linux-4.4.x.txz MD5 f88bd34df0cc2472d5338116f688a11a diff --git a/kernel/syno-qoriq-6.2.4/Makefile b/kernel/syno-qoriq-6.2.4/Makefile index 45150fdd54f..55a53542d47 100644 --- a/kernel/syno-qoriq-6.2.4/Makefile +++ b/kernel/syno-qoriq-6.2.4/Makefile @@ -4,6 +4,7 @@ KERNEL_BUILD = 25556 KERNEL_DIST = linux-2.6.32 KERNEL_CONFIG = synoconfigs/ppcQorIQ KERNEL_BASE_ARCH = powerpc +KERNEL_URL_VERSION = 6.2 PRE_COMPILE_TARGET = kernel_ppc_premake include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-r1000-7.1/Makefile b/kernel/syno-r1000-7.1/Makefile new file mode 100644 index 00000000000..f1289e906fd --- /dev/null +++ b/kernel/syno-r1000-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = r1000 +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-r1000-7.1/digests b/kernel/syno-r1000-7.1/digests new file mode 100644 index 00000000000..9e794e08f4b --- /dev/null +++ b/kernel/syno-r1000-7.1/digests @@ -0,0 +1,3 @@ +r1000-linux-4.4.x.txz SHA1 23ed966508e4736bcaf43dba352711b0fa0b934e +r1000-linux-4.4.x.txz SHA256 f218605dada7767eaf2d52de50ba1af54cca71e2205825f46ac92a07b333a09a +r1000-linux-4.4.x.txz MD5 8c562a864882eed719c693f4faf0ba32 diff --git a/kernel/syno-r1000-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch b/kernel/syno-r1000-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch new file mode 100644 index 00000000000..ed716296065 --- /dev/null +++ b/kernel/syno-r1000-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch @@ -0,0 +1,11 @@ +--- scripts/dtc/dtc-parser.tab.c_shipped.orig 2021-02-17 07:10:09.000000000 +0000 ++++ scripts/dtc/dtc-parser.tab.c_shipped 2023-05-23 23:22:41.400125887 +0000 +@@ -1196,7 +1196,7 @@ int yychar; + /* The semantic value of the lookahead symbol. */ + YYSTYPE yylval; + /* Location data for the lookahead symbol. */ +-YYLTYPE yylloc ++//YYLTYPE yylloc + # if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL + = { 1, 1, 1, 1 } + # endif diff --git a/kernel/syno-r1000-7.2/Makefile b/kernel/syno-r1000-7.2/Makefile new file mode 100644 index 00000000000..855b53378ca --- /dev/null +++ b/kernel/syno-r1000-7.2/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = r1000 +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.2 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-r1000-7.2/digests b/kernel/syno-r1000-7.2/digests new file mode 100644 index 00000000000..81321d4b03e --- /dev/null +++ b/kernel/syno-r1000-7.2/digests @@ -0,0 +1,3 @@ +r1000-linux-4.4.x.txz SHA1 5af2c27545717e61a617223cedde1a3eec442a5b +r1000-linux-4.4.x.txz SHA256 e64154bd73c68dd3876eacadb05da7554161a69517f78564dd4f2cf9f6b459fb +r1000-linux-4.4.x.txz MD5 67c612ffed9a1e459379fd34fdbb589a diff --git a/kernel/syno-rtd1296-6.2.4/Makefile b/kernel/syno-rtd1296-6.2.4/Makefile index 222706247af..a1d47c2595a 100644 --- a/kernel/syno-rtd1296-6.2.4/Makefile +++ b/kernel/syno-rtd1296-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = arm64 +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-rtd1296-7.1/Makefile b/kernel/syno-rtd1296-7.1/Makefile new file mode 100644 index 00000000000..519b9019c2b --- /dev/null +++ b/kernel/syno-rtd1296-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = rtd1296 +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = arm64 +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-rtd1296-7.1/digests b/kernel/syno-rtd1296-7.1/digests new file mode 100644 index 00000000000..91080a55851 --- /dev/null +++ b/kernel/syno-rtd1296-7.1/digests @@ -0,0 +1,3 @@ +rtd1296-linux-4.4.x.txz SHA1 ada941d2c56cfdbd0c42eb9afdcfc2d9febd13b7 +rtd1296-linux-4.4.x.txz SHA256 f44392c870892e5c0b88eaddf9796fcbbee1785bcb7b48b8910bc23f91293b2f +rtd1296-linux-4.4.x.txz MD5 44f2594e785f9c74d4a6b1ae81e76221 diff --git a/kernel/syno-rtd1296-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch b/kernel/syno-rtd1296-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch new file mode 100644 index 00000000000..ed716296065 --- /dev/null +++ b/kernel/syno-rtd1296-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch @@ -0,0 +1,11 @@ +--- scripts/dtc/dtc-parser.tab.c_shipped.orig 2021-02-17 07:10:09.000000000 +0000 ++++ scripts/dtc/dtc-parser.tab.c_shipped 2023-05-23 23:22:41.400125887 +0000 +@@ -1196,7 +1196,7 @@ int yychar; + /* The semantic value of the lookahead symbol. */ + YYSTYPE yylval; + /* Location data for the lookahead symbol. */ +-YYLTYPE yylloc ++//YYLTYPE yylloc + # if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL + = { 1, 1, 1, 1 } + # endif diff --git a/kernel/syno-rtd1296-7.2/Makefile b/kernel/syno-rtd1296-7.2/Makefile new file mode 100644 index 00000000000..b5900c03696 --- /dev/null +++ b/kernel/syno-rtd1296-7.2/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = rtd1296 +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = arm64 +KERNEL_URL_VERSION = 7.2 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-rtd1296-7.2/digests b/kernel/syno-rtd1296-7.2/digests new file mode 100644 index 00000000000..befb797dc23 --- /dev/null +++ b/kernel/syno-rtd1296-7.2/digests @@ -0,0 +1,3 @@ +rtd1296-linux-4.4.x.txz SHA1 35dbb41704e671dfa35e39632c5b1605e856aaab +rtd1296-linux-4.4.x.txz SHA256 4c45cdcc1ba3f3403e2a617fe342c0e73bf3d809cdd9260d6b4d6708fa95daa0 +rtd1296-linux-4.4.x.txz MD5 4cb3e0f2b19e98699fcc5dfc9ac08d92 diff --git a/kernel/syno-rtd1619b-7.1/Makefile b/kernel/syno-rtd1619b-7.1/Makefile new file mode 100644 index 00000000000..cab628f1096 --- /dev/null +++ b/kernel/syno-rtd1619b-7.1/Makefile @@ -0,0 +1,9 @@ +KERNEL_ARCH = rtd1619b +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-5.10.x +KERNEL_BASE_ARCH = arm64 +KERNEL_URL_VERSION = 7.1.1 +KERNEL_CONFIG = synology/synoconfigs/$(KERNEL_ARCH) + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-rtd1619b-7.1/digests b/kernel/syno-rtd1619b-7.1/digests new file mode 100644 index 00000000000..93456284340 --- /dev/null +++ b/kernel/syno-rtd1619b-7.1/digests @@ -0,0 +1,3 @@ +rtd1619b-linux-5.10.x.txz SHA1 498812cccdcc9085b5c6ab7a999267fe56991406 +rtd1619b-linux-5.10.x.txz SHA256 264db1980acf4b259309eda45d5b873c7dffa7cb679fcf717c29ca31c4791023 +rtd1619b-linux-5.10.x.txz MD5 88a56c538ef14d6a66396552a0ee9e2b diff --git a/kernel/syno-rtd1619b-7.2/Makefile b/kernel/syno-rtd1619b-7.2/Makefile new file mode 100644 index 00000000000..5565c57e5e5 --- /dev/null +++ b/kernel/syno-rtd1619b-7.2/Makefile @@ -0,0 +1,9 @@ +KERNEL_ARCH = rtd1619b +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-5.10.x +KERNEL_BASE_ARCH = arm64 +KERNEL_URL_VERSION = 7.2 +KERNEL_CONFIG = synology/synoconfigs/$(KERNEL_ARCH) + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-rtd1619b-7.2/digests b/kernel/syno-rtd1619b-7.2/digests new file mode 100644 index 00000000000..d63a9804276 --- /dev/null +++ b/kernel/syno-rtd1619b-7.2/digests @@ -0,0 +1,3 @@ +rtd1619b-linux-5.10.x.txz SHA1 c7168b8b3e74ae5fb4204b6ed7184c2df7d34f03 +rtd1619b-linux-5.10.x.txz SHA256 4aeb3b50200ce82a9d46162e73058834d313e805a76eab3baecd902e9ad492d8 +rtd1619b-linux-5.10.x.txz MD5 9eafe2b55ed953ef2fb2e13880ddd272 diff --git a/kernel/syno-v1000-6.2.4/Makefile b/kernel/syno-v1000-6.2.4/Makefile index 52c631147b7..f9ffd9fce95 100644 --- a/kernel/syno-v1000-6.2.4/Makefile +++ b/kernel/syno-v1000-6.2.4/Makefile @@ -3,5 +3,6 @@ KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-4.4.x KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-v1000-7.1/Makefile b/kernel/syno-v1000-7.1/Makefile new file mode 100644 index 00000000000..3187167aa9b --- /dev/null +++ b/kernel/syno-v1000-7.1/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = v1000 +KERNEL_VERS = 7.1 +KERNEL_BUILD = 42962 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.1.1 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-v1000-7.1/digests b/kernel/syno-v1000-7.1/digests new file mode 100644 index 00000000000..1f166f8298d --- /dev/null +++ b/kernel/syno-v1000-7.1/digests @@ -0,0 +1,3 @@ +v1000-linux-4.4.x.txz SHA1 275bc9babc64fe7cfc24732bc98dd8035daf8d3e +v1000-linux-4.4.x.txz SHA256 2b6315a9ef3bec95cca5198fc8b69f1ce88e439bf6e51fe3c5005776dbe1c1a3 +v1000-linux-4.4.x.txz MD5 fa56a20b5a339ddb6eb39ce874c45a67 diff --git a/kernel/syno-v1000-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch b/kernel/syno-v1000-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch new file mode 100644 index 00000000000..ed716296065 --- /dev/null +++ b/kernel/syno-v1000-7.1/patches/001-remove-duplicate-YYLTYPE-yylloc-declaration.patch @@ -0,0 +1,11 @@ +--- scripts/dtc/dtc-parser.tab.c_shipped.orig 2021-02-17 07:10:09.000000000 +0000 ++++ scripts/dtc/dtc-parser.tab.c_shipped 2023-05-23 23:22:41.400125887 +0000 +@@ -1196,7 +1196,7 @@ int yychar; + /* The semantic value of the lookahead symbol. */ + YYSTYPE yylval; + /* Location data for the lookahead symbol. */ +-YYLTYPE yylloc ++//YYLTYPE yylloc + # if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL + = { 1, 1, 1, 1 } + # endif diff --git a/kernel/syno-v1000-7.2/Makefile b/kernel/syno-v1000-7.2/Makefile new file mode 100644 index 00000000000..552d8e2a596 --- /dev/null +++ b/kernel/syno-v1000-7.2/Makefile @@ -0,0 +1,8 @@ +KERNEL_ARCH = v1000 +KERNEL_VERS = 7.2 +KERNEL_BUILD = 64570 +KERNEL_DIST = linux-4.4.x +KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 7.2 + +include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-v1000-7.2/digests b/kernel/syno-v1000-7.2/digests new file mode 100644 index 00000000000..e7386edd10e --- /dev/null +++ b/kernel/syno-v1000-7.2/digests @@ -0,0 +1,3 @@ +v1000-linux-4.4.x.txz SHA1 1883346e2e2528610418386c31f561835a5b52c2 +v1000-linux-4.4.x.txz SHA256 b7456cc938719d2efc2688094bd1b92217288a107808856964c202b9d04100f0 +v1000-linux-4.4.x.txz MD5 59771d1c3e75e21b0261cd2ad7534873 diff --git a/kernel/syno-x64-6.2.4/Makefile b/kernel/syno-x64-6.2.4/Makefile index 88a0529a998..e34c84c612f 100644 --- a/kernel/syno-x64-6.2.4/Makefile +++ b/kernel/syno-x64-6.2.4/Makefile @@ -4,5 +4,6 @@ KERNEL_BUILD = 25556 KERNEL_DIST = linux-3.10.x KERNEL_CONFIG = synoconfigs/x86_64 KERNEL_BASE_ARCH = x86 +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/kernel/syno-x86-6.2.4/Makefile b/kernel/syno-x86-6.2.4/Makefile index f9174b727f0..e4d3a3d7b36 100644 --- a/kernel/syno-x86-6.2.4/Makefile +++ b/kernel/syno-x86-6.2.4/Makefile @@ -2,8 +2,9 @@ KERNEL_ARCH = x86 KERNEL_VERS = 6.2.4 KERNEL_BUILD = 25556 KERNEL_DIST = linux-3.10.x -KERNEL_URL_DIR = x64 KERNEL_CONFIG = synoconfigs/x86_64 KERNEL_BASE_ARCH = x86 +KERNEL_URL_DIR = x64 +KERNEL_URL_VERSION = 6.2 include ../../mk/spksrc.kernel.mk diff --git a/mk/spksrc.common-rules.mk b/mk/spksrc.common-rules.mk index 283ef7c1dbe..8b634138a00 100644 --- a/mk/spksrc.common-rules.mk +++ b/mk/spksrc.common-rules.mk @@ -36,6 +36,6 @@ include ../../mk/spksrc.dependency-tree.mk include ../../mk/spksrc.generate-digests.mk ### For make kernel-required -include ../../mk/spksrc.kernel.mk +include ../../mk/spksrc.kernel-required.mk ### diff --git a/mk/spksrc.common.mk b/mk/spksrc.common.mk index 614f3226e30..0ac7e8cfe24 100644 --- a/mk/spksrc.common.mk +++ b/mk/spksrc.common.mk @@ -54,7 +54,6 @@ AVAILABLE_TCVERSIONS = $(sort $(foreach arch,$(AVAILABLE_TOOLCHAINS),$(shell ech # Available toolchains formatted as '{ARCH}-{TC}' AVAILABLE_KERNEL = $(subst syno-,,$(sort $(notdir $(wildcard $(BASEDIR)kernel/syno-*)))) AVAILABLE_KERNEL_VERSIONS = $(sort $(foreach arch,$(AVAILABLE_KERNEL),$(shell echo ${arch} | cut -f2 -d'-'))) -SUPPORTED_KERNEL_VERSIONS = 6.2.4 7.0 # Global arch definitions include $(BASEDIR)mk/spksrc.archs.mk diff --git a/mk/spksrc.cross-env.mk b/mk/spksrc.cross-env.mk index 61b94ea9626..78fa3cb1a2c 100644 --- a/mk/spksrc.cross-env.mk +++ b/mk/spksrc.cross-env.mk @@ -4,6 +4,12 @@ ENV += PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR) ENV += WORK_DIR=$(WORK_DIR) ENV += INSTALL_PREFIX=$(INSTALL_PREFIX) +# Ensure toolchain is always built in its directory +# Affected by kernel-modules which otherwise change +# the value of WORK_DIR to build modules locally +TC_WORK_DIR=$(abspath $(WORK_DIR)/../../../toolchain/$(TC)/work) +ENV += TC_WORK_DIR=$(TC_WORK_DIR) + ifeq ($(strip $(REQUIRE_KERNEL)),1) ENV += REQUIRE_KERNEL_MODULE="$(REQUIRE_KERNEL_MODULE)" KERNEL_ROOT = $(WORK_DIR)/linux @@ -35,21 +41,21 @@ $(TC_VARS_MK): $(create_target_dir) ifeq ($(strip $(MAKECMDGOALS)),download) @$(MSG) "Downloading toolchain" - @if env $(MAKE) --no-print-directory -C ../../toolchain/$(TC) download ; \ + @if env $(MAKE) WORK_DIR=$(TC_WORK_DIR) --no-print-directory -C ../../toolchain/$(TC) download ; \ then \ - env $(MAKE) --no-print-directory -C ../../toolchain/$(TC) tc_vars > $(TC_VARS_MK) ; \ - env $(MAKE) --no-print-directory -C ../../toolchain/$(TC) cmake_vars > $(TC_VARS_CMAKE) ; \ - env $(MAKE) --no-print-directory -C ../../toolchain/$(TC) meson_vars > $(TC_VARS_MESON) ; \ + env $(MAKE) WORK_DIR=$(TC_WORK_DIR) --no-print-directory -C ../../toolchain/$(TC) tc_vars > $(TC_VARS_MK) ; \ + env $(MAKE) WORK_DIR=$(TC_WORK_DIR) --no-print-directory -C ../../toolchain/$(TC) cmake_vars > $(TC_VARS_CMAKE) ; \ + env $(MAKE) WORK_DIR=$(TC_WORK_DIR) --no-print-directory -C ../../toolchain/$(TC) meson_vars > $(TC_VARS_MESON) ; \ else \ echo "$$""(error An error occured while downloading the toolchain, please check the messages above)" > $@; \ fi else @$(MSG) "Setting-up toolchain " - @if env $(MAKE) --no-print-directory -C ../../toolchain/$(TC) ; \ + @if env $(MAKE) WORK_DIR=$(TC_WORK_DIR) --no-print-directory -C ../../toolchain/$(TC) ; \ then \ - env $(MAKE) --no-print-directory -C ../../toolchain/$(TC) tc_vars > $(TC_VARS_MK) ; \ - env $(MAKE) --no-print-directory -C ../../toolchain/$(TC) cmake_vars > $(TC_VARS_CMAKE) ; \ - env $(MAKE) --no-print-directory -C ../../toolchain/$(TC) meson_vars > $(TC_VARS_MESON) ; \ + env $(MAKE) WORK_DIR=$(TC_WORK_DIR) --no-print-directory -C ../../toolchain/$(TC) tc_vars > $(TC_VARS_MK) ; \ + env $(MAKE) WORK_DIR=$(TC_WORK_DIR) --no-print-directory -C ../../toolchain/$(TC) cmake_vars > $(TC_VARS_CMAKE) ; \ + env $(MAKE) WORK_DIR=$(TC_WORK_DIR) --no-print-directory -C ../../toolchain/$(TC) meson_vars > $(TC_VARS_MESON) ; \ else \ echo "$$""(error An error occured while setting up the toolchain, please check the messages above)" > $@; \ fi diff --git a/mk/spksrc.cross-kernel-configure.mk b/mk/spksrc.cross-kernel-configure.mk index d73f55c4d13..0b17afb33db 100644 --- a/mk/spksrc.cross-kernel-configure.mk +++ b/mk/spksrc.cross-kernel-configure.mk @@ -44,11 +44,11 @@ pre_kernel_configure_target: kernel_configure_msg kernel_configure_target: $(PRE_KERNEL_CONFIGURE_TARGET) @$(MSG) "Updating kernel Makefile" - @$(RUN) sed -i -r 's,^CROSS_COMPILE\s*.+,CROSS_COMPILE\t= $(TC_PATH)$(TC_PREFIX),' Makefile - @$(RUN) sed -i -r 's,^ARCH\s*.+,ARCH\t= $(KERNEL_ARCH),' Makefile + @$(RUN) sed -r 's,^ARCH[^_]\s*.+,ARCH\t\t= $(KERNEL_ARCH),' -i.ARCH.orig Makefile + @$(RUN) sed -r -e '/^ARCH/a\' -e 'CROSS_COMPILE\t= $(TC_PATH)$(TC_PREFIX)' -i.CROSS_COMPILE.orig Makefile # Add "+" to EXTRAVERSION for kernels version >= 4.4 ifeq ($(call version_ge, ${TC_KERNEL}, 4.4),1) - @$(RUN) sed -i -r -e 's,^EXTRAVERSION\s*.+,&+,' -e 's,=\+,= \+,' Makefile + @$(RUN) sed -r -e 's,^EXTRAVERSION\s*.+,&+,' -e 's,=\+,= \+,' -i Makefile endif @test -e $(WORK_DIR)/arch/$(KERNEL_ARCH) || $(RUN) ln -sf $(KERNEL_BASE_ARCH) arch/$(KERNEL_ARCH) @$(MSG) "Cleaning the kernel source" diff --git a/mk/spksrc.cross-kernel.mk b/mk/spksrc.cross-kernel.mk deleted file mode 100644 index 882259003c9..00000000000 --- a/mk/spksrc.cross-kernel.mk +++ /dev/null @@ -1,83 +0,0 @@ -# Common makefiles -include ../../mk/spksrc.common.mk -include ../../mk/spksrc.directories.mk - -# Common kernel variables -include ../../mk/spksrc.cross-kernel-flags.mk - -# Configure the included makefiles -NAME = $(KERNEL_NAME) -URLS = $(KERNEL_DIST_SITE)/$(KERNEL_DIST_NAME) -COOKIE_PREFIX = $(PKG_NAME)- - -ifneq ($(strip $(REQUIRE_KERNEL_MODULE)),) -PKG_NAME = linux-$(subst syno-,,$(NAME)) -PKG_DIR = $(PKG_NAME) -else -PKG_NAME = linux -PKG_DIR = $(PKG_NAME) -endif - -ifneq ($(KERNEL_DIST_FILE),) -LOCAL_FILE = $(KERNEL_DIST_FILE) -# download.mk uses PKG_DIST_FILE -PKG_DIST_FILE = $(KERNEL_DIST_FILE) -else -LOCAL_FILE = $(KERNEL_DIST_NAME) -endif -DISTRIB_DIR = $(KERNEL_DIR)/$(KERNEL_VERS) -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) - -##### - -# Prior to interacting with the kernel files -# move the kernel source tree to its final destination -POST_EXTRACT_TARGET = kernel_post_extract_target - -# By default do not install kernel headers -INSTALL_TARGET = nop - -##### - -TC ?= syno-$(KERNEL_ARCH)-$(KERNEL_VERS) - -##### - -include ../../mk/spksrc.cross-env.mk - -include ../../mk/spksrc.download.mk - -checksum: download -include ../../mk/spksrc.checksum.mk - -extract: checksum -include ../../mk/spksrc.extract.mk - -patch: extract -include ../../mk/spksrc.patch.mk - -kernel_configure: patch -include ../../mk/spksrc.cross-kernel-configure.mk - -kernel_module: kernel_configure -include ../../mk/spksrc.cross-kernel-module.mk - -install: kernel_module -include ../../mk/spksrc.cross-kernel-headers.mk - -install: kernel_headers -include ../../mk/spksrc.install.mk - -plist: install -include ../../mk/spksrc.plist.mk - -### For make digests -include ../../mk/spksrc.generate-digests.mk - -.PHONY: kernel_post_extract_target -kernel_post_extract_target: - mv $(WORK_DIR)/$(KERNEL_DIST) $(WORK_DIR)/$(PKG_DIR) - -all: install plist diff --git a/mk/spksrc.depend.mk b/mk/spksrc.depend.mk index 7bfd73f3ccf..29d705c5768 100644 --- a/mk/spksrc.depend.mk +++ b/mk/spksrc.depend.mk @@ -12,6 +12,9 @@ # REQUIRE_TOOLKIT If set, will download and extract matching toolkit # BUILD_DEPENDS List of dependencies to go through, PLIST is ignored +### For managing kernel modules dependent builds +include ../../mk/spksrc.kernel-modules.mk + DEPEND_COOKIE = $(WORK_DIR)/.$(COOKIE_PREFIX)depend_done ifeq ($(strip $(PRE_DEPEND_TARGET)),) @@ -36,23 +39,20 @@ else TOOLKIT_DEPEND = toolkit/syno-$(ARCH)-$(TCVERSION) endif -ifeq ($(strip $(REQUIRE_KERNEL)),) -KERNEL_DEPEND = -else -KERNEL_DEPEND = kernel/syno-$(ARCH)-$(TCVERSION) -ifneq ($(strip $(REQUIRE_KERNEL_MODULE)),) -KERNEL_MODULE_DEPEND = $(filter-out $(GENERIC_ARCHS),$(addprefix kernel/syno-,$(filter $(addprefix %-,$(filter $(firstword $(subst ., ,$(TCVERSION))).%,$(SUPPORTED_KERNEL_VERSIONS))),$(filter-out $(addsuffix -%,$(UNSUPPORTED_ARCHS)),$(LEGACY_ARCHS))))) -endif -endif - depend_msg_target: @$(MSG) "Processing dependencies of $(NAME)" pre_depend_target: depend_msg_target depend_target: $(PRE_DEPEND_TARGET) +ifneq ($(strip $(REQUIRE_KERNEL_MODULE)),) +# As depend is also ran at toolchain-time, ensure to skip kernel-modules +ifeq ($(filter toolchain,$(shell basename $(abspath $(CURDIR)/../))),) +depend_target: kernel-modules +endif +endif @set -e; \ - for depend in $(BUILD_DEPENDS) $(KERNEL_DEPEND) $(TOOLKIT_DEPEND) $(DEPENDS); \ + for depend in $(BUILD_DEPENDS) $(TOOLKIT_DEPEND) $(DEPENDS); \ do \ env $(ENV) $(MAKE) -C ../../$$depend ; \ done diff --git a/mk/spksrc.dependency-tree.mk b/mk/spksrc.dependency-tree.mk index ccd1f7f981a..4f6c31c86a8 100644 --- a/mk/spksrc.dependency-tree.mk +++ b/mk/spksrc.dependency-tree.mk @@ -44,8 +44,4 @@ dependency-flat: DEPENDENCY_WALK=1 $(MAKE) -s -C ../../$$depend dependency-flat ; \ done - -.PHONY: dependency-kernel-list -dependency-kernel-list: - @echo -n "$(NAME): " - @echo "$(KERNEL_MODULE_DEPEND)" +### diff --git a/mk/spksrc.kernel-env.mk b/mk/spksrc.kernel-env.mk new file mode 100644 index 00000000000..2e3e1071db3 --- /dev/null +++ b/mk/spksrc.kernel-env.mk @@ -0,0 +1,27 @@ +### + +# Find the kernel architecture being processed +KO_ARCH = $(or $(ARCH),$(firstword $(subst -, ,$*))) +KO_TCVERSION = $(or $(TCVERSION),$(word 2,$(subst -, ,$*))) + +ifeq ($(strip $(REQUIRE_KERNEL)),1) + +ifneq ($(strip $(REQUIRE_KERNEL_MODULE)),) +ENV += REQUIRE_KERNEL_MODULE="$(REQUIRE_KERNEL_MODULE)" + +# Add to the dependency list if not a generic arch +ifneq ($(findstring $(KO_ARCH),$(GENERIC_ARCHS)),$(KO_ARCH)) +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)) +endif + +# end REQUIRE_KERNEL_MODULE +endif + +# end REQUIRE_KERNEL +endif + +### diff --git a/mk/spksrc.cross-kernel-flags.mk b/mk/spksrc.kernel-flags.mk similarity index 94% rename from mk/spksrc.cross-kernel-flags.mk rename to mk/spksrc.kernel-flags.mk index 9f06afb9423..b904438e1fd 100644 --- a/mk/spksrc.cross-kernel-flags.mk +++ b/mk/spksrc.kernel-flags.mk @@ -34,7 +34,11 @@ endif # ifeq ($(shell expr "$(KERNEL_BUILD)" \>= 25556),1) -KERNEL_DIST_SITE = https://global.download.synology.com/download/ToolChain/Synology%20NAS%20GPL%20Source/$(firstword $(subst ., ,$(TC_VERS))).$(word 2,$(subst ., ,$(TC_VERS)))-$(KERNEL_BUILD)/$(KERNEL_URL_DIR) +ifeq ($(KERNEL_URL_VERSION),) +KERNEL_URL_VERSION = $(KERNEL_VERS) +endif + +KERNEL_DIST_SITE = https://global.download.synology.com/download/ToolChain/Synology%20NAS%20GPL%20Source/$(KERNEL_URL_VERSION)-$(KERNEL_BUILD)/$(KERNEL_URL_DIR) ifeq ($(strip $(KERNEL_DIST_NAME)),) KERNEL_DIST_NAME = $(KERNEL_DIST).$(KERNEL_EXT) diff --git a/mk/spksrc.kernel-modules.mk b/mk/spksrc.kernel-modules.mk new file mode 100644 index 00000000000..aa2d8e12f2b --- /dev/null +++ b/mk/spksrc.kernel-modules.mk @@ -0,0 +1,27 @@ +#### + +# kernel arch definitions +include $(BASEDIR)mk/spksrc.kernel-env.mk + +### + +kernel-modules: + @set -e; \ + $(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 ; \ + $(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) \ + 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 ; \ + $(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} ; \ + done ; \ + rsync -ah work$(ARCH_SUFFIX)/tc_vars-backup/tc_vars* work$(ARCH_SUFFIX)/. + +### diff --git a/mk/spksrc.kernel-required.mk b/mk/spksrc.kernel-required.mk new file mode 100644 index 00000000000..fe0c7193120 --- /dev/null +++ b/mk/spksrc.kernel-required.mk @@ -0,0 +1,23 @@ +### + +KERNEL_REQUIRED = $(MAKE) kernel-required +ifeq ($(strip $(KERNEL_REQUIRED)),) +ALL_ACTION = $(sort $(basename $(subst -,.,$(basename $(subst .,,$(ARCHS_WITH_KERNEL_SUPPORT)))))) +endif + +#### used as subroutine to test whether any dependency has REQUIRE_KERNEL defined + +.PHONY: kernel-required +kernel-required: + @if [ -n "$(REQUIRE_KERNEL)" -o -n "$(REQUIRE_KERNEL_MODULE)" ]; then \ + exit 1 ; \ + fi + @for depend in $(BUILD_DEPENDS) $(DEPENDS) ; do \ + if $(MAKE) --no-print-directory -C ../../$$depend kernel-required >/dev/null 2>&1 ; then \ + exit 0 ; \ + else \ + exit 1 ; \ + fi ; \ + done + +#### diff --git a/mk/spksrc.kernel.mk b/mk/spksrc.kernel.mk index 24d90bc9ec6..c8b01577a87 100644 --- a/mk/spksrc.kernel.mk +++ b/mk/spksrc.kernel.mk @@ -1,47 +1,88 @@ -### -KERNEL_REQUIRED = $(MAKE) kernel-required -ifeq ($(strip $(KERNEL_REQUIRED)),) -ALL_ACTION = $(sort $(basename $(subst -,.,$(basename $(subst .,,$(ARCHS_WITH_KERNEL_SUPPORT)))))) +# Constants +default: all + +# Common makefiles +include ../../mk/spksrc.common.mk +include ../../mk/spksrc.common-rules.mk +include ../../mk/spksrc.directories.mk + +# Common kernel variables +include ../../mk/spksrc.kernel-flags.mk + +# Configure the included makefiles +NAME = $(KERNEL_NAME) +URLS = $(KERNEL_DIST_SITE)/$(KERNEL_DIST_NAME) +COOKIE_PREFIX = $(PKG_NAME)- + +ifneq ($(strip $(REQUIRE_KERNEL_MODULE)),) +PKG_NAME = linux-$(subst syno-,,$(NAME)) +PKG_DIR = $(PKG_NAME) +else +PKG_NAME = linux +PKG_DIR = $(PKG_NAME) +endif + +ifneq ($(KERNEL_DIST_FILE),) +LOCAL_FILE = $(KERNEL_DIST_FILE) +# download.mk uses PKG_DIST_FILE +PKG_DIST_FILE = $(KERNEL_DIST_FILE) +else +LOCAL_FILE = $(KERNEL_DIST_NAME) endif +DISTRIB_DIR = $(KERNEL_DIR)/$(KERNEL_VERS) +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) + +##### + +# Prior to interacting with the kernel files +# move the kernel source tree to its final destination +POST_EXTRACT_TARGET = kernel_post_extract_target + +# By default do not install kernel headers +INSTALL_TARGET = nop + +##### + +TC ?= syno-$(KERNEL_ARCH)-$(KERNEL_VERS) + +##### + +include ../../mk/spksrc.cross-env.mk + +include ../../mk/spksrc.download.mk + +checksum: download +include ../../mk/spksrc.checksum.mk + +extract: checksum +include ../../mk/spksrc.extract.mk + +patch: extract +include ../../mk/spksrc.patch.mk + +kernel_configure: patch +include ../../mk/spksrc.cross-kernel-configure.mk + +kernel_module: kernel_configure +include ../../mk/spksrc.cross-kernel-module.mk + +install: kernel_module +include ../../mk/spksrc.cross-kernel-headers.mk + +install: kernel_headers +include ../../mk/spksrc.install.mk + +plist: install +include ../../mk/spksrc.plist.mk + +### For make digests +include ../../mk/spksrc.generate-digests.mk + +.PHONY: kernel_post_extract_target +kernel_post_extract_target: + mv $(WORK_DIR)/$(KERNEL_DIST) $(WORK_DIR)/$(PKG_DIR) -#### used as subroutine to test whether any dependency has REQUIRE_KERNEL defined - -.PHONY: kernel-required -kernel-required: - @if [ -n "$(REQUIRE_KERNEL)" -o -n "$(REQUIRE_KERNEL_MODULE)" ]; then \ - exit 1 ; \ - fi - @for depend in $(BUILD_DEPENDS) $(DEPENDS) ; do \ - if $(MAKE) --no-print-directory -C ../../$$depend kernel-required >/dev/null 2>&1 ; then \ - exit 0 ; \ - else \ - exit 1 ; \ - fi ; \ - done - -#### - -kernel-modules-%: SHELL:=/bin/bash -kernel-modules-%: - @if [ "$(filter $(DEFAULT_TC),lastword $(subst -, ,$(MAKECMDGOALS)))" ]; then \ - archs2process="$(filter $(addprefix %-,$(SUPPORTED_KERNEL_VERSIONS)),$(filter $(addsuffix -$(word 1,$(subst ., ,$(word 2,$(subst -, ,$*))))%,$(shell sed -n -e '/TC_ARCH/ s/.*= *//p' ../../toolchain/syno-$*/Makefile)), $(LEGACY_ARCHS)))" ; \ - elif [ "$(filter $(GENERIC_ARCHS),$(subst -, ,$(MAKECMDGOALS)))" ]; then \ - archs2process="$(filter $(addprefix %-,$(lastword $(subst -, ,$(MAKECMDGOALS)))),$(filter $(addsuffix -$(word 1,$(subst ., ,$(word 2,$(subst -, ,$*))))%,$(shell sed -n -e '/TC_ARCH/ s/.*= *//p' ../../toolchain/syno-$*/Makefile)), $(LEGACY_ARCHS)))" ; \ - else \ - archs2process=$* ; \ - fi ; \ - $(MSG) ARCH to be processed: $${archs2process} ; \ - set -e ; \ - for arch in $${archs2process} ; do \ - $(MSG) "Processing $${arch} ARCH" ; \ - MAKEFLAGS= $(PSTAT_TIME) $(MAKE) WORK_DIR=$(CURDIR)/work-$* ARCH=$$(echo $${arch} | cut -f1 -d-) TCVERSION=$$(echo $${arch} | cut -f2 -d-) strip 2>&1 | tee --append build-$*-kernel-modules.log ; \ - [ $${PIPESTATUS[0]} -eq 0 ] || false ; \ - $(MAKE) spkclean ; \ - rm -fr $(CURDIR)/work-$*/$(addprefix linux-, $${arch}) ; \ - $(MAKE) -C ../../toolchain/syno-$${arch} clean ; \ - done - -kernel-arch-%: - $(MAKE) $(addprefix kernel-modules-, $(or $(filter $(addprefix %, $(DEFAULT_TC)), $(filter %$(word 2,$(subst -, ,$*)), $(filter $(firstword $(subst -, ,$*))%, $(AVAILABLE_TOOLCHAINS)))),$*)) - $(MAKE) REQUIRE_KERNEL_MODULE= REQUIRE_KERNEL= WORK_DIR=$(CURDIR)/work-$* $(addprefix build-arch-, $*) +all: install plist diff --git a/mk/spksrc.spk.mk b/mk/spksrc.spk.mk index f5219946e99..10f7d9e87fb 100644 --- a/mk/spksrc.spk.mk +++ b/mk/spksrc.spk.mk @@ -513,6 +513,7 @@ spkclean: work-*/staging \ work-*/tc_vars.mk \ work-*/tc_vars.cmake \ + work-*/tc_vars.meson \ work-*/package.tgz \ work-*/INFO \ work-*/PLIST \ diff --git a/mk/spksrc.supported.mk b/mk/spksrc.supported.mk index 9c64329de5f..b91de7fc2bb 100644 --- a/mk/spksrc.supported.mk +++ b/mk/spksrc.supported.mk @@ -59,11 +59,7 @@ pre-build-native: $(TARGET_TYPE)-arch-% &: pre-build-native -@MAKEFLAGS= GCC_DEBUG_INFO="$(GCC_DEBUG_INFO)" $(MAKE) arch-$* -ifneq ($(strip $(REQUIRE_KERNEL_MODULE)),) -arch-% &: kernel-arch-% -else arch-%: -endif $(PSTAT_TIME) $(MAKE) $(addprefix build-arch-, $(or $(filter $(addprefix %, $(DEFAULT_TC)), $(filter %$(word 2,$(subst -, ,$*)), $(filter $(firstword $(subst -, ,$*))%, $(AVAILABLE_TOOLCHAINS)))),$*)) | tee --append build-$*.log #### diff --git a/mk/spksrc.test-rules.mk b/mk/spksrc.test-rules.mk index df4a32c9d9b..36193433d1e 100644 --- a/mk/spksrc.test-rules.mk +++ b/mk/spksrc.test-rules.mk @@ -48,7 +48,6 @@ test-all: test-ffmpeg test-info: @echo SUPPORTED_ARCHS: $(SUPPORTED_ARCHS) @echo LATEST_ARCHS: $(LATEST_ARCHS) - @echo SUPPORTED_KERNEL_VERSIONS: $(SUPPORTED_KERNEL_VERSIONS) # Testing against toolchain and simple build use-cases # Process 'clean' on toolchains at the end as otherwise rebuilt diff --git a/spk/synokernel-cdrom/Makefile b/spk/synokernel-cdrom/Makefile index a3d59a633d0..876ee747bc8 100644 --- a/spk/synokernel-cdrom/Makefile +++ b/spk/synokernel-cdrom/Makefile @@ -1,6 +1,6 @@ SPK_NAME = synokernel-cdrom -SPK_VERS = 1.1 -SPK_REV = 2 +SPK_VERS = 1.3 +SPK_REV = 3 SPK_ICON = src/$(SPK_NAME).png DEPENDS = @@ -11,9 +11,9 @@ 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. Synology kernel CD-ROM drivers
2. Update kernel module build framework
3. Fixes for many unsupported archs" +CHANGELOG = "1. Support DSM-7.1 and DSM-7.2" -UNSUPPORTED_ARCHS = $(PPC_ARCHS) +UNSUPPORTED_ARCHS = $(PPC_ARCHS) epyc7002 STARTABLE = no DISPLAY_NAME = SynoKernel USB CD-ROM drivers diff --git a/spk/synokernel-usbserial/Makefile b/spk/synokernel-usbserial/Makefile index 04aa23e8c2c..037c5a4a62d 100644 --- a/spk/synokernel-usbserial/Makefile +++ b/spk/synokernel-usbserial/Makefile @@ -1,6 +1,6 @@ SPK_NAME = synokernel-usbserial -SPK_VERS = 1.1 -SPK_REV = 8 +SPK_VERS = 1.2 +SPK_REV = 9 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. Synology Kernel USB serial drivers
2. Update kernel module build framework
3. Fixes for many unsupported archs" +CHANGELOG = "1. Support DSM-7.1 and DSM-7.2" -UNSUPPORTED_ARCHS = $(PPC_ARCHS) +UNSUPPORTED_ARCHS = $(PPC_ARCHS) epyc7002 STARTABLE = no DISPLAY_NAME = SynoKernel USB Serial drivers From 488bab23f6484d538029e83c397478b1cdba9fac Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Mon, 15 Apr 2024 14:05:10 -0700 Subject: [PATCH 34/45] new package libarchive --- cross/libarchive/Makefile | 21 +++++++++++++++++++++ cross/libarchive/PLIST | 7 +++++++ cross/libarchive/digests | 3 +++ 3 files changed, 31 insertions(+) create mode 100644 cross/libarchive/Makefile create mode 100644 cross/libarchive/PLIST create mode 100644 cross/libarchive/digests diff --git a/cross/libarchive/Makefile b/cross/libarchive/Makefile new file mode 100644 index 00000000000..722ad8004ec --- /dev/null +++ b/cross/libarchive/Makefile @@ -0,0 +1,21 @@ +PKG_NAME = libarchive +PKG_VERS = 3.7.3 + +PKG_DIST_SITE = https://github.com/libarchive/libarchive/archive +PKG_EXT = tar.gz +PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) +PKG_DIR = $(PKG_NAME)-$(PKG_VERS) + +COMMENT = Multi-format archive and compression library +HOMEPAGE = https://www.libarchive.org/ +#LICENSE = https://github.com/libarchive/libarchive/blob/master/COPYING + +BUILD_DEPENDS = cross/openssl3 + +PRE_CONFIGURE_TARGET = libarchive_pre_configure + +include ../../mk/spksrc.cross-cc.mk + +.PHONY: libarchive_pre_configure +libarchive_pre_configure: + $(RUN) build/autogen.sh diff --git a/cross/libarchive/PLIST b/cross/libarchive/PLIST new file mode 100644 index 00000000000..8e3b0ad75d9 --- /dev/null +++ b/cross/libarchive/PLIST @@ -0,0 +1,7 @@ +bin:bin/bsdcat +bin:bin/bsdcpio +bin:bin/bsdtar +bin:bin/bsdunzip +lib:lib/libarchive.so +lib:lib/libarchive.so.13 +lib:lib/libarchive.so.13.7.3 diff --git a/cross/libarchive/digests b/cross/libarchive/digests new file mode 100644 index 00000000000..cdb15d4b5bb --- /dev/null +++ b/cross/libarchive/digests @@ -0,0 +1,3 @@ +v3.7.3.tar.gz SHA1 9a68d48cc805f09da6640af06fe68cb4ff330a06 +v3.7.3.tar.gz SHA256 7c03c1102e081408778d0ca4dbd9083ba4f82fe7ac6b29e9fe3cc9a62f329f2a +v3.7.3.tar.gz MD5 28af2de59fe960027a1db597c2aa9415 From 439e4508321bc5554fc478b20d48ce4820261544 Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Mon, 15 Apr 2024 14:44:52 -0700 Subject: [PATCH 35/45] First pass at spk build - also fix license --- cross/libarchive/Makefile | 2 +- spk/libarchive/Makefile | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 spk/libarchive/Makefile diff --git a/cross/libarchive/Makefile b/cross/libarchive/Makefile index 722ad8004ec..2aa4763bfad 100644 --- a/cross/libarchive/Makefile +++ b/cross/libarchive/Makefile @@ -8,7 +8,7 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS) COMMENT = Multi-format archive and compression library HOMEPAGE = https://www.libarchive.org/ -#LICENSE = https://github.com/libarchive/libarchive/blob/master/COPYING +LICENSE = 3-Clause BSD BUILD_DEPENDS = cross/openssl3 diff --git a/spk/libarchive/Makefile b/spk/libarchive/Makefile new file mode 100644 index 00000000000..52e53e9ed31 --- /dev/null +++ b/spk/libarchive/Makefile @@ -0,0 +1,19 @@ +SPK_NAME = libarchive +SPK_VERS = 3.7.3 +SPK_REV = 0 +#SPK_ICON = src/libarchive.png + +#DISPLAY_NAME = libarchive +DESCRIPTION = Multi-format archive and compression library +HOMEPAGE = https://www.libarchive.org/ +LICENSE = 3-Clause BSD +MAINTAINER = dotysan + +DEPENDS = cross/$(SPK_NAME) +STARTABLE = no +#REQUIRED_MIN_DSM = 7.0 +#UNSUPPORTED_ARCHS = comcerto2k +# do we need to symlink in the bin stuff? +#SPK_COMMANDS = bin/gpac bin/MP4Box + +include ../../mk/spksrc.spk.mk From 9fd37a51c6759656782f99475e6abc7190cfb711 Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Tue, 16 Apr 2024 12:28:56 -0700 Subject: [PATCH 36/45] libarchive is not a pkg but just a depdendency - build from pre-configured tarball instead of raw source - which seems to support GNU configure - libcrytpo is runtime dependency - don't include bsd* cli; just shared object only --- cross/libarchive/Makefile | 14 +++++--------- cross/libarchive/PLIST | 4 ---- cross/libarchive/digests | 6 +++--- spk/libarchive/Makefile | 19 ------------------- 4 files changed, 8 insertions(+), 35 deletions(-) delete mode 100644 spk/libarchive/Makefile diff --git a/cross/libarchive/Makefile b/cross/libarchive/Makefile index 2aa4763bfad..19ed0b2bed3 100644 --- a/cross/libarchive/Makefile +++ b/cross/libarchive/Makefile @@ -1,21 +1,17 @@ PKG_NAME = libarchive PKG_VERS = 3.7.3 -PKG_DIST_SITE = https://github.com/libarchive/libarchive/archive -PKG_EXT = tar.gz -PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://github.com/libarchive/$(PKG_NAME)/releases/download/v$(PKG_VERS) +PKG_EXT = tar.xz +PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) COMMENT = Multi-format archive and compression library HOMEPAGE = https://www.libarchive.org/ LICENSE = 3-Clause BSD -BUILD_DEPENDS = cross/openssl3 +DEPENDS = cross/openssl3 -PRE_CONFIGURE_TARGET = libarchive_pre_configure +GNU_CONFIGURE = 1 include ../../mk/spksrc.cross-cc.mk - -.PHONY: libarchive_pre_configure -libarchive_pre_configure: - $(RUN) build/autogen.sh diff --git a/cross/libarchive/PLIST b/cross/libarchive/PLIST index 8e3b0ad75d9..97c2b76763e 100644 --- a/cross/libarchive/PLIST +++ b/cross/libarchive/PLIST @@ -1,7 +1,3 @@ -bin:bin/bsdcat -bin:bin/bsdcpio -bin:bin/bsdtar -bin:bin/bsdunzip lib:lib/libarchive.so lib:lib/libarchive.so.13 lib:lib/libarchive.so.13.7.3 diff --git a/cross/libarchive/digests b/cross/libarchive/digests index cdb15d4b5bb..fac4ca6679d 100644 --- a/cross/libarchive/digests +++ b/cross/libarchive/digests @@ -1,3 +1,3 @@ -v3.7.3.tar.gz SHA1 9a68d48cc805f09da6640af06fe68cb4ff330a06 -v3.7.3.tar.gz SHA256 7c03c1102e081408778d0ca4dbd9083ba4f82fe7ac6b29e9fe3cc9a62f329f2a -v3.7.3.tar.gz MD5 28af2de59fe960027a1db597c2aa9415 +libarchive-3.7.3.tar.xz SHA1 67d722171cc3552ecd7fccd05934e8de4596c02b +libarchive-3.7.3.tar.xz SHA256 63e7a7174638fc7d6b79b4c8b0ad954e0f4f45abe7239c1ecb200232aa9a43d2 +libarchive-3.7.3.tar.xz MD5 b60683739a16ff6f00f32aa3516402ed diff --git a/spk/libarchive/Makefile b/spk/libarchive/Makefile deleted file mode 100644 index 52e53e9ed31..00000000000 --- a/spk/libarchive/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -SPK_NAME = libarchive -SPK_VERS = 3.7.3 -SPK_REV = 0 -#SPK_ICON = src/libarchive.png - -#DISPLAY_NAME = libarchive -DESCRIPTION = Multi-format archive and compression library -HOMEPAGE = https://www.libarchive.org/ -LICENSE = 3-Clause BSD -MAINTAINER = dotysan - -DEPENDS = cross/$(SPK_NAME) -STARTABLE = no -#REQUIRED_MIN_DSM = 7.0 -#UNSUPPORTED_ARCHS = comcerto2k -# do we need to symlink in the bin stuff? -#SPK_COMMANDS = bin/gpac bin/MP4Box - -include ../../mk/spksrc.spk.mk From 2185371a1abfaf954d767b39252ce32d65485130 Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Tue, 16 Apr 2024 13:41:49 -0700 Subject: [PATCH 37/45] new DIY package: pixz - patched to allow cross-compile --- cross/pixz/Makefile | 39 +++++++++++++++++++ cross/pixz/PLIST | 1 + cross/pixz/digests | 3 ++ ...1-configure.ac-replace-AC_CHECK_FILE.patch | 31 +++++++++++++++ diyspk/pixz/Makefile | 17 ++++++++ 5 files changed, 91 insertions(+) create mode 100644 cross/pixz/Makefile create mode 100644 cross/pixz/PLIST create mode 100644 cross/pixz/digests create mode 100644 cross/pixz/patches/0001-configure.ac-replace-AC_CHECK_FILE.patch create mode 100644 diyspk/pixz/Makefile diff --git a/cross/pixz/Makefile b/cross/pixz/Makefile new file mode 100644 index 00000000000..4c862f8a705 --- /dev/null +++ b/cross/pixz/Makefile @@ -0,0 +1,39 @@ +PKG_NAME = pixz +PKG_REPO = https://github.com/vasi/$(PKG_NAME) + +PKG_VERS = 1.0.7 +# above will break cross-compile https://github.com/vasi/pixz/issues/67 +# - patch: https://github.com/vasi/pixz/commit/4ddfdca8416a008819d08d14d6a6f4796aef7857 +# or should we pull from master? no release in almost 4 years +#PKG_VERS = d0e61be32968b2c6a532612b4080dee656ce5db6 +#PKG_DIST_SITE = $(PKG_REPO)/archive +#PKG_EXT = tar.gz +#PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) + +PKG_DIST_SITE = $(PKG_REPO)/releases/download/v$(PKG_VERS) +PKG_EXT = tar.xz +PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) + +PKG_DIR = $(PKG_NAME)-$(PKG_VERS) + +COMMENT = Parallel, indexed xz compressor +HOMEPAGE = $(PKG_REPO) +LICENSE = FreeBSD 2-Clause "Simplified" + +DEPENDS = cross/xz +DEPENDS += cross/libarchive + +PATCHES_LEVEL = 1 + +PRE_CONFIGURE_TARGET = pixz_pre_configure +GNU_CONFIGURE = 1 +CONFIGURE_ARGS += --without-manpage + +include ../../mk/spksrc.cross-cc.mk + +.PHONY: pixz_pre_configure +# must rebuild configure after patching configure.ac +pixz_pre_configure: + @$(RUN) autoreconf -fi +# below only in gh/source archive; not release +# @$(RUN) ./autogen.sh diff --git a/cross/pixz/PLIST b/cross/pixz/PLIST new file mode 100644 index 00000000000..38207cfb323 --- /dev/null +++ b/cross/pixz/PLIST @@ -0,0 +1 @@ +bin:bin/pixz diff --git a/cross/pixz/digests b/cross/pixz/digests new file mode 100644 index 00000000000..dcd74f8c4c5 --- /dev/null +++ b/cross/pixz/digests @@ -0,0 +1,3 @@ +pixz-1.0.7.tar.xz SHA1 56238b6a53f4b0ddfcce8d4e4655e13035bdbe5a +pixz-1.0.7.tar.xz SHA256 e5e32c6eb0bf112b98e74a5da8fb63b9f2cae71800f599d97ce540e150c8ddc5 +pixz-1.0.7.tar.xz MD5 d49ed375b176590ed995d109251fef3d diff --git a/cross/pixz/patches/0001-configure.ac-replace-AC_CHECK_FILE.patch b/cross/pixz/patches/0001-configure.ac-replace-AC_CHECK_FILE.patch new file mode 100644 index 00000000000..1a55a5ccd4a --- /dev/null +++ b/cross/pixz/patches/0001-configure.ac-replace-AC_CHECK_FILE.patch @@ -0,0 +1,31 @@ +From 4ddfdca8416a008819d08d14d6a6f4796aef7857 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 12 Oct 2020 22:40:13 +0200 +Subject: [PATCH] configure.ac: replace AC_CHECK_FILE + +AC_CHECK_FILE can't be used when cross-compiling so replace it by a +simple test -f + +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0a19a2a..9773993 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -16,8 +16,8 @@ AC_PROG_CC_STDC + # Check for a2x only if the man page is missing, i.e. we are building from git. The release tarballs + # are set up to include the man pages. This way, only people creating tarballs via `make dist` and + # people building from git need a2x as a dependency. +-AC_CHECK_FILE( +- [src/pixz.1], ++AS_IF( ++ [test -f src/pixz.1], + [], + [ + AC_ARG_WITH( +-- +2.43.0 + diff --git a/diyspk/pixz/Makefile b/diyspk/pixz/Makefile new file mode 100644 index 00000000000..e69f12570bb --- /dev/null +++ b/diyspk/pixz/Makefile @@ -0,0 +1,17 @@ +SPK_NAME = pixz +SPK_VERS = 1.0.7 +SPK_REV = 0 +#SPK_ICON = src/pixz.png + +#DISPLAY_NAME = pixz +DESCRIPTION = Parallel, indexed xz compressor +HOMEPAGE = https://github.com/vasi/$(SPK_NAME) +LICENSE = 2-Clause BSD +MAINTAINER = dotysan + +DEPENDS = cross/$(SPK_NAME) + +STARTABLE = no +SPK_COMMANDS = bin/$(SPK_NAME) + +include ../../mk/spksrc.spk.mk From 71c4152a1e312b6073d745ab028e6c401524456c Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Tue, 16 Apr 2024 15:42:06 -0700 Subject: [PATCH 38/45] Disable iconv for libarchive I have no idea why. But spk/synocli-file would not build pixz. However, cross/libarchive and diyspk/pigz both built standalone just fine. Also documenting some other strange and no-determininistic artifacts linked to build enviornment. --- cross/libarchive/Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cross/libarchive/Makefile b/cross/libarchive/Makefile index 19ed0b2bed3..8de33b7028c 100644 --- a/cross/libarchive/Makefile +++ b/cross/libarchive/Makefile @@ -10,8 +10,18 @@ COMMENT = Multi-format archive and compression library HOMEPAGE = https://www.libarchive.org/ LICENSE = 3-Clause BSD +# why does it still use only system autoconf?!? +#BUILD_DEPENDS = cross/autoconf + +# why does this still crash building synocli-file with pixz?!? +#BUILD_DEPENDS = cross/iconv +# or +#BUILD_DEPENDS = cross/libiconv +# above does nothing, must disable iconv below + DEPENDS = cross/openssl3 GNU_CONFIGURE = 1 +CONFIGURE_ARGS += --without-iconv include ../../mk/spksrc.cross-cc.mk From 360f8374e67dfa8e2bdf78f35227db1bb40e6786 Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Tue, 16 Apr 2024 15:52:00 -0700 Subject: [PATCH 39/45] Add pixz to synocli-file --- spk/synocli-file/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spk/synocli-file/Makefile b/spk/synocli-file/Makefile index b8dc441a761..ca4399d4398 100644 --- a/spk/synocli-file/Makefile +++ b/spk/synocli-file/Makefile @@ -1,6 +1,6 @@ SPK_NAME = synocli-file SPK_VERS = 3.3 -SPK_REV = 23 +SPK_REV = 24 SPK_ICON = src/synocli-file.png # cross/libblkid must be built before cross/e2fsprogs or cross/libext2fs @@ -13,6 +13,7 @@ DEPENDS = cross/less cross/tree cross/ncdu cross/jdupes cross/rhash cross/nano DEPENDS += cross/mc cross/pcre2 cross/fdupes cross/zstd DEPENDS += cross/detox DEPENDS += cross/lzip cross/plzip +DEPENDS += cross/pixz DEPENDS += cross/mg DEPENDS += cross/jupp DEPENDS += cross/iconv @@ -118,6 +119,7 @@ SPK_COMMANDS += bin/pcre2grep bin/pcre2test SPK_COMMANDS += bin/rmlint SPK_COMMANDS += bin/zstd bin/unzstd bin/zstdcat bin/zstdmt bin/zstdgrep bin/zstdless SPK_COMMANDS += bin/lzip bin/plzip +SPK_COMMANDS += bin/pixz SPK_COMMANDS += bin/fdupes SPK_COMMANDS += bin/micro SPK_COMMANDS += bin/fzf From 3381f2ac205d2eabc1fb21014f0cba025f18c10d Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Wed, 17 Apr 2024 12:48:00 -0700 Subject: [PATCH 40/45] Proper build env dependency for libarchive --- cross/libarchive/Makefile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/cross/libarchive/Makefile b/cross/libarchive/Makefile index 8de33b7028c..48ebe2d809c 100644 --- a/cross/libarchive/Makefile +++ b/cross/libarchive/Makefile @@ -10,15 +10,7 @@ COMMENT = Multi-format archive and compression library HOMEPAGE = https://www.libarchive.org/ LICENSE = 3-Clause BSD -# why does it still use only system autoconf?!? -#BUILD_DEPENDS = cross/autoconf - -# why does this still crash building synocli-file with pixz?!? -#BUILD_DEPENDS = cross/iconv -# or -#BUILD_DEPENDS = cross/libiconv -# above does nothing, must disable iconv below - +BUILD_DEPENDS = native/autoconf DEPENDS = cross/openssl3 GNU_CONFIGURE = 1 From 60b09eeba0c97aa71731b5566ac133d07fc7ceee Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Wed, 17 Apr 2024 12:48:52 -0700 Subject: [PATCH 41/45] pixz: fix undefined reference to rpl_malloc --- .../patches/0002-undefined-references.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 cross/pixz/patches/0002-undefined-references.patch diff --git a/cross/pixz/patches/0002-undefined-references.patch b/cross/pixz/patches/0002-undefined-references.patch new file mode 100644 index 00000000000..2e8e916cfcb --- /dev/null +++ b/cross/pixz/patches/0002-undefined-references.patch @@ -0,0 +1,17 @@ +Fix undefined reference to `rpl_malloc' when cross-compiling. + +diff -wpurN pixz-1.0.7/configure.ac pixz-1.0.7.patched/configure.ac +--- pixz-1.0.7/configure.ac 2024-04-17 12:41:01.040203638 -0700 ++++ pixz-1.0.7.patched/configure.ac 2024-04-17 12:41:49.224434589 -0700 +@@ -65,10 +65,8 @@ AC_TYPE_UINT8_T + AC_SYS_LARGEFILE + + # Checks for library functions. +-AC_FUNC_MALLOC +-AC_FUNC_REALLOC + AC_FUNC_STRTOD +-AC_CHECK_FUNCS([memchr memmove memset strerror strtol]) ++AC_CHECK_FUNCS([malloc realloc memchr memmove memset strerror strtol]) + AC_CHECK_HEADER([sys/endian.h], + [ + AC_CHECK_DECLS([htole64, le64toh], [], [], [ From a4a4df6bca0364953b7959438c8eeaa7491fefdb Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Wed, 17 Apr 2024 12:51:43 -0700 Subject: [PATCH 42/45] libarchive: whoops must include native dependency --- native/autoconf/Makefile | 16 ++++++++++++++++ native/autoconf/digests | 3 +++ 2 files changed, 19 insertions(+) create mode 100644 native/autoconf/Makefile create mode 100644 native/autoconf/digests diff --git a/native/autoconf/Makefile b/native/autoconf/Makefile new file mode 100644 index 00000000000..19f8bd3501e --- /dev/null +++ b/native/autoconf/Makefile @@ -0,0 +1,16 @@ +PKG_NAME = autoconf +PKG_VERS = 2.72 +PKG_EXT = tar.xz +PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://ftp.gnu.org/gnu/autoconf/ +PKG_DIR = $(PKG_NAME)-$(PKG_VERS) + +DEPENDS = cross/m4 + +HOMEPAGE = https://www.gnu.org/software/autoconf/ +COMMENT = Autoconf is an extensible package of M4 macros that produce shell scripts to automatically configure software source code packages. +LICENSE = GPLv2 + +GNU_CONFIGURE = 1 + +include ../../mk/spksrc.native-cc.mk diff --git a/native/autoconf/digests b/native/autoconf/digests new file mode 100644 index 00000000000..a06f1063b32 --- /dev/null +++ b/native/autoconf/digests @@ -0,0 +1,3 @@ +autoconf-2.72.tar.xz SHA1 1d082d999ff4506ec8f92c6ecb9732546f5204fb +autoconf-2.72.tar.xz SHA256 ba885c1319578d6c94d46e9b0dceb4014caafe2490e437a0dbca3f270a223f5a +autoconf-2.72.tar.xz MD5 1be79f7106ab6767f18391c5e22be701 From 7d52db3f08eb327eed2610f50713e489c6a33466 Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Wed, 17 Apr 2024 14:30:48 -0700 Subject: [PATCH 43/45] pixz: bump rev; ready for prime time --- diyspk/pixz/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diyspk/pixz/Makefile b/diyspk/pixz/Makefile index e69f12570bb..d082acde5e8 100644 --- a/diyspk/pixz/Makefile +++ b/diyspk/pixz/Makefile @@ -1,6 +1,6 @@ SPK_NAME = pixz SPK_VERS = 1.0.7 -SPK_REV = 0 +SPK_REV = 1 #SPK_ICON = src/pixz.png #DISPLAY_NAME = pixz From cc8d015d3e284c60dce0a2ff2d56141dbd43c4b7 Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Thu, 18 Apr 2024 17:17:54 -0700 Subject: [PATCH 44/45] Update cross/libarchive/PLIST Link shared object aliases instead of copy. Co-authored-by: hgy59 --- cross/libarchive/PLIST | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cross/libarchive/PLIST b/cross/libarchive/PLIST index 97c2b76763e..0a76ce3904a 100644 --- a/cross/libarchive/PLIST +++ b/cross/libarchive/PLIST @@ -1,3 +1,3 @@ -lib:lib/libarchive.so -lib:lib/libarchive.so.13 +lnk:lib/libarchive.so +lnk:lib/libarchive.so.13 lib:lib/libarchive.so.13.7.3 From 47e02a8576162259f0d0711443a5f4f6b543f76d Mon Sep 17 00:00:00 2001 From: Curtis Doty Date: Thu, 18 Apr 2024 18:01:20 -0700 Subject: [PATCH 45/45] add pixz - also clean up kruft --- spk/synocli-file/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/spk/synocli-file/Makefile b/spk/synocli-file/Makefile index ca4399d4398..45b85fdbbe5 100644 --- a/spk/synocli-file/Makefile +++ b/spk/synocli-file/Makefile @@ -1,5 +1,5 @@ SPK_NAME = synocli-file -SPK_VERS = 3.3 +SPK_VERS = 3.4 SPK_REV = 24 SPK_ICON = src/synocli-file.png @@ -98,7 +98,15 @@ endif PCRE2_CLI_FULL = 1 export PCRE2_CLI_FULL -DESCRIPTION = "SynoCli File Tools provide a set of small command-line utilities: less, tree, ncdu, jdupes, fdupes, rhash, mc \(midnight commander\), mg \(emacs-like text editor\), nano, jupp \(based on JOE - Joe\'s Own Editor 3.1\), file, detox, pcre2, zstd, lzip, plzip, detox, iconv, dos2unix tools, patch$(OPTIONAL_DESC)." +DESCRIPTION = "SynoCli File Tools provide a set of small command-line utilities: \ + less, tree, ncdu, jdupes, fdupes, rhash, \ + mc \(midnight commander\), \ + mg \(emacs-like text editor\), nano, \ + jupp \(based on JOE - Joe\'s Own Editor 3.1\), \ + file, detox, pcre2, zstd, lzip, plzip, \ + pixz, \ + detox, iconv, dos2unix tools, \ + patch$(OPTIONAL_DESC)." STARTABLE = no CHANGELOG = "1. Add xstow.
2. Add patch.
3. Update dos2unix to v7.5.2.
4. Update eza v0.18.6.
5. Update fd to v9.0.0.
6. Update fzf to v0.46.1.
7. Update mc to v4.8.31.
8. Update lzip to v1.24 and plzip to v1.11.
9. Update ripgrep to v14.1.0."