SynoCommunity · hgy59 · Oct 5, 2024 · Oct 7, 2024
diff --git a/.github/actions/prepare.sh b/.github/actions/prepare.sh
@@ -28,13 +28,7 @@ DEPENDENT_PACKAGES=$(echo "${GH_FILES}" | tr ' ' '\n' | grep -oP "(cross|native)
 # get dependency list
 # dependencies in this list include the cross or native folder (i.e. native/python cross/glib)
 echo "Building dependency list..."
-DEPENDENCY_LIST=
-for package in $(find spk/ -maxdepth 1 -type d | cut -c 5- | sort)
-do
-    if [ ! -f "./spk/${package}/BROKEN" ]; then
-        DEPENDENCY_LIST+=$(DEPENDENCY_WALK=1 make -s -C spk/${package} dependency-list 2> /dev/null)$'\n'
-    fi
-done
+DEPENDENCY_LIST=$(make dependency-list 2> /dev/null)
 
 # search for dependent spk packages
 for package in ${DEPENDENT_PACKAGES}

diff --git a/Makefile b/Makefile
@@ -79,12 +79,9 @@ dependency-tree:
 	done
 
 # build dependency list for all packages
-# - exclude broken packages
+# - broken packages are excluded
 dependency-list:
-	@for spk in $(filter-out $(dir $(wildcard spk/*/BROKEN)),$(dir $(wildcard spk/*/Makefile))) ; \
-	do \
-	    $(MAKE) -s -C $${spk} dependency-list ; \
-	done
+	@mk/dependency-list.sh
 
 # define a template that instantiates a 'python3-avoton-6.1' -style target for
 # every ($2) arch, every ($1) spk

diff --git a/cross/jellyfin/Makefile b/cross/jellyfin/Makefile
@@ -11,7 +11,7 @@ COMMENT  = The Free Software Media System. It is an alternative to the proprieta
 LICENSE  = GPLv2
 
 DOTNET_VERSION = 8.0
-BUILD_DEPENDS = native/dotnet-sdk-$(DOTNET_VERSION)
+BUILD_DEPENDS = native/dotnet-sdk-8.0
 
 DOTNET_OUTPUT_PATH = share
 DOTNET_PACKAGE_NAME = Jellyfin.Server

diff --git a/cross/libicu/Makefile b/cross/libicu/Makefile
@@ -5,7 +5,7 @@ PKG_DIST_NAME = icu4c-$(subst .,_,$(PKG_VERS))-src.$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/unicode-org/icu/releases/download/release-$(subst .,-,$(PKG_VERS))
 PKG_DIR = icu/source
 
-BUILD_DEPENDS = native/$(PKG_NAME)
+BUILD_DEPENDS = native/libicu
 
 HOMEPAGE = http://site.icu-project.org/home
 COMMENT  = International Components for Unicode.

diff --git a/cross/python2/Makefile b/cross/python2/Makefile
@@ -7,7 +7,7 @@ PKG_DIST_SITE = https://www.python.org/ftp/python/$(PKG_VERS)
 PKG_DIR = Python-$(PKG_VERS)
 
 DEPENDS  = cross/zlib cross/openssl cross/sqlite cross/readline cross/ncursesw cross/bzip2
-DEPENDS += cross/berkeleydb-5.3 native/$(PKG_NAME)
+DEPENDS += cross/berkeleydb-5.3 native/python2
 
 HOMEPAGE = http://www.python.org
 COMMENT  = Python Programming Language

diff --git a/cross/python310/Makefile b/cross/python310/Makefile
@@ -6,7 +6,7 @@ PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://www.python.org/ftp/python/$(PKG_VERS)
 PKG_DIR = Python-$(PKG_VERS)
 
-BUILD_DEPENDS = native/$(PKG_NAME)
+BUILD_DEPENDS = native/python310
 
 DEPENDS  = cross/zlib cross/sqlite cross/readline cross/ncursesw cross/bzip2 cross/xz
 # required for Sleepycat^WOracle Berkeley DB interface

diff --git a/cross/python311/Makefile b/cross/python311/Makefile
@@ -11,7 +11,7 @@ PKG_DIR = Python-$(PKG_VERS)
 # And compiler must support std=c++11 (OlD_PPC_ARCHS fail, but ARMv5_ARCHS have no issue).
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
 
-BUILD_DEPENDS = native/$(PKG_NAME)
+BUILD_DEPENDS = native/python311
 
 DEPENDS  = cross/zlib cross/sqlite cross/readline cross/ncursesw cross/bzip2 cross/xz
 # required for Sleepycat^WOracle Berkeley DB interface

diff --git a/cross/python38/Makefile b/cross/python38/Makefile
@@ -6,7 +6,7 @@ PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://www.python.org/ftp/python/$(PKG_VERS)
 PKG_DIR = Python-$(PKG_VERS)
 
-BUILD_DEPENDS = native/$(PKG_NAME)
+BUILD_DEPENDS = native/python38
 
 DEPENDS  = cross/zlib cross/sqlite cross/readline cross/ncursesw cross/bzip2 cross/xz
 # required for uuid module

diff --git a/cross/vim/Makefile b/cross/vim/Makefile
@@ -10,7 +10,7 @@ ifeq ($(strip $(PYTHON_PACKAGE)),)
 PYTHON_PACKAGE = python311
 endif
 
-OPTIONAL_DEPENDS = cross/$(PYTHON_PACKAGE)
+OPTIONAL_DEPENDS = cross/python311
 DEPENDS = cross/ncursesw
 
 HOMEPAGE = https://www.vim.org/
@@ -26,7 +26,7 @@ CONFIGURE_ARGS += vim_cv_getcwd_broken=yes vim_cv_stat_ignores_slash=yes vim_cv_
 include ../../mk/spksrc.archs.mk
 
 ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
-BUILD_DEPENDS = cross/$(PYTHON_PACKAGE)
+BUILD_DEPENDS = cross/python311
 CONFIGURE_ARGS += --enable-python3interp=dynamic --with-python3-command=$(HOSTPYTHON) 
 CONFIGURE_ARGS += vi_cv_path_python3_conf=$(PYTHON_CFG_PATH)
 CONFIGURE_ARGS += vi_cv_path_python3_pfx=$(PYTHON_PREFIX)

diff --git a/cross/znc/Makefile b/cross/znc/Makefile
@@ -9,7 +9,7 @@ ifeq ($(strip $(PYTHON_PACKAGE)),)
 PYTHON_PACKAGE = python311
 endif
 
-BUILD_DEPENDS = cross/$(PYTHON_PACKAGE)
+BUILD_DEPENDS = cross/python311
 DEPENDS = cross/openssl3 cross/libicu cross/zlib
 
 # configure: No compiler with C++11 support was found

diff --git a/diyspk/bandwhich/Makefile b/diyspk/bandwhich/Makefile
@@ -2,7 +2,7 @@ SPK_NAME = bandwhich
 SPK_VERS = 0.20.0
 SPK_REV = 1
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/bandwhich
 
 # unknown relocation type 95 ...
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)

diff --git a/diyspk/bottom/Makefile b/diyspk/bottom/Makefile
@@ -2,7 +2,7 @@ SPK_NAME = bottom
 SPK_VERS = 0.6.8
 SPK_REV = 1
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/bottom
 
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
 

diff --git a/diyspk/cpulimit/Makefile b/diyspk/cpulimit/Makefile
@@ -2,7 +2,7 @@ SPK_NAME = cpulimit
 SPK_VERS = 0.2
 SPK_REV = 1
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/cpulimit
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = CPU usage limiter for Linux.

diff --git a/diyspk/duf/Makefile b/diyspk/duf/Makefile
@@ -2,7 +2,7 @@ SPK_NAME = duf
 SPK_VERS = 0.8.1
 SPK_REV = 1
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/duf
 
 UNSUPPORTED_ARCHS = $(PPC_ARCHS)
 

diff --git a/diyspk/dutree/Makefile b/diyspk/dutree/Makefile
@@ -2,7 +2,7 @@ SPK_NAME = dutree
 SPK_VERS = 0.2.18
 SPK_REV = 1
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/dutree
 
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
 

diff --git a/diyspk/etherwake/Makefile b/diyspk/etherwake/Makefile
@@ -2,7 +2,7 @@ SPK_NAME = etherwake
 SPK_VERS = 1.09
 SPK_REV = 1
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/etherwake
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = Generate and transmit a Wake-On-LAN (WOL) Magic Packet

diff --git a/diyspk/fritzctl/Makefile b/diyspk/fritzctl/Makefile
@@ -1,9 +1,9 @@
 SPK_NAME = fritzctl
 SPK_VERS = 1.4.23
 SPK_REV = 1
-SPK_ICON = src/$(SPK_NAME).png
+SPK_ICON = src/fritzctl.png
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/fritzctl
 
 MAINTAINER = bpicode
 DESCRIPTION = A lightweight, easy to use console client for the AVM FRITZ!Box Home Automation.

diff --git a/diyspk/jupp/Makefile b/diyspk/jupp/Makefile
@@ -3,7 +3,7 @@ SPK_VERS = 40
 SPK_REV = 2
 SPK_ICON = src/jupp.png
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/jupp
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = text editor jupp comes with the editor flavours known from joe, specifically, jmacs, joe, jpico, jstar, and rjoe.

diff --git a/diyspk/mtr/Makefile b/diyspk/mtr/Makefile
@@ -2,7 +2,7 @@ SPK_NAME = mtr
 SPK_VERS = 0.95
 SPK_REV = 1
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/mtr
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = mtr \(My traceroute\) combines the functionality of the 'traceroute' and 'ping' programs in a single network diagnostic tool.

diff --git a/diyspk/procs/Makefile b/diyspk/procs/Makefile
@@ -2,7 +2,7 @@ SPK_NAME = procs
 SPK_VERS = 0.12.3
 SPK_REV = 1
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/procs
 
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
 

diff --git a/diyspk/tdu/Makefile b/diyspk/tdu/Makefile
@@ -2,7 +2,7 @@ SPK_NAME = tdu
 SPK_VERS = 1.36
 SPK_REV = 1
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/tdu
 
 UNSUPPORTED_ARCHS = $(PPC_ARCHS)
 

diff --git a/diyspk/testdisk/Makefile b/diyspk/testdisk/Makefile
@@ -3,7 +3,7 @@ SPK_VERS = 7.1
 SPK_REV = 4
 SPK_ICON = src/testdisk.png
 
-DEPENDS  = cross/$(SPK_NAME)
+DEPENDS  = cross/testdisk
 
 MAINTAINER = hgy59
 DESCRIPTION = "TestDisk is powerful free data recovery software."

diff --git a/mk/dependency-list.sh b/mk/dependency-list.sh
@@ -0,0 +1,104 @@
+#!/bin/bash
+
+# Build dependency list
+#
+# list dependencies for all spk packages
+# - used by github prepare action to evaluate packages to build, regarding the modified files
+# - broken packages are excluded
+# This script must be called in the top folder (spksrc) of the repository
+# It is called by the dependency-list target of the toplevel Makefile 
+# 
+# This script has benefits over iterating all spk folders and call "make dependency-list"
+# - it is much faster (typ. 15 s instead of 180 s)
+# - it does not require "OPTIONAL_DEPENDS" defitions anymore
+# caveats
+# - makefile variables like $(SPK_NAME) are not allowed in dependency definitions anymore
+# - definition of dependencies in included make files are not evaluated.
+#   Those are 
+#   - native/cmake, native/cmake-legacy, native/nasm for cmake/rust packages (^1)
+#   - cross/$(PYTHON_PACKAGE) for packages reusing prebuilt python (^2)
+#   - cross/$(FFMPEG_PACKAGE) for packages reusing prebuilt ffmpeg (^2)
+#   ^1: We could introduce a new OPTIONAL_DEPENDS (ADDITIONAL_DEPENDS) variable to fix this
+#       But it will hardly happen, that nasm or cmake changes (and are deprecated since those are installed to dev environment)
+#   ^2: The missing dependencies with packages using prebuilt ffmpeg/python where not
+#       evaluated in the former solution too.
+#       So far we did not want to trigger the build of all related packages when only the prebuilt package had changes
+#       Otherwise we could introduce a new OPTIONAL_DEPENDS (ADDITIONAL_DEPENDS) variable for this
+
+# get SPK_NAME of a package
+# since the spk name might be different to the (spk/){package} folder
+# we need to parse the variable in the Makefile
+# param1: package folder
+function get_spk_name ()
+{
+   if [ -f ${1}/Makefile ]; then
+      grep "^SPK_NAME" ${1}/Makefile | cut -d= -f2 | xargs
+   fi
+}
+
+# evaluates all dependencies in a single Makefile
+# param1: folder (like spk/{name}, cross/{name}, native/{name})
+function get_file_dependencies ()
+{
+   if [ -f ${1}/Makefile ]; then
+      grep "^DEPENDS\|^NATIVE_DEPENDS\|^BUILD_DEPENDS" ${1}/Makefile | cut -d= -f2 | sort -u | tr '\n' ' '
+   fi
+}
+
+# search for substring in a list of strings
+# param1 list of space separated strings
+# param2 substring
+function contains ()
+{
+   if [ -z "${1}" -o -z "${2}" ]; then
+      echo "false";
+   else
+      if [ "$(echo ${1} | tr ' ' '\n' | grep -w ${2})" = "${2}" ]; then
+         echo "true"
+      else
+         echo "false"
+      fi
+   fi
+}
+
+# get direct package dependencies
+# param1: list of folders containing Makefile to parse
+function get_dependencies ()
+{
+   local dependencies=
+   for dep in "${1}"; do
+      dependencies+="${dep} "
+      dependencies+="$(get_file_dependencies ${dep}) "
+   done
+   echo ${dependencies} | tr ' ' '\n' | sort -u | tr '\n' ' '
+}
+
+# get all dependencies of a package
+# param1: list of toplevel dependencies
+function get_spk_dependencies ()
+{
+   local dependencies=$(get_dependencies "${1}")
+   local cumulated_dependencies=$(get_dependencies "${dependencies}")
+   while [ "${cumulated_dependencies}" != "${dependencies}" ]; do
+      dependencies=${cumulated_dependencies}
+      cumulated_dependencies=$(get_dependencies "${dependencies}")
+   done
+   echo ${cumulated_dependencies} | tr ' ' '\n' | sort -u | tr '\n' ' '
+}
+
+# get the dependency list for a package
+# param1: package name
+function get_dependency_list ()
+{
+   local spk_name=$(get_spk_name spk/${package})
+   local toplevel_dependencies=$(get_file_dependencies spk/${package})
+   local spk_dependencies=$(get_spk_dependencies "${toplevel_dependencies}")
+   echo "${spk_name}: ${spk_dependencies}"
+}
+
+# iterate all packages
+for package in $(find spk/ -maxdepth 1 -type d | cut -c 5- | sort); do
+   if [ ! -f spk/${package}/BROKEN ]; then
+      get_dependency_list spk/${package}
+   fi
+done
diff --git a/spk/adminer/Makefile b/spk/adminer/Makefile
@@ -4,7 +4,7 @@ SPK_REV = 5
 SPK_ICON = src/adminer.png
 DSM_UI_DIR = app
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/adminer
 
 MAINTAINER = piwi82
 DESCRIPTION = Adminer is a full-featured database management tool available for MySQL, PostgreSQL, SQLite, MS SQL, Oracle, Firebird, SimpleDB, Elasticsearch and MongoDB.

diff --git a/spk/bazarr/Makefile b/spk/bazarr/Makefile
@@ -9,7 +9,7 @@ SPK_DEPENDS = "python311:ffmpeg"
 
 WHEELS = src/requirements-crossenv.txt src/requirements-pure.txt
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/bazarr
 DEPENDS += cross/unrar
 
 # [lxml]

diff --git a/spk/bicbucstriim/Makefile b/spk/bicbucstriim/Makefile
@@ -3,7 +3,7 @@ SPK_VERS = 3.4.2
 SPK_REV = 7
 SPK_ICON = src/bicbucstriim.png
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/bicbucstriim
 # Pure PHP package, make sure ARCH is noarch
 override ARCH=noarch
 

diff --git a/spk/chromaprint/Makefile b/spk/chromaprint/Makefile
@@ -4,7 +4,7 @@ SPK_REV = 22
 SPK_ICON = src/chromaprint.png
 
 FFMPEG_PACKAGE = ffmpeg7
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/chromaprint
 SPK_DEPENDS = $(FFMPEG_PACKAGE)
 
 # ffmpeg7 requires c11 support

diff --git a/spk/comskip/Makefile b/spk/comskip/Makefile
@@ -4,7 +4,7 @@ SPK_REV = 12
 SPK_ICON = src/comskip.png
 
 FFMPEG_PACKAGE = ffmpeg5
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/comskip
 SPK_DEPENDS = $(FFMPEG_PACKAGE)
 
 STARTABLE = no

diff --git a/spk/curaengine/Makefile b/spk/curaengine/Makefile
@@ -3,7 +3,7 @@ SPK_VERS = 2.1.3
 SPK_REV = 2
 SPK_ICON = src/curaengine.png
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/curaengine
 
 # c++11 compiler required
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)

diff --git a/spk/dante-sockd/Makefile b/spk/dante-sockd/Makefile
@@ -3,7 +3,7 @@ SPK_VERS = 1.4.3
 SPK_REV = 1
 SPK_ICON = src/dante.png
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/dante-sockd
 
 MAINTAINER = Anonym-tsk
 # From Inferno Nettverk A/S

diff --git a/spk/darkstat/Makefile b/spk/darkstat/Makefile
@@ -4,7 +4,7 @@ SPK_REV = 5
 SPK_ICON = src/darkstat.png
 DSM_UI_DIR = app
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/darkstat
 
 # DSM 7 does not allow to run package as root
 # error: pcap_open_live(): ovs_eth0: You don't have permission to capture on that device (socket: Operation not permitted)