cleanup makefiles (#4262)

* fix cross/dtach for gateone * fix cross/pyzmq for python * update monit from 5.27.0 to 5.27.1 to fix config for cross compilation - fix version in spk/monit/Makefile - monit: keep beta as this needs further testing before publishing * cleanup makefiles - use secure pages (https) for download and homepage reference (where applicable) - move source file to src folder (cross/c_icap) - cleanup native makefiles - use pip of python3 in native/python3 - remove obsolete package cross/julius - cleanup global Makefile
SynoCommunity · Nov 9, 2020 · 49b6a58 · 49b6a58
1 parent 9645a34
commit 49b6a58
Show file tree

Hide file tree

Showing 288 changed files with 810 additions and 896 deletions.
diff --git a/Makefile b/Makefile
@@ -1,52 +1,58 @@
 
 AVAILABLE_TCS = $(notdir $(wildcard toolchains/syno-*))
 AVAILABLE_ARCHS = $(notdir $(subst syno-,/,$(AVAILABLE_TCS)))
-SUPPORTED_SPKS = $(patsubst spk/%/Makefile,%,$(wildcard spk/*/Makefile))
+SUPPORTED_SPKS = $(sort $(patsubst spk/%/Makefile,%,$(wildcard spk/*/Makefile)))
 
 
 all: $(SUPPORTED_SPKS)
 
 all-noarch:
-	@for spk in $(dir $(wildcard spk/*/Makefile)) ; \
+	@for spk in $(sort $(dir $(wildcard spk/*/Makefile))) ; \
 	do \
 	   grep -q "override ARCH" "$${spk}/Makefile" && $(MAKE) -C $${spk} ; \
 	done
 
 
 clean: $(addsuffix -clean,$(SUPPORTED_SPKS))
-clean: native-clean
+clean: native-clean cross-clean
 
 dist-clean: clean
-dist-clean: toolchain-clean
+dist-clean: kernel-clean toolchain-clean toolkit-clean
 
 native-clean:
 	@for native in $(dir $(wildcard native/*/Makefile)) ; \
 	do \
-	    (cd $${native} && $(MAKE) clean) ; \
+	    $(MAKE) -C $${native} clean ; \
 	done
 
 toolchain-clean:
 	@for tc in $(dir $(wildcard toolchains/*/Makefile)) ; \
 	do \
-	    (cd $${tc} && $(MAKE) clean) ; \
+	    $(MAKE) -C $${tc} clean ; \
+	done
+
+toolkit-clean:
+	@for tk in $(dir $(wildcard toolkit/*/Makefile)) ; \
+	do \
+	    $(MAKE) -C $${tk} clean ; \
 	done
 
 kernel-clean:
 	@for kernel in $(dir $(wildcard kernel/*/Makefile)) ; \
 	do \
-	    (cd $${kernel} && $(MAKE) clean) ; \
+	    rm -rf $${kernel}/work* ; \
 	done
 
 cross-clean:
 	@for cross in $(dir $(wildcard cross/*/Makefile)) ; \
 	do \
-	    (cd $${cross} && $(MAKE) clean) ; \
+	    $(MAKE) -C $${cross} clean ; \
 	done
 
 spk-clean:
 	@for spk in $(dir $(wildcard spk/*/Makefile)) ; \
 	do \
-	    (cd $${spk} && $(MAKE) clean) ; \
+	    $(MAKE) -C $${spk} clean ; \
 	done
 
 %: spk/%/Makefile
@@ -66,7 +72,7 @@ native-%-clean: native/%/Makefile
 dependency-tree:
 	@for spk in $(dir $(wildcard spk/*/Makefile)) ; \
 	do \
-	    $(MAKE) -C $${spk} dependency-tree | grep -P "^[\t]"; \
+	    $(MAKE) -C $${spk} dependency-tree | grep -P "^[\t]" ; \
 	done
 
 # build dependency list for all packages
@@ -87,43 +93,43 @@ $(foreach arch,$(AVAILABLE_ARCHS),$(foreach spk,$(SUPPORTED_SPKS),$(eval $(call
 prepare: downloads
 	@for tc in $(dir $(wildcard toolchains/*/Makefile)) ; \
 	do \
-	    (cd $${tc} && $(MAKE)) ; \
+	    $(MAKE) -C $${tc} ; \
 	done
 
 downloads:
 	@for dl in $(dir $(wildcard cross/*/Makefile)) ; \
 	do \
-	    (cd $${dl} && $(MAKE) download) ; \
+	    $(MAKE) -C $${tc} download ; \
 	done
 
 natives:
 	@for n in $(dir $(wildcard native/*/Makefile)) ; \
 	do \
-	    (cd $${n} && $(MAKE)) ; \
+	    $(MAKE) -C $${n} ; \
 	done
 
 native-digests:
 	@for n in $(dir $(wildcard native/*/Makefile)) ; \
 	do \
-	    (cd $${n} && $(MAKE) digests) ; \
+	    $(MAKE) -C $${n} digests ; \
 	done
 
 toolchain-digests:
 	@for tc in $(dir $(wildcard toolchains/*/Makefile)) ; \
 	do \
-	    (cd $${tc} && $(MAKE) digests) ; \
+	    $(MAKE) -C $${tc} digests ; \
 	done
 
 kernel-digests:
 	@for kernel in $(dir $(wildcard kernel/*/Makefile)) ; \
 	do \
-	    (cd $${kernel} && $(MAKE) digests) ; \
+	    $(MAKE) -C $${kernel} digests ; \
 	done
 
 cross-digests:
 	@for cross in $(dir $(wildcard cross/*/Makefile)) ; \
 	do \
-	    (cd $${cross} && $(MAKE) digests) ; \
+	    $(MAKE) -C $${cross} digests ; \
 	done
 
 jsonlint:

diff --git a/cross/acl/Makefile b/cross/acl/Makefile
@@ -2,7 +2,7 @@ PKG_NAME = acl
 PKG_VERS = 2.2.52
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).src.$(PKG_EXT)
-PKG_DIST_SITE = http://download.savannah.gnu.org/releases/acl
+PKG_DIST_SITE = https://download.savannah.gnu.org/releases/acl
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/attr

diff --git a/cross/alsa-lib/Makefile b/cross/alsa-lib/Makefile
@@ -1,28 +1,26 @@
 PKG_NAME = alsa-lib
 PKG_VERS = 1.1.2
 PKG_EXT = tar.bz2
-PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
-PKG_DIST_NAME = $(PKG_DIR).$(PKG_EXT)
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = ftp://ftp.alsa-project.org/pub/lib
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS =
 
-HOMEPAGE = http://www.alsa-project.org/
+HOMEPAGE = https://www.alsa-project.org/
 COMMENT  = Advanced Linux Sound Architecture provides audio and MIDI functionality to the Linux operating system
-LICENSE  =
+LICENSE  = LGPLv2.1
 
 GNU_CONFIGURE = 1
 CONFIGURE_ARGS = --disable-python
 ifeq ($(findstring $(ARCH), ppc853x ppc854x),$(ARCH))
 ADDITIONAL_CFLAGS = -DNO_TLS_PFX
 endif
 
-INSTALL_TARGET = myInstall
+INSTALL_TARGET = alsa-lib_install
 
 include ../../mk/spksrc.cross-cc.mk
 
-
-.PHONY: myInstall
-myInstall:
+.PHONY: alsa-lib_install
+alsa-lib_install:
 	$(RUN) make install DESTDIR=$(INSTALL_DIR)
-
diff --git a/cross/alsa-oss/Makefile b/cross/alsa-oss/Makefile
@@ -1,22 +1,21 @@
 PKG_NAME = alsa-oss
 PKG_VERS = 1.0.28
 PKG_EXT = tar.bz2
-PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
-PKG_DIST_NAME = $(PKG_DIR).$(PKG_EXT)
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = ftp://ftp.alsa-project.org/pub/oss-lib
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/alsa-lib
 
-HOMEPAGE = http://www.alsa-project.org/
+HOMEPAGE = https://www.alsa-project.org/
 COMMENT  = Advanced Linux Sound Architecture provides audio and MIDI functionality to the Linux operating system
 LICENSE  =
 
 GNU_CONFIGURE = 1
-INSTALL_TARGET = myInstall
+INSTALL_TARGET = alsa-oss_install
 
 include ../../mk/spksrc.cross-cc.mk
 
-.PHONY: myInstall
-myInstall:
+.PHONY: alsa-oss_install
+alsa-oss_install:
 	$(RUN) make install DESTDIR=$(INSTALL_DIR)
-
diff --git a/cross/alsa-utils/Makefile b/cross/alsa-utils/Makefile
@@ -1,31 +1,31 @@
 PKG_NAME = alsa-utils
 PKG_VERS = 1.0.26
 PKG_EXT = tar.bz2
-PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
-PKG_DIST_NAME = $(PKG_DIR).$(PKG_EXT)
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = ftp://ftp.alsa-project.org/pub/utils
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/alsa-lib cross/ncurses
 
-HOMEPAGE = http://www.alsa-project.org/
+HOMEPAGE = https://www.alsa-project.org/
 COMMENT  = Advanced Linux Sound Architecture provides audio and MIDI functionality to the Linux operating system
-LICENSE  =
+LICENSE  = GPLv2
 
 GNU_CONFIGURE = 1
 CONFIGURE_ARGS = --with-curses=ncurses
-CONFIGURE_TARGET = myConfigure
-INSTALL_TARGET = myInstall
+CONFIGURE_TARGET = alsa-utils_configure
+INSTALL_TARGET = alsa-utils_install
 
 include ../../mk/spksrc.cross-cc.mk
 
-.PHONY: myConfigure
-myConfigure:
+.PHONY: alsa-utils_configure
+alsa-utils_configure:
 	sed -i.orig $(INSTALL_DIR)/$(INSTALL_PREFIX)/bin/ncurses5-config \
 	    -e 's#^prefix=".*"$$#prefix="$(INSTALL_DIR)/$(INSTALL_PREFIX)"#'
 	$(RUN) PATH=$(INSTALL_DIR)/$(INSTALL_PREFIX)/bin/:$(PATH) ./configure $(REAL_CONFIGURE_ARGS)
 	mv $(INSTALL_DIR)/$(INSTALL_PREFIX)/bin/ncurses5-config.orig $(INSTALL_DIR)/$(INSTALL_PREFIX)/bin/ncurses5-config
 
-.PHONY: myInstall
-myInstall:
+.PHONY: alsa-utils_install
+alsa-utils_install:
 	$(RUN) make install DESTDIR=$(INSTALL_DIR)
 
diff --git a/cross/argtable/Makefile b/cross/argtable/Makefile
@@ -2,13 +2,13 @@ PKG_NAME = argtable
 PKG_VERS = 2-13
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = http://prdownloads.sourceforge.net/$(PKG_NAME)
+PKG_DIST_SITE = https://prdownloads.sourceforge.net/$(PKG_NAME)
 PKG_DIR = $(PKG_NAME)$(PKG_VERS)
 
 DEPENDS =
 
-HOMEPAGE = http://sourceforge.net/projects/argtable/
-COMMENT  =
+HOMEPAGE = https://sourceforge.net/projects/argtable/
+COMMENT  = Argtable is an ANSI C library for parsing GNU style command line arguments.
 
 GNU_CONFIGURE = 1
 

diff --git a/cross/arp-scan/Makefile b/cross/arp-scan/Makefile
@@ -8,7 +8,7 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/libpcap
 
-HOMEPAGE = http://www.royhills.co.uk/wiki/index.php/Arp-scan_User_Guide
+HOMEPAGE = https://www.royhills.co.uk/wiki/index.php/Arp-scan_User_Guide
 COMMENT  = Command-line tool for system discovery and fingerprinting. It constructs and sends ARP requests to the specified IP addresses, and displays any responses that are received. 
 LICENSE  = MIT
 

diff --git a/cross/attr/Makefile b/cross/attr/Makefile
@@ -2,7 +2,7 @@ PKG_NAME = attr
 PKG_VERS = 2.4.46
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).src.$(PKG_EXT)
-PKG_DIST_SITE = http://download.savannah.gnu.org/releases/attr
+PKG_DIST_SITE = https://download.savannah.gnu.org/releases/attr
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS =

diff --git a/cross/audiofile/Makefile b/cross/audiofile/Makefile
@@ -2,12 +2,12 @@ PKG_NAME = audiofile
 PKG_VERS = 0.3.3
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = http://audiofile.68k.org
+PKG_DIST_SITE = https://audiofile.68k.org
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/alsa-lib
 
-HOMEPAGE = http://www.68k.org/~michael/audiofile/
+HOMEPAGE = https://www.68k.org/~michael/audiofile/
 COMMENT  = Handle reading and writing audio files in many common formats
 LICENSE  = LGPL
 

diff --git a/cross/bash/Makefile b/cross/bash/Makefile
@@ -2,12 +2,12 @@ PKG_NAME = bash
 PKG_VERS = 4.3
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = http://ftp.gnu.org/gnu/bash
+PKG_DIST_SITE = https://ftp.gnu.org/gnu/bash
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/ncurses
 
-HOMEPAGE = http://www.gnu.org/software/bash/
+HOMEPAGE = https://www.gnu.org/software/bash/
 COMMENT  = Bash is the GNU Project's shell. Bash is the Bourne Again SHell. Bash is an sh-compatible shell that incorporates useful features from the Korn shell (ksh) and C shell (csh).
 LICENSE  = GPLv3
 

diff --git a/cross/bc/Makefile b/cross/bc/Makefile
@@ -2,7 +2,7 @@ PKG_NAME = bc
 PKG_VERS = 1.06
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = http://ftp.gnu.org/gnu/bc/
+PKG_DIST_SITE = https://ftp.gnu.org/gnu/bc/
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS =

diff --git a/cross/berkeleydb-5.3/Makefile b/cross/berkeleydb-5.3/Makefile
@@ -2,15 +2,15 @@ PKG_NAME = db
 PKG_VERS = 5.3.28
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = http://download.oracle.com/berkeley-db
+PKG_DIST_SITE = https://download.oracle.com/berkeley-db
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 SRC_DIR = build_unix
 
 # NOTE: Python only supports berkeleydb up to 5.3, not 6.x!
 
 DEPENDS =
 
-HOMEPAGE = http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index.html
+HOMEPAGE = https://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index.html
 COMMENT  = Berkeley DB is a family of embedded key-value database libraries providing scalable high-performance data management services to applications. The Berkeley DB products use simple function-call APIs for data access and management.
 LICENSE  = AGPLv3
 

diff --git a/cross/berkeleydb/Makefile b/cross/berkeleydb/Makefile
@@ -2,13 +2,13 @@ PKG_NAME = db
 PKG_VERS = 6.2.23
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = http://download.oracle.com/berkeley-db
+PKG_DIST_SITE = https://download.oracle.com/berkeley-db
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 SRC_DIR = build_unix
 
 DEPENDS = 
 
-HOMEPAGE = http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index.html
+HOMEPAGE = https://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index.html
 COMMENT  = Berkeley DB is a family of embedded key-value database libraries providing scalable high-performance data management services to applications. The Berkeley DB products use simple function-call APIs for data access and management.
 LICENSE  = AGPLv3
 

diff --git a/cross/bicbucstriim/Makefile b/cross/bicbucstriim/Makefile
@@ -2,12 +2,12 @@ PKG_NAME = BicBucStriim
 PKG_VERS = 1.3.6
 PKG_EXT = zip
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = http://projekte.textmulch.de/bicbucstriim/downloads
+PKG_DIST_SITE = https://projekte.textmulch.de/bicbucstriim/downloads
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS =
 
-HOMEPAGE = http://rvolz.github.com/BicBucStriim/
+HOMEPAGE = https://rvolz.github.com/BicBucStriim/
 COMMENT  = BicBucStriim streams books, digital books. It fills a gap in the functionality of current NAS devices, which provide access to your collection of music, videos and photos -- but not books. BicBucStriim covers that area and provides web-based access to your e-book collection.
 LICENSE  = MIT