From f07b12f34b1afc9668bce16f9ff8f7fad428f745 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Fri, 14 Jun 2024 21:35:34 +0200 Subject: [PATCH 1/7] fix output of make dependency-list - avoid the make command and the list of all packages in the output - this is a leftover of PR #6002 --- Makefile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Makefile b/Makefile index dd97b0711f3..8f42420d078 100644 --- a/Makefile +++ b/Makefile @@ -72,28 +72,22 @@ native-%-clean: native/%/Makefile # build dependency flat list for all packages dependency-flat: - @echo $(filter-out $(dir $(wildcard spk/*/BROKEN)),$(dir $(wildcard spk/*/Makefile))) @for spk in $(filter-out $(dir $(wildcard spk/*/BROKEN)),$(dir $(wildcard spk/*/Makefile))) ; \ do \ - echo "$(MAKE) -s -C $${spk} dependency-flat" ; \ $(MAKE) -s -C $${spk} dependency-flat ; \ done # build dependency tree for all packages dependency-tree: - @echo $(filter-out $(dir $(wildcard spk/*/BROKEN)),$(dir $(wildcard spk/*/Makefile))) @for spk in $(filter-out $(dir $(wildcard spk/*/BROKEN)),$(dir $(wildcard spk/*/Makefile))) ; \ do \ - echo "$(MAKE) --no-print-directory -C $${spk} dependency-tree" ; \ $(MAKE) --no-print-directory -C $${spk} dependency-tree ; \ done # build dependency list for all packages dependency-list: - @echo $(filter-out $(dir $(wildcard spk/*/BROKEN)),$(dir $(wildcard spk/*/Makefile))) @for spk in $(filter-out $(dir $(wildcard spk/*/BROKEN)),$(dir $(wildcard spk/*/Makefile))) ; \ do \ - echo "$(MAKE) -s -C $${spk} dependency-list" ; \ $(MAKE) -s -C $${spk} dependency-list ; \ done From 75606d9ae9050688477929293390f97b8d16012a Mon Sep 17 00:00:00 2001 From: hgy59 Date: Fri, 14 Jun 2024 21:58:07 +0200 Subject: [PATCH 2/7] remove global dependency-flat target - dependency-flat is an internal target used dependency-list, dependency-tree and for some internal targets --- Makefile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Makefile b/Makefile index 8f42420d078..82298d283d0 100644 --- a/Makefile +++ b/Makefile @@ -70,13 +70,6 @@ native-%: native/%/Makefile native-%-clean: native/%/Makefile cd $(dir $^) && env $(MAKE) clean -# build dependency flat list for all packages -dependency-flat: - @for spk in $(filter-out $(dir $(wildcard spk/*/BROKEN)),$(dir $(wildcard spk/*/Makefile))) ; \ - do \ - $(MAKE) -s -C $${spk} dependency-flat ; \ - done - # build dependency tree for all packages dependency-tree: @for spk in $(filter-out $(dir $(wildcard spk/*/BROKEN)),$(dir $(wildcard spk/*/Makefile))) ; \ From 3bb00afb92370ac205d348946ff48e139996756c Mon Sep 17 00:00:00 2001 From: hgy59 Date: Sat, 15 Jun 2024 10:38:06 +0200 Subject: [PATCH 3/7] exclude zsh-static in dependency-list and dependency-tree targets - targets cannot handle include of another spk Makefile --- Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 82298d283d0..08ffb4074e7 100644 --- a/Makefile +++ b/Makefile @@ -71,15 +71,19 @@ native-%-clean: native/%/Makefile cd $(dir $^) && env $(MAKE) clean # build dependency tree for all packages +# - exclude broken packages +# - exclude zsh-static (same dependencies as zsh, and make dependency-tree cannot handle include of another spk Makefile) dependency-tree: - @for spk in $(filter-out $(dir $(wildcard spk/*/BROKEN)),$(dir $(wildcard spk/*/Makefile))) ; \ + @for spk in $(filter-out $(dir $(wildcard spk/*/BROKEN)) spk/zsh-static,$(dir $(wildcard spk/*/Makefile))) ; \ do \ $(MAKE) --no-print-directory -C $${spk} dependency-tree ; \ done # build dependency list for all packages +# - exclude broken packages +# - exclude zsh-static (same dependencies as zsh, and make dependency-list cannot handle include of another spk Makefile) dependency-list: - @for spk in $(filter-out $(dir $(wildcard spk/*/BROKEN)),$(dir $(wildcard spk/*/Makefile))) ; \ + @for spk in $(filter-out $(dir $(wildcard spk/*/BROKEN)) spk/zsh-static,$(dir $(wildcard spk/*/Makefile))) ; \ do \ $(MAKE) -s -C $${spk} dependency-list ; \ done From 2105d4a4fc92660463bd619b6787f9a404c0c70f Mon Sep 17 00:00:00 2001 From: hgy59 Date: Sun, 16 Jun 2024 14:41:17 +0200 Subject: [PATCH 4/7] znc: fix for dependency-list --- Makefile | 6 ++---- cross/znc/Makefile | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 08ffb4074e7..678d4ed53bc 100644 --- a/Makefile +++ b/Makefile @@ -72,18 +72,16 @@ native-%-clean: native/%/Makefile # build dependency tree for all packages # - exclude broken packages -# - exclude zsh-static (same dependencies as zsh, and make dependency-tree cannot handle include of another spk Makefile) dependency-tree: - @for spk in $(filter-out $(dir $(wildcard spk/*/BROKEN)) spk/zsh-static,$(dir $(wildcard spk/*/Makefile))) ; \ + @for spk in $(filter-out $(dir $(wildcard spk/*/BROKEN)),$(dir $(wildcard spk/*/Makefile))) ; \ do \ $(MAKE) --no-print-directory -C $${spk} dependency-tree ; \ done # build dependency list for all packages # - exclude broken packages -# - exclude zsh-static (same dependencies as zsh, and make dependency-list cannot handle include of another spk Makefile) dependency-list: - @for spk in $(filter-out $(dir $(wildcard spk/*/BROKEN)) spk/zsh-static,$(dir $(wildcard spk/*/Makefile))) ; \ + @for spk in $(filter-out $(dir $(wildcard spk/*/BROKEN)),$(dir $(wildcard spk/*/Makefile))) ; \ do \ $(MAKE) -s -C $${spk} dependency-list ; \ done diff --git a/cross/znc/Makefile b/cross/znc/Makefile index e8925eba5f7..99da7b40537 100644 --- a/cross/znc/Makefile +++ b/cross/znc/Makefile @@ -5,6 +5,10 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://znc.in/releases/archive PKG_DIR = $(PKG_NAME)-$(PKG_VERS) +ifeq ($(strip $(PYTHON_PACKAGE)),) +PYTHON_PACKAGE = python311 +endif + BUILD_DEPENDS = cross/$(PYTHON_PACKAGE) DEPENDS = cross/openssl3 cross/libicu cross/zlib From 1f0e6f7234552bd9f405c7cb1b5a560b97036311 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Sun, 16 Jun 2024 15:09:34 +0200 Subject: [PATCH 5/7] avoid duplicates in dependency-flat --- mk/spksrc.dependency-tree.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/spksrc.dependency-tree.mk b/mk/spksrc.dependency-tree.mk index ccd1f7f981a..a3deedc6ec4 100644 --- a/mk/spksrc.dependency-tree.mk +++ b/mk/spksrc.dependency-tree.mk @@ -41,7 +41,7 @@ dependency-flat: @echo "$(CURDIR)" | grep -Po "/\K(spk|cross|native|diyspk|toolchain)/.*" @for depend in $$(echo "$(BUILD_DEPENDS) $(DEPENDS) $(OPTIONAL_DEPENDS)" | tr ' ' '\n' | sort -u | tr '\n' ' ') ; \ do \ - DEPENDENCY_WALK=1 $(MAKE) -s -C ../../$$depend dependency-flat ; \ + DEPENDENCY_WALK=1 $(MAKE) -s -C ../../$$depend dependency-flat | sort -u ; \ done From ac435b09401925cda468a8e1232b95e2bc614f00 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Sun, 16 Jun 2024 19:54:58 +0200 Subject: [PATCH 6/7] build-action: fix prepare - fix rename of spk names: remove only package with exact name from list --- .github/actions/prepare.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/prepare.sh b/.github/actions/prepare.sh index 0ec5b726f1e..5b6b55017d5 100755 --- a/.github/actions/prepare.sh +++ b/.github/actions/prepare.sh @@ -44,13 +44,13 @@ done # fix for packages with different names if [ "$(echo ${SPK_TO_BUILD} | grep -ow nzbdrone)" != "" ]; then - SPK_TO_BUILD=$(echo "${SPK_TO_BUILD}" | tr ' ' '\n' | grep -v "nzbdrone" | tr '\n' ' ')" sonarr3" + SPK_TO_BUILD=$(echo "${SPK_TO_BUILD}" | tr ' ' '\n' | grep -vw "nzbdrone" | tr '\n' ' ')" sonarr3" fi if [ "$(echo ${SPK_TO_BUILD} | grep -ow python)" != "" ]; then - SPK_TO_BUILD=$(echo "${SPK_TO_BUILD}" | tr ' ' '\n' | grep -v "python" | tr '\n' ' ')" python2" + SPK_TO_BUILD=$(echo "${SPK_TO_BUILD}" | tr ' ' '\n' | grep -vw "python" | tr '\n' ' ')" python2" fi if [ "$(echo ${SPK_TO_BUILD} | grep -ow ffmpeg)" != "" ]; then - SPK_TO_BUILD=$(echo "${SPK_TO_BUILD}" | tr ' ' '\n' | grep -v "ffmpeg" | tr '\n' ' ')" ffmpeg4" + SPK_TO_BUILD=$(echo "${SPK_TO_BUILD}" | tr ' ' '\n' | grep -vw "ffmpeg" | tr '\n' ' ')" ffmpeg4" fi # remove duplicate packages From 5fc622872f523457617d2fc106712158791296d6 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Sun, 16 Jun 2024 20:42:08 +0200 Subject: [PATCH 7/7] remove dependency-kernel-list - this was introduced in #5095 - BUT: we must not download kernel sources in prepare.sh, just as we don't do with toolchains - if we want to optimize the download, we could cache the (extracted) kernel sources as we do for toolchains but since the cache is already at its limit, it is not possible to cache kernel sources without dropping other cached data. --- .github/actions/prepare.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/actions/prepare.sh b/.github/actions/prepare.sh index 5b6b55017d5..baa69b5cbd3 100755 --- a/.github/actions/prepare.sh +++ b/.github/actions/prepare.sh @@ -120,10 +120,6 @@ else for package in ${packages} do DOWNLOAD_LIST+=$(echo "${DEPENDENCY_LIST}" | grep "^${package}:" | grep -o ":.*" | tr ':' ' ' | sort -u | tr '\n' ' ') - for version in ${DEFAULT_TC} - do - DOWNLOAD_LIST+=$(make -C spk/${package} TCVERSION=${version} dependency-kernel-list | grep "^${package}:" | grep -o ":.*" | tr ':' ' ' | sort -u | tr '\n' ' ') - done done # remove duplicate downloads downloads=$(printf %s "${DOWNLOAD_LIST}" | tr ' ' '\n' | sort -u | tr '\n' ' ')