- minor reworks

4 years ago · 0dda94124a
412 changed files with 3679 additions and 4685 deletions
--- a/2
+++ b/2
@ -135,7 +135,7 @@ help:
 	@echo " * make image      - Builds our beautiful NI-Image"
 	@echo ""
 	@echo "Later, you might find those useful:"
-	@echo " * make update-all - Update buildsystem and all sources"
+	@echo " * make update     - Update buildsystem and all sources"
 	@echo ""
 	@echo "Cleanup:"
 	@echo " * make clean      - Clean up from previous build an prepare for a new one"
--- a/config.example
+++ b/config.example
@ -51,7 +51,7 @@ MAINTAINER = $(shell whoami)
 # -----------------------------------------------------------------------------

 # use lastest VU+ drivers
-#VUPLUS-DRIVERS_LATEST = yes
+#VUPLUS_DRIVERS_LATEST = yes

 # -----------------------------------------------------------------------------

--- a/make/buildsystem-bootstrap.mk
+++ b/make/buildsystem-bootstrap.mk
@ -33,7 +33,7 @@ bootstrap: $(BOOTSTRAP)
 # -----------------------------------------------------------------------------

 skeleton: | $(TARGET_DIR)
-	$(INSTALL_COPY) --remove-destination $(SKEL-ROOT)/. $(TARGET_DIR)/
+	$(INSTALL_COPY) --remove-destination $(SKEL_ROOT)/. $(TARGET_DIR)/
 	$(SED) 's|%(BOOT_PARTITION)|$(BOOT_PARTITION)|' $(TARGET_sysconfdir)/mdev.conf

 # -----------------------------------------------------------------------------
@ -115,17 +115,17 @@ var-update: $(TARGET_localstatedir)/update
 $(TARGET_localstatedir)/update: | $(TARGET_DIR)
 	mkdir -p $(@)
 ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1))
-	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/zImage $(@)
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/zImage $(@)
 else ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd2))
-	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/vmlinux.ub.gz $(@)
-	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/uldr.bin $(@)
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/vmlinux.ub.gz $(@)
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/uldr.bin $(@)
  ifeq ($(BOXMODEL),kronos_v2)
-	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/u-boot.bin.kronos_v2 $(@)/u-boot.bin
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/u-boot.bin.kronos_v2 $(@)/u-boot.bin
  else
-	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/u-boot.bin $(@)
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/u-boot.bin $(@)
  endif
 endif
-	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/stb_update.data $(@)
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/stb_update.data $(@)

 endif

--- a/make/buildsystem-helpers.mk
+++ b/make/buildsystem-helpers.mk
@ -3,6 +3,43 @@
 #
 # -----------------------------------------------------------------------------

+# download archives into download directory
+DOWNLOAD = wget --no-check-certificate -t3 -T60 -c -P $(DL_DIR)
+
+# unpack archives into build directory
+UNTAR = tar -C $(BUILD_DIR) -xf $(DL_DIR)
+UNZIP = unzip -d $(BUILD_DIR) -o $(DL_DIR)
+
+# clean up
+REMOVE = rm -rf $(BUILD_DIR)
+
+# build helper variables
+CD    = set -e; cd
+CHDIR = $(CD) $(BUILD_DIR)
+MKDIR = mkdir -p $(BUILD_DIR)
+CPDIR = cp -a -t $(BUILD_DIR) $(DL_DIR)
+#TOUCH = @touch $(DEPS_DIR)/$(@)
+TOUCH = @touch $(if $(findstring host-,$(@)),$(HOST_DEPS_DIR),$(DEPS_DIR))/$(@)
+SED   = $(shell which sed || type -p sed) -i -e
+
+INSTALL      = install
+INSTALL_DATA = $(INSTALL) -m 0644
+INSTALL_EXEC = $(INSTALL) -m 0755
+INSTALL_COPY = cp -a
+
+define INSTALL_EXIST # (source, dest)
+	if [ -d $(dir $(1)) ]; then \
+		$(INSTALL) -d $(2); \
+		$(INSTALL_COPY) $(1) $(2); \
+	fi
+endef
+
+GET-GIT-ARCHIVE = $(HELPERS_DIR)/get-git-archive.sh
+GET-GIT-SOURCE  = $(HELPERS_DIR)/get-git-source.sh
+GET-SVN-SOURCE  = $(HELPERS_DIR)/get-svn-source.sh
+UPDATE-RC.D     = $(HELPERS_DIR)/update-rc.d -r $(TARGET_DIR)
+
+# -----------------------------------------------------------------------------
 # execute local scripts
 define local-script
 	@if [ -x $(LOCAL_DIR)/scripts/$(1) ]; then \
@ -16,22 +53,22 @@ endef
 define apply_patches
 	l=$(strip $(2)); test -z $$l && l=1; \
 	for i in $(1); do \
-		if [ -e $$i -o -e $(PATCHES)/$$i ]; then \
+		if [ -e $$i -o -e $(PKG_PATCHES_DIR)/$$i ]; then \
 			if [ -d $$i ]; then \
 				for p in $$i/*; do \
-					echo -e "$(TERM_YELLOW)Applying $${p#$(PATCHES)/}$(TERM_NORMAL)"; \
+					echo -e "$(TERM_YELLOW)Applying $${p#$(PKG_PATCHES_DIR)/}$(TERM_NORMAL)"; \
 					if [ $${p:0:1} == "/" ]; then \
 						patch -p$$l -i $$p; \
 					else \
-						patch -p$$l -i $(PATCHES)/$$p; \
+						patch -p$$l -i $(PKG_PATCHES_DIR)/$$p; \
 					fi; \
 				done; \
 			else \
-				echo -e "$(TERM_YELLOW)Applying $${i#$(PATCHES)/}$(TERM_NORMAL)"; \
+				echo -e "$(TERM_YELLOW)Applying $${i#$(PKG_PATCHES_DIR)/}$(TERM_NORMAL)"; \
 				if [ $${i:0:1} == "/" ]; then \
 					patch -p$$l -i $$i; \
 				else \
-					patch -p$$l -i $(PATCHES)/$$i; \
+					patch -p$$l -i $(PKG_PATCHES_DIR)/$$i; \
 				fi; \
 			fi; \
 		fi; \
@ -54,10 +91,10 @@ REWRITE_LIBTOOL_RULES = "s,^libdir=.*,libdir='$(1)',; \

 REWRITE_LIBTOOL_TAG = rewritten=1

-define REWRITE_LIBTOOL # (libdir)
+define rewrite_libtool # (libdir)
 	for la in $$(find $(1) -name "*.la" -type f); do \
 		if ! grep -q "$(REWRITE_LIBTOOL_TAG)" $${la}; then \
-			echo -e "$(TERM_YELLOW)Rewriting $${la#$(TARGET_DIR)/}$(TERM_NORMAL)"; \
+			$(call MESSAGE,"Rewriting $${la#$(TARGET_DIR)/}"); \
 			$(SED) $(REWRITE_LIBTOOL_RULES) $${la}; \
 			echo -e "\n# Adapted to buildsystem\n$(REWRITE_LIBTOOL_TAG)" >> $${la}; \
 		fi; \
@ -65,8 +102,8 @@ define REWRITE_LIBTOOL # (libdir)
 endef

 # rewrite libtool libraries automatically
-REWRITE_LIBTOOL_LA = $(call REWRITE_LIBTOOL,$(TARGET_base_libdir)); \
-		     $(call REWRITE_LIBTOOL,$(TARGET_libdir))
+REWRITE_LIBTOOL = $(foreach libdir,$(TARGET_base_libdir) $(TARGET_libdir),\
+			$(call rewrite_libtool,$(libdir))$(sep))

 # -----------------------------------------------------------------------------

@ -102,120 +139,6 @@ endef

 # -----------------------------------------------------------------------------

-#
-# $(1) = title
-# $(2) = color
-#	0 - Black
-#	1 - Red
-#	2 - Green
-#	3 - Yellow
-#	4 - Blue
-#	5 - Magenta
-#	6 - Cyan
-#	7 - White
-# $(3) = left|center|right
-#
-define draw_line
-	@ \
-	printf '%.0s-' {1..$(shell tput cols)}; \
-	if test "$(1)"; then \
-		cols=$(shell tput cols); \
-		length=$(shell echo $(1) | awk '{print length}'); \
-		case "$(3)" in \
-			*right)  let indent="length + 1" ;; \
-			*center) let indent="cols - (cols - length) / 2" ;; \
-			*left|*) let indent="cols" ;; \
-		esac; \
-		tput cub $$indent; \
-		test "$(2)" && printf $$(tput setaf $(2)); \
-		printf '$(1)'; \
-		test "$(2)" && printf $$(tput sgr0); \
-	fi; \
-	echo
-endef
-
-# -----------------------------------------------------------------------------
-
-archives-list:
-	@rm -f $(BUILD_DIR)/$(@)
-	@make -qp | grep --only-matching '^\$(DL_DIR).*:' | sed "s|:||g" > $(BUILD_DIR)/$(@)
-
-DOCLEANUP ?= no
-GETMISSING ?= no
-archives-info: archives-list
-	@echo "[ ** ] Unused targets in make/archives.mk"
-	@grep --only-matching '^\$$(DL_DIR).*:' make/archives.mk | sed "s|:||g" | \
-	while read target; do \
-		found=false; \
-		for makefile in make/*.mk; do \
-			if [ "$${makefile##*/}" = "archives.mk" ]; then \
-				continue; \
-			fi; \
-			if [ "$${makefile: -9}" = "-extra.mk" ]; then \
-				continue; \
-			fi; \
-			if grep -q "$$target" $$makefile; then \
-				found=true; \
-			fi; \
-			if [ "$$found" = "true" ]; then \
-				continue; \
-			fi; \
-		done; \
-		if [ "$$found" = "false" ]; then \
-			echo -e "[$(TERM_RED) !! $(TERM_NORMAL)] $$target"; \
-		fi; \
-	done;
-	@echo "[ ** ] Unused archives"
-	@find $(DL_DIR)/ -maxdepth 1 -type f | \
-	while read archive; do \
-		if ! grep -q $$archive $(BUILD_DIR)/archives-list; then \
-			echo -e "[$(TERM_YELLOW) rm $(TERM_NORMAL)] $$archive"; \
-			if [ "$(DOCLEANUP)" = "yes" ]; then \
-				rm $$archive; \
-			fi; \
-		fi; \
-	done;
-	@echo "[ ** ] Missing archives"
-	@cat $(BUILD_DIR)/archives-list | \
-	while read archive; do \
-		if [ -e $$archive ]; then \
-			#echo -e "[$(TERM_GREEN) ok $(TERM_NORMAL)] $$archive"; \
-			true; \
-		else \
-			echo -e "[$(TERM_YELLOW) -- $(TERM_NORMAL)] $$archive"; \
-			if [ "$(GETMISSING)" = "yes" ]; then \
-				make $$archive; \
-			fi; \
-		fi; \
-	done;
-	@$(REMOVE)/archives-list
-
-# -----------------------------------------------------------------------------
-
-# FIXME - how to resolve variables while grepping makefiles?
-patches-info:
-	@echo "[ ** ] Unused patches"
-	@for patch in $(PATCHES)/*; do \
-		if [ ! -f $$patch ]; then \
-			continue; \
-		fi; \
-		patch=$${patch##*/}; \
-		found=false; \
-		for makefile in make/*.mk; do \
-			if grep -q "$$patch" $$makefile; then \
-				found=true; \
-			fi; \
-			if [ "$$found" = "true" ]; then \
-				continue; \
-			fi; \
-		done; \
-		if [ "$$found" = "false" ]; then \
-			echo -e "[$(TERM_RED) !! $(TERM_NORMAL)] $$patch"; \
-		fi; \
-	done;
-
-# -----------------------------------------------------------------------------
-
 # Create reversed changelog using git log --reverse.
 # Remove duplicated commits and re-reverse the changelog using awk.
 # This keeps the original commit and removes all picked duplicates.
@ -227,14 +150,11 @@ endef

 changelogs:
 	$(call make-changelog) > $(STAGING_DIR)/changelog-buildsystem
-	$(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); \
+	$(CD) $(SOURCE_DIR)/$(NI_NEUTRINO); \
 		$(call make-changelog) > $(STAGING_DIR)/changelog-neutrino
-	$(CD) $(SOURCE_DIR)/$(NI-LIBSTB-HAL); \
+	$(CD) $(SOURCE_DIR)/$(NI_LIBSTB_HAL); \
 		$(call make-changelog) > $(STAGING_DIR)/changelog-libstb-hal

 # -----------------------------------------------------------------------------

-PHONY += archives-list
-PHONY += archives-info
-PHONY += patches-info
 PHONY += changelogs
--- a/make/buildsystem-prerequisites.mk
+++ b/make/buildsystem-prerequisites.mk
@ -70,12 +70,12 @@ download:
 $(SOURCE_DIR):
 	mkdir -p $(@)

-$(BUILD-GENERIC-PC):
-	git clone $(NI-PUBLIC)/$(NI-BUILD-GENERIC-PC).git $(BUILD-GENERIC-PC)
+$(BUILD_GENERIC_PC):
+	git clone $(NI_PUBLIC)/$(NI_BUILD_GENERIC_PC).git $(BUILD_GENERIC_PC)

-$(SOURCE_DIR)/$(NI-NEUTRINO):
+$(SOURCE_DIR)/$(NI_NEUTRINO):
 	$(CD) $(SOURCE_DIR); \
-		git clone $(NI-PUBLIC)/$(@F).git
+		git clone $(NI_PUBLIC)/$(@F).git
 ifeq ($(NI_ADMIN),true)
 	$(CD) $(@); \
 		git remote add tuxbox $(GITHUB)/tuxbox-neutrino/gui-neutrino.git; \
@ -85,9 +85,9 @@ ifeq ($(NI_ADMIN),true)
 		git fetch --all
 endif

-$(SOURCE_DIR)/$(NI-LIBSTB-HAL):
+$(SOURCE_DIR)/$(NI_LIBSTB_HAL):
 	$(CD) $(SOURCE_DIR); \
-		git clone $(NI-PUBLIC)/$(@F).git
+		git clone $(NI_PUBLIC)/$(@F).git
 ifeq ($(NI_ADMIN),true)
 	$(CD) $(@); \
 		git remote add tuxbox $(GITHUB)/tuxbox-neutrino/library-stb-hal.git; \
@ -100,13 +100,13 @@ endif
 $(SOURCE_DIR)/$(NI-LIBCOOLSTREAM):
 ifeq ($(HAS_LIBCS),yes)
 	$(CD) $(SOURCE_DIR); \
-		git clone $(NI-PRIVATE)/$(@F).git
+		git clone $(NI_PRIVATE)/$(@F).git
 endif

 # upstream for rebase
-$(SOURCE_DIR)/$(NI-FFMPEG):
+$(SOURCE_DIR)/$(NI_FFMPEG):
 	$(CD) $(SOURCE_DIR); \
-		git clone $(NI-PUBLIC)/$(@F).git
+		git clone $(NI_PUBLIC)/$(@F).git
 ifeq ($(NI_ADMIN),true)
 	$(CD) $(@); \
 		git remote add upstream https://git.ffmpeg.org/ffmpeg.git; \
@ -115,9 +115,9 @@ endif

 # upstream for rebase
 # torvalds for cherry-picking
-$(SOURCE_DIR)/$(NI-LINUX-KERNEL):
+$(SOURCE_DIR)/$(NI_LINUX_KERNEL):
 	$(CD) $(SOURCE_DIR); \
-		git clone $(NI-PUBLIC)/$(@F).git
+		git clone $(NI_PUBLIC)/$(@F).git
 ifeq ($(NI_ADMIN),true)
 	$(CD) $(@); \
 		git remote add upstream https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git; \
@ -126,9 +126,9 @@ ifeq ($(NI_ADMIN),true)
 endif

 # upstream for rebase
-$(SOURCE_DIR)/$(NI-OFGWRITE):
+$(SOURCE_DIR)/$(NI_OFGWRITE):
 	$(CD) $(SOURCE_DIR); \
-		git clone $(NI-PUBLIC)/$(@F).git
+		git clone $(NI_PUBLIC)/$(@F).git
 ifeq ($(NI_ADMIN),true)
 	$(CD) $(@); \
 		git remote add upstream $(GITHUB)/oe-alliance/ofgwrite.git; \
@ -136,42 +136,42 @@ ifeq ($(NI_ADMIN),true)
 endif

 # upstream for rebase
-$(SOURCE_DIR)/$(NI-RTMPDUMP):
+$(SOURCE_DIR)/$(NI_RTMPDUMP):
 	$(CD) $(SOURCE_DIR); \
-		git clone $(NI-PUBLIC)/$(@F).git
+		git clone $(NI_PUBLIC)/$(@F).git
 ifeq ($(NI_ADMIN),true)
 	$(CD) $(@); \
 		git remote add upstream git://git.ffmpeg.org/rtmpdump; \
 		git fetch --all
 endif

-$(SOURCE_DIR)/$(NI-DRIVERS-BIN) \
-$(SOURCE_DIR)/$(NI-LOGO-STUFF) \
-$(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS) \
-$(SOURCE_DIR)/$(NI-OPENTHREADS) \
-$(SOURCE_DIR)/$(NI-STREAMRIPPER):
+$(SOURCE_DIR)/$(NI_DRIVERS_BIN) \
+$(SOURCE_DIR)/$(NI_LOGO_STUFF) \
+$(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS) \
+$(SOURCE_DIR)/$(NI_OPENTHREADS) \
+$(SOURCE_DIR)/$(NI_STREAMRIPPER):
 	$(CD) $(SOURCE_DIR); \
-		git clone $(NI-PUBLIC)/$(@F).git
+		git clone $(NI_PUBLIC)/$(@F).git

 ni-sources: $(SOURCE_DIR) \
-	$(BUILD-GENERIC-PC) \
-	$(SOURCE_DIR)/$(NI-DRIVERS-BIN) \
-	$(SOURCE_DIR)/$(NI-FFMPEG) \
+	$(BUILD_GENERIC_PC) \
+	$(SOURCE_DIR)/$(NI_DRIVERS_BIN) \
+	$(SOURCE_DIR)/$(NI_FFMPEG) \
 	$(SOURCE_DIR)/$(NI-LIBCOOLSTREAM) \
-	$(SOURCE_DIR)/$(NI-LIBSTB-HAL) \
-	$(SOURCE_DIR)/$(NI-LINUX-KERNEL) \
-	$(SOURCE_DIR)/$(NI-LOGO-STUFF) \
-	$(SOURCE_DIR)/$(NI-NEUTRINO) \
-	$(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS) \
-	$(SOURCE_DIR)/$(NI-OFGWRITE) \
-	$(SOURCE_DIR)/$(NI-OPENTHREADS) \
-	$(SOURCE_DIR)/$(NI-RTMPDUMP) \
-	$(SOURCE_DIR)/$(NI-STREAMRIPPER)
+	$(SOURCE_DIR)/$(NI_LIBSTB_HAL) \
+	$(SOURCE_DIR)/$(NI_LINUX_KERNEL) \
+	$(SOURCE_DIR)/$(NI_LOGO_STUFF) \
+	$(SOURCE_DIR)/$(NI_NEUTRINO) \
+	$(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS) \
+	$(SOURCE_DIR)/$(NI_OFGWRITE) \
+	$(SOURCE_DIR)/$(NI_OPENTHREADS) \
+	$(SOURCE_DIR)/$(NI_RTMPDUMP) \
+	$(SOURCE_DIR)/$(NI_STREAMRIPPER)

 checkout-branches:
-	$(CD) $(SOURCE_DIR)/$(NI-FFMPEG); git checkout $(FFMPEG_BRANCH)
-	$(CD) $(SOURCE_DIR)/$(NI-LINUX-KERNEL); git checkout $(KERNEL_BRANCH)
-	$(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); git checkout $(NEUTRINO_BRANCH)
+	$(CD) $(SOURCE_DIR)/$(NI_FFMPEG); git checkout $(FFMPEG_BRANCH)
+	$(CD) $(SOURCE_DIR)/$(NI_LINUX_KERNEL); git checkout $(KERNEL_BRANCH)
+	$(CD) $(SOURCE_DIR)/$(NI_NEUTRINO); git checkout $(NEUTRINO_BRANCH)

 # -----------------------------------------------------------------------------

--- a/make/buildsystem-update.mk
+++ b/make/buildsystem-update.mk
@ -12,24 +12,24 @@ endif

 update-neutrino:
 	export GIT_MERGE_AUTOEDIT=no; \
-	$(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); \
+	$(CD) $(SOURCE_DIR)/$(NI_NEUTRINO); \
 		git checkout master; \
 		git pull --all

 update-remotes:
 ifeq ($(NI_ADMIN),true)
 	export GIT_MERGE_AUTOEDIT=no; \
-	$(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); \
+	$(CD) $(SOURCE_DIR)/$(NI_NEUTRINO); \
 		git checkout master; \
 		git fetch --all
-	$(CD) $(SOURCE_DIR)/$(NI-LIBSTB-HAL); \
+	$(CD) $(SOURCE_DIR)/$(NI_LIBSTB_HAL); \
 		git checkout master; \
 		git fetch --all
-	$(CD) $(SOURCE_DIR)/$(NI-OFGWRITE); \
+	$(CD) $(SOURCE_DIR)/$(NI_OFGWRITE); \
 		git checkout master; \
 		git fetch --all; \
 		git pull upstream master
-	$(CD) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS); \
+	$(CD) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS); \
 		git checkout master; \
 		git fetch --all; \
 		./update-tuxbox-remotes.sh
@ -38,26 +38,26 @@ endif
 # rebase of ffmpeg/kernel repos forces us to force push into git repo
 # use this target once if such force push was done
 update-ni-force:
-	#rm -rf $(SOURCE_DIR)/$(NI-LINUX-KERNEL)
-	rm -rf $(SOURCE_DIR)/$(NI-FFMPEG)
+	#rm -rf $(SOURCE_DIR)/$(NI_LINUX_KERNEL)
+	rm -rf $(SOURCE_DIR)/$(NI_FFMPEG)
 	make ni-sources
 	make update-ni-sources

 update-ni-sources: ni-sources update-neutrino
-	$(CD) $(BUILD-GENERIC-PC); git pull
-	$(CD) $(SOURCE_DIR)/$(NI-DRIVERS-BIN); git pull
-	$(CD) $(SOURCE_DIR)/$(NI-FFMPEG); git pull --all
+	$(CD) $(BUILD_GENERIC_PC); git pull
+	$(CD) $(SOURCE_DIR)/$(NI_DRIVERS_BIN); git pull
+	$(CD) $(SOURCE_DIR)/$(NI_FFMPEG); git pull --all
 ifeq ($(HAS_LIBCS),yes)
 	$(CD) $(SOURCE_DIR)/$(NI-LIBCOOLSTREAM); git pull
 endif
-	$(CD) $(SOURCE_DIR)/$(NI-LIBSTB-HAL); git pull
-	$(CD) $(SOURCE_DIR)/$(NI-LINUX-KERNEL); git pull --all
-	$(CD) $(SOURCE_DIR)/$(NI-LOGO-STUFF); git pull
-	$(CD) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS); git pull
-	$(CD) $(SOURCE_DIR)/$(NI-OFGWRITE); git pull
-	$(CD) $(SOURCE_DIR)/$(NI-OPENTHREADS); git pull
-	$(CD) $(SOURCE_DIR)/$(NI-RTMPDUMP); git pull
-	$(CD) $(SOURCE_DIR)/$(NI-STREAMRIPPER); git pull
+	$(CD) $(SOURCE_DIR)/$(NI_LIBSTB_HAL); git pull
+	$(CD) $(SOURCE_DIR)/$(NI_LINUX_KERNEL); git pull --all
+	$(CD) $(SOURCE_DIR)/$(NI_LOGO_STUFF); git pull
+	$(CD) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS); git pull
+	$(CD) $(SOURCE_DIR)/$(NI_OFGWRITE); git pull
+	$(CD) $(SOURCE_DIR)/$(NI_OPENTHREADS); git pull
+	$(CD) $(SOURCE_DIR)/$(NI_RTMPDUMP); git pull
+	$(CD) $(SOURCE_DIR)/$(NI_STREAMRIPPER); git pull
 	make checkout-branches

 update: update-self update-ni-sources
@ -70,59 +70,59 @@ push:
 ifeq ($(HAS_INTERNALS),yes)
 	$(CD) $(BASE_DIR)/$(NI-INTERNALS); git push
 endif
-	$(CD) $(BUILD-GENERIC-PC); git push
-	$(CD) $(SOURCE_DIR)/$(NI-DRIVERS-BIN); git push
-	$(CD) $(SOURCE_DIR)/$(NI-FFMPEG); git push --all
+	$(CD) $(BUILD_GENERIC_PC); git push
+	$(CD) $(SOURCE_DIR)/$(NI_DRIVERS_BIN); git push
+	$(CD) $(SOURCE_DIR)/$(NI_FFMPEG); git push --all
 ifeq ($(HAS_LIBCS),yes)
 	$(CD) $(SOURCE_DIR)/$(NI-LIBCOOLSTREAM); git push --all
 endif
-	$(CD) $(SOURCE_DIR)/$(NI-LIBSTB-HAL); git push
-	$(CD) $(SOURCE_DIR)/$(NI-LINUX-KERNEL); git push --all
-	$(CD) $(SOURCE_DIR)/$(NI-LOGO-STUFF); git push
-	$(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); git push
-	$(CD) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS); git push
-	$(CD) $(SOURCE_DIR)/$(NI-OFGWRITE); git push
-	$(CD) $(SOURCE_DIR)/$(NI-OPENTHREADS); git push
-	$(CD) $(SOURCE_DIR)/$(NI-RTMPDUMP); git push
-	$(CD) $(SOURCE_DIR)/$(NI-STREAMRIPPER); git push
+	$(CD) $(SOURCE_DIR)/$(NI_LIBSTB_HAL); git push
+	$(CD) $(SOURCE_DIR)/$(NI_LINUX_KERNEL); git push --all
+	$(CD) $(SOURCE_DIR)/$(NI_LOGO_STUFF); git push
+	$(CD) $(SOURCE_DIR)/$(NI_NEUTRINO); git push
+	$(CD) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS); git push
+	$(CD) $(SOURCE_DIR)/$(NI_OFGWRITE); git push
+	$(CD) $(SOURCE_DIR)/$(NI_OPENTHREADS); git push
+	$(CD) $(SOURCE_DIR)/$(NI_RTMPDUMP); git push
+	$(CD) $(SOURCE_DIR)/$(NI_STREAMRIPPER); git push

 status:
 	git status -s -b
 ifeq ($(HAS_INTERNALS),yes)
 	$(CD) $(BASE_DIR)/$(NI-INTERNALS); git status -s -b
 endif
-	$(CD) $(BUILD-GENERIC-PC); git status -s -b
-	$(CD) $(SOURCE_DIR)/$(NI-DRIVERS-BIN); git status -s -b
-	$(CD) $(SOURCE_DIR)/$(NI-FFMPEG); git status -s -b
+	$(CD) $(BUILD_GENERIC_PC); git status -s -b
+	$(CD) $(SOURCE_DIR)/$(NI_DRIVERS_BIN); git status -s -b
+	$(CD) $(SOURCE_DIR)/$(NI_FFMPEG); git status -s -b
 ifeq ($(HAS_LIBCS),yes)
 	$(CD) $(SOURCE_DIR)/$(NI-LIBCOOLSTREAM); git status -s -b
 endif
-	$(CD) $(SOURCE_DIR)/$(NI-LIBSTB-HAL); git status -s -b
-	$(CD) $(SOURCE_DIR)/$(NI-LINUX-KERNEL); git status -s -b
-	$(CD) $(SOURCE_DIR)/$(NI-LOGO-STUFF); git status -s -b
-	$(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); git status -s -b
-	$(CD) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS); git status -s -b
-	$(CD) $(SOURCE_DIR)/$(NI-OFGWRITE); git status -s -b
-	$(CD) $(SOURCE_DIR)/$(NI-OPENTHREADS); git status -s -b
-	$(CD) $(SOURCE_DIR)/$(NI-RTMPDUMP); git status -s -b
-	$(CD) $(SOURCE_DIR)/$(NI-STREAMRIPPER); git status -s -b
+	$(CD) $(SOURCE_DIR)/$(NI_LIBSTB_HAL); git status -s -b
+	$(CD) $(SOURCE_DIR)/$(NI_LINUX_KERNEL); git status -s -b
+	$(CD) $(SOURCE_DIR)/$(NI_LOGO_STUFF); git status -s -b
+	$(CD) $(SOURCE_DIR)/$(NI_NEUTRINO); git status -s -b
+	$(CD) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS); git status -s -b
+	$(CD) $(SOURCE_DIR)/$(NI_OFGWRITE); git status -s -b
+	$(CD) $(SOURCE_DIR)/$(NI_OPENTHREADS); git status -s -b
+	$(CD) $(SOURCE_DIR)/$(NI_RTMPDUMP); git status -s -b
+	$(CD) $(SOURCE_DIR)/$(NI_STREAMRIPPER); git status -s -b

 # -----------------------------------------------------------------------------

 REPOSITORIES = \
 	. \
-	$(BUILD-GENERIC-PC) \
-	$(SOURCE_DIR)/$(NI-DRIVERS-BIN) \
-	$(SOURCE_DIR)/$(NI-FFMPEG) \
-	$(SOURCE_DIR)/$(NI-LIBSTB-HAL) \
-	$(SOURCE_DIR)/$(NI-LINUX-KERNEL) \
-	$(SOURCE_DIR)/$(NI-LOGO-STUFF) \
-	$(SOURCE_DIR)/$(NI-NEUTRINO) \
-	$(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS) \
-	$(SOURCE_DIR)/$(NI-OFGWRITE) \
-	$(SOURCE_DIR)/$(NI-OPENTHREADS) \
-	$(SOURCE_DIR)/$(NI-RTMPDUMP) \
-	$(SOURCE_DIR)/$(NI-STREAMRIPPER)
+	$(BUILD_GENERIC_PC) \
+	$(SOURCE_DIR)/$(NI_DRIVERS_BIN) \
+	$(SOURCE_DIR)/$(NI_FFMPEG) \
+	$(SOURCE_DIR)/$(NI_LIBSTB_HAL) \
+	$(SOURCE_DIR)/$(NI_LINUX_KERNEL) \
+	$(SOURCE_DIR)/$(NI_LOGO_STUFF) \
+	$(SOURCE_DIR)/$(NI_NEUTRINO) \
+	$(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS) \
+	$(SOURCE_DIR)/$(NI_OFGWRITE) \
+	$(SOURCE_DIR)/$(NI_OPENTHREADS) \
+	$(SOURCE_DIR)/$(NI_RTMPDUMP) \
+	$(SOURCE_DIR)/$(NI_STREAMRIPPER)

 URL_OLD = $(BITBUCKET_SSH):neutrino-images
 URL_NEW = $(if $(filter $(USE_SSH),y),$(GITHUB_SSH):neutrino-images,$(GITHUB)/neutrino-images)
--- a/make/buildsystem-utils.mk
+++ b/make/buildsystem-utils.mk
@ -46,8 +46,8 @@ SHARP_SIGN := \#
 # implementation that avoids the use of __tmp, but that would be even
 # more unreadable and is not worth the effort.

-[LOWER] := a b c d e f g h i j k l m n o p q r s t u v w x y z
-[UPPER] := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
+[LOWER] := a b c d e f g h i j k l m n o p q r s t u v w x y z - .
+[UPPER] := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z _ _

 define caseconvert-helper
 $(1) = $$(strip \
@ -69,11 +69,21 @@ reverse = $(if $(1),$(call reverse,$(wordlist 2,$(words $(1)),$(1))) $(firstword
 # slashes, colons (OK in filenames but not in rules), and spaces.
 sanitize = $(subst $(space),_,$(subst :,_,$(subst /,_,$(strip $(1)))))

-# MESSAGE Macro -- display a message in bold type
-MESSAGE = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(call qstrip,$(1))$(TERM_RESET)"
+TERM_RED	= \033[40;0;31m
+TERM_RED_BOLD	= \033[40;1;31m
+TERM_GREEN	= \033[40;0;32m
+TERM_GREEN_BOLD	= \033[40;1;32m
+TERM_YELLOW	= \033[40;0;33m
+TERM_YELLOW_BOLD= \033[40;1;33m
+TERM_NORMAL	= \033[0m
+
 TERM_BOLD := $(shell tput smso 2>/dev/null)
 TERM_RESET := $(shell tput rmso 2>/dev/null)

+# MESSAGE Macro -- display a message in bold type
+MESSAGE = echo -e "$(TERM_YELLOW)$(call qstrip,$(1))$(TERM_NORMAL)"
+#MESSAGE = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(call qstrip,$(1))$(TERM_RESET)"
+
 # Utility functions for 'find'
 # findfileclauses(filelist) => -name 'X' -o -name 'Y'
 findfileclauses = $(call notfirstword,$(patsubst %,-o -name '%',$(1)))
@ -135,3 +145,35 @@ define PRINTF
 			$(subst $(QUOTE),$(QUOTE)\$(QUOTE)$(QUOTE),\
 				$(subst \,\\,$(1)))))\n'
 endef
+
+#
+# $(1) = title
+# $(2) = color
+#	0 - Black
+#	1 - Red
+#	2 - Green
+#	3 - Yellow
+#	4 - Blue
+#	5 - Magenta
+#	6 - Cyan
+#	7 - White
+# $(3) = left|center|right
+#
+define draw_line
+	@ \
+	printf '%.0s-' {1..$(shell tput cols)}; \
+	if test "$(1)"; then \
+		cols=$(shell tput cols); \
+		length=$(shell echo $(1) | awk '{print length}'); \
+		case "$(3)" in \
+			*right)  let indent="length + 1" ;; \
+			*center) let indent="cols - (cols - length) / 2" ;; \
+			*left|*) let indent="cols" ;; \
+		esac; \
+		tput cub $$indent; \
+		test "$(2)" && printf $$(tput setaf $(2)); \
+		printf '$(1)'; \
+		test "$(2)" && printf $$(tput sgr0); \
+	fi; \
+	echo
+endef
--- a/make/crosstool.mk
+++ b/make/crosstool.mk
@ -49,62 +49,62 @@ kernel-tarball: $(BUILD_DIR)/linux-$(KERNEL_VER).tar

 # create kernel-tarball
 $(BUILD_DIR)/linux-$(KERNEL_VER).tar: | $(BUILD_DIR)
-	$(MAKE) kernel.do_prepare.$(if $(filter $(KERNEL_SOURCE),git),git,tar)
+	$(MAKE) kernel.do_prepare_$(if $(filter $(KERNEL_SOURCE),git),git,tar)
 	tar cf $(@) --exclude-vcs -C $(BUILD_DIR)/$(KERNEL_DIR) .

 # -----------------------------------------------------------------------------

-CROSSTOOL-NG_VER    = git
-CROSSTOOL-NG_DIR    = crosstool-ng.$(CROSSTOOL-NG_VER)
-CROSSTOOL-NG_SOURCE = crosstool-ng.$(CROSSTOOL-NG_VER)
-CROSSTOOL-NG_SITE   = https://github.com/neutrino-images
+CROSSTOOL_NG_VER    = git
+CROSSTOOL_NG_DIR    = crosstool-ng.$(CROSSTOOL_NG_VER)
+CROSSTOOL_NG_SOURCE = crosstool-ng.$(CROSSTOOL_NG_VER)
+CROSSTOOL_NG_SITE   = https://github.com/neutrino-images

-CROSSTOOL-NG_PATCH  = crosstool-ng-bash-version.patch
+CROSSTOOL_NG_PATCH  = crosstool-ng-bash-version.patch

-CROSSTOOL-NG_CONFIG = $(CONFIGS)/ct-ng-$(BOXTYPE).config
+CROSSTOOL_NG_CONFIG = $(PACKAGE_DIR)/crosstool-ng/files/ct-ng-$(BOXTYPE).config
 ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2))
-  CROSSTOOL-NG_CONFIG = $(CONFIGS)/ct-ng-$(BOXTYPE)-$(BOXSERIES).config
+  CROSSTOOL_NG_CONFIG = $(PACKAGE_DIR)/crosstool-ng/files/ct-ng-$(BOXTYPE)-$(BOXSERIES).config
 endif

 # crosstool for hd2 depends on gcc-linaro
-GCC-LINARO_VER    = 4.9-2017.01
-GCC-LINARO_SOURCE = gcc-linaro-$(GCC-LINARO_VER).tar.xz
-GCC-LINARO_SITE   = https://releases.linaro.org/components/toolchain/gcc-linaro/$(GCC-LINARO_VER)
+GCC_LINARO_VER    = 4.9-2017.01
+GCC_LINARO_SOURCE = gcc-linaro-$(GCC_LINARO_VER).tar.xz
+GCC_LINARO_SITE   = https://releases.linaro.org/components/toolchain/gcc-linaro/$(GCC_LINARO_VER)

-$(DL_DIR)/$(GCC-LINARO_SOURCE):
-	$(DOWNLOAD) $(GCC-LINARO_SITE)/$(GCC-LINARO_SOURCE)
+$(DL_DIR)/$(GCC_LINARO_SOURCE):
+	$(DOWNLOAD) $(GCC_LINARO_SITE)/$(GCC_LINARO_SOURCE)

 UCLIBC_VER = 1.0.24

 # -----------------------------------------------------------------------------

 # crosstool for arm-hd2 depends on gcc-linaro
-$(CROSS_BASE)/arm/hd2: $(DL_DIR)/$(GCC-LINARO_SOURCE)
+$(CROSS_BASE)/arm/hd2: $(DL_DIR)/$(GCC_LINARO_SOURCE)

 $(CROSS_DIR): | $(BUILD_DIR)
 	make $(BUILD_DIR)/linux-$(KERNEL_VER).tar
 	#
-	$(REMOVE)/$(CROSSTOOL-NG_DIR)
-	$(GET-GIT-SOURCE) $(CROSSTOOL-NG_SITE)/$(CROSSTOOL-NG_SOURCE) $(DL_DIR)/$(CROSSTOOL-NG_SOURCE)
-	$(CPDIR)/$(CROSSTOOL-NG_SOURCE)
+	$(REMOVE)/$(CROSSTOOL_NG_DIR)
+	$(GET-GIT-SOURCE) $(CROSSTOOL_NG_SITE)/$(CROSSTOOL_NG_SOURCE) $(DL_DIR)/$(CROSSTOOL_NG_SOURCE)
+	$(CPDIR)/$(CROSSTOOL_NG_SOURCE)
 ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2))
-	$(CHDIR)/$(CROSSTOOL-NG_DIR); \
+	$(CHDIR)/$(CROSSTOOL_NG_DIR); \
 		git checkout 1dbb06f2; \
-		$(call apply_patches,$(CROSSTOOL-NG_PATCH))
+		$(call apply_patches,$(PACKAGE_DIR)/crosstool-ng/patches/$(CROSSTOOL_NG_PATCH))
  ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd2))
-	$(CHDIR)/$(CROSSTOOL-NG_DIR); \
-		$(INSTALL_COPY) $(PATCHES)/crosstool-ng/gcc/* patches/gcc/linaro-6.3-2017.02
+	$(CHDIR)/$(CROSSTOOL_NG_DIR); \
+		$(INSTALL_COPY) $(PACKAGE_DIR)/crosstool-ng/patches/gcc/* patches/gcc/linaro-6.3-2017.02
  endif
 endif
-	$(CHDIR)/$(CROSSTOOL-NG_DIR); \
+	$(CHDIR)/$(CROSSTOOL_NG_DIR); \
 		unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE; \
-		$(INSTALL_DATA) $(CROSSTOOL-NG_CONFIG) .config; \
+		$(INSTALL_DATA) $(CROSSTOOL_NG_CONFIG) .config; \
 		$(SED) "s|^CT_PARALLEL_JOBS=.*|CT_PARALLEL_JOBS=$(PARALLEL_JOBS)|" .config; \
 		export NI_LOCAL_TARBALLS_DIR=$(DL_DIR); \
 		export NI_PREFIX_DIR=$(@); \
 		export NI_KERNEL_VERSION=$(KERNEL_VER); \
 		export NI_KERNEL_LOCATION=$(BUILD_DIR)/linux-$(KERNEL_VER).tar; \
-		export NI_LIBC_UCLIBC_CONFIG_FILE=$(CONFIGS)/ct-ng-uClibc-$(UCLIBC_VER).config; \
+		export NI_LIBC_UCLIBC_CONFIG_FILE=$(PACKAGE_DIR)/crosstool-ng/files/ct-ng-uClibc-$(UCLIBC_VER).config; \
 		export LD_LIBRARY_PATH=; \
 		test -f ./configure || ./bootstrap; \
 		./configure --enable-local; \
@ -117,7 +117,7 @@ ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2))
 endif
 	test -e $(CROSS_DIR)/$(TARGET)/lib || ln -sf sys-root/lib $(CROSS_DIR)/$(TARGET)/
 	rm -f $(CROSS_DIR)/$(TARGET)/sys-root/lib/libstdc++.so.6.0.*-gdb.py
-	$(REMOVE)/$(CROSSTOOL-NG_DIR)
+	$(REMOVE)/$(CROSSTOOL_NG_DIR)

 # -----------------------------------------------------------------------------

--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@ -3,33 +3,40 @@
 #
 # -----------------------------------------------------------------------------

-CONFIG_SITE =
-export CONFIG_SITE
-
 LD_LIBRARY_PATH =
 export LD_LIBRARY_PATH

 SHELL := /bin/bash

-# empty variable EMPTY for smoother comparisons
-EMPTY =
-
 # -----------------------------------------------------------------------------

-# set up default parallelism
-PARALLEL_JOBS := $(shell echo $$((1 + `getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1`)))
-override MAKE = make $(if $(findstring j,$(filter-out --%,$(MAKEFLAGS))),,-j$(PARALLEL_JOBS))
+ifndef MAKE
+MAKE := make
+endif
+ifndef HOSTMAKE
+HOSTMAKE = $(MAKE)
+endif
+HOSTMAKE := $(shell which $(HOSTMAKE) || type -p $(HOSTMAKE) || echo make)

-MAKE1 = make -j1
+PARALLEL_JOBS := $(shell echo \
+	$$((1 + `getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1`)))
+
+MAKE1 := $(HOSTMAKE) -j1
+override MAKE = $(HOSTMAKE) \
+	$(if $(findstring j,$(filter-out --%,$(MAKEFLAGS))),,-j$(PARALLEL_JOBS))

 MAKEFLAGS += --no-print-directory
 #MAKEFLAGS += --silent

+TARGET_VENDOR = NI-Buildsystem
+
+TARGET_OS = linux
+
 # -----------------------------------------------------------------------------

 ifeq ($(BOXSERIES),hd1)
-  DRIVERS-BIN_DIR        = $(BOXTYPE)/$(BOXFAMILY)
-  CORTEX-STRINGS_LDFLAG  =
+  DRIVERS_BIN_DIR        = $(BOXTYPE)/$(BOXFAMILY)
+  CORTEX_STRINGS_LDFLAG  =
  TARGET                 = arm-cx2450x-linux-gnueabi
  TARGET_OPTIMIZATION    = -Os
  TARGET_DEBUGGING       = -g
@ -42,8 +49,8 @@ ifeq ($(BOXSERIES),hd1)
  CXX11_ABI              =

 else ifeq ($(BOXSERIES),hd2)
-  DRIVERS-BIN_DIR        = $(BOXTYPE)/$(BOXFAMILY)
-  CORTEX-STRINGS_LDFLAG  = -lcortex-strings
+  DRIVERS_BIN_DIR        = $(BOXTYPE)/$(BOXFAMILY)
+  CORTEX_STRINGS_LDFLAG  = -lcortex-strings
  TARGET                 = arm-cortex-linux-uclibcgnueabi
  TARGET_OPTIMIZATION    = -O2
  TARGET_DEBUGGING       = -g
@ -61,8 +68,8 @@ else ifeq ($(BOXSERIES),hd2)
  CXX11_ABI              = -D_GLIBCXX_USE_CXX11_ABI=0

 else ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse))
-  DRIVERS-BIN_DIR        = $(BOXTYPE)/$(BOXMODEL)
-  CORTEX-STRINGS_LDFLAG  = -lcortex-strings
+  DRIVERS_BIN_DIR        = $(BOXTYPE)/$(BOXMODEL)
+  CORTEX_STRINGS_LDFLAG  = -lcortex-strings
  TARGET                 = arm-cortex-linux-gnueabihf
  TARGET_OPTIMIZATION    = -O2
  TARGET_DEBUGGING       = -g
@ -75,8 +82,8 @@ else ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd5x hd6x vusolo4k vuduo4k vuduo4k
  CXX11_ABI              =

 else ifeq ($(BOXSERIES),$(filter $(BOXSERIES),vuduo))
-  DRIVERS-BIN_DIR        = $(BOXTYPE)/$(BOXMODEL)
-  CORTEX-STRINGS_LDFLAG  =
+  DRIVERS_BIN_DIR        = $(BOXTYPE)/$(BOXMODEL)
+  CORTEX_STRINGS_LDFLAG  =
  TARGET                 = mipsel-unknown-linux-gnu
  TARGET_OPTIMIZATION    = -O2
  TARGET_DEBUGGING       = -g
@ -116,12 +123,13 @@ STATIC_BASE   = $(BASE_DIR)/static
 STATIC_DIR    = $(STATIC_BASE)/$(TARGET_ARCH)-linux-$(KERNEL_VER)
 CONFIGS       = $(BASE_DIR)/configs
 PATCHES       = $(BASE_DIR)/patches
-SKEL-ROOT     = $(BASE_DIR)/skel-root/$(BOXSERIES)
+SKEL_ROOT     = $(BASE_DIR)/skel-root/$(BOXSERIES)
 ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse))
-  SKEL-ROOT   = $(BASE_DIR)/skel-root/vuplus
+  SKEL_ROOT   = $(BASE_DIR)/skel-root/vuplus
 endif
 TARGET_FILES  = $(BASE_DIR)/skel-root/general
 BOOTMENU_DIR  = $(BASE_DIR)/bootmenu
+PACKAGE_DIR   = $(BASE_DIR)/package

 BUILD        ?= $(shell /usr/share/libtool/config/config.guess 2>/dev/null || /usr/share/misc/config.guess 2>/dev/null)

@ -131,19 +139,6 @@ include make/environment-host.mk

 # -----------------------------------------------------------------------------

-PKG_NAME        = $(basename $(@F))
-PKG_UPPER       = $(call UPPERCASE,$(PKG_NAME))
-PKG_LOWER       = $(call LOWERCASE,$(PKG_NAME))
-PKG_VER         = $($(PKG_UPPER)_VER)
-PKG_DIR         = $($(PKG_UPPER)_DIR)
-PKG_SOURCE      = $($(PKG_UPPER)_SOURCE)
-PKG_SITE        = $($(PKG_UPPER)_SITE)
-PKG_BUILD_DIR   = $(BUILD_DIR)/$(PKG_DIR)
-PKG_FILES_DIR   = $(BASE_DIR)/package/$(subst host-,,$(PKG_NAME))/files
-PKG_PATCHES_DIR = $(PATCHES)/$(subst host-,,$(PKG_NAME))
-
-# -----------------------------------------------------------------------------
-
 CCACHE        = /usr/bin/ccache
 CCACHE_DIR    = $(HOME)/.ccache-ni-buildsystem-$(TARGET_ARCH)-linux-$(KERNEL_VER)
 export CCACHE_DIR
@ -164,7 +159,7 @@ STATIC_libdir = $(STATIC_DIR)/$(prefix)/lib
 TARGET_CFLAGS   = -pipe $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_ABI) $(TARGET_EXTRA_CFLAGS) $(CXX11_ABI) -I$(TARGET_includedir)
 TARGET_CPPFLAGS = $(TARGET_CFLAGS)
 TARGET_CXXFLAGS = $(TARGET_CFLAGS)
-TARGET_LDFLAGS  = $(CORTEX-STRINGS_LDFLAG) $(TARGET_EXTRA_LDFLAGS)
+TARGET_LDFLAGS  = $(CORTEX_STRINGS_LDFLAG) $(TARGET_EXTRA_LDFLAGS)
 TARGET_LDFLAGS += -L$(TARGET_base_libdir) -L$(TARGET_libdir)
 TARGET_LDFLAGS += -Wl,-rpath,$(TARGET_libdir) -Wl,-rpath-link,$(TARGET_libdir)
 TARGET_LDFLAGS += -Wl,-O1
@ -179,24 +174,14 @@ TARGET_CPP      = $(TARGET_CROSS)cpp
 TARGET_CXX      = $(TARGET_CROSS)g++
 TARGET_LD       = $(TARGET_CROSS)ld
 TARGET_NM       = $(TARGET_CROSS)nm
-TARGET_OBJCOPY  = $(TARGET_CROSS)objcopy
-TARGET_OBJDUMP  = $(TARGET_CROSS)objdump
 TARGET_RANLIB   = $(TARGET_CROSS)ranlib
 TARGET_READELF  = $(TARGET_CROSS)readelf
+TARGET_OBJCOPY  = $(TARGET_CROSS)objcopy
+TARGET_OBJDUMP  = $(TARGET_CROSS)objdump
 TARGET_STRIP    = $(TARGET_CROSS)strip

 # -----------------------------------------------------------------------------

-TERM_RED	= \033[40;0;31m
-TERM_RED_BOLD	= \033[40;1;31m
-TERM_GREEN	= \033[40;0;32m
-TERM_GREEN_BOLD	= \033[40;1;32m
-TERM_YELLOW	= \033[40;0;33m
-TERM_YELLOW_BOLD= \033[40;1;33m
-TERM_NORMAL	= \033[0m
-
-# -----------------------------------------------------------------------------
-
 # search path(s) for all prerequisites
 VPATH = $(DEPS_DIR) $(HOST_DEPS_DIR)

@ -211,48 +196,29 @@ PKG_CONFIG_SYSROOT_DIR=$(TARGET_DIR)

 # -----------------------------------------------------------------------------

-# download archives into download directory
-DOWNLOAD = wget --no-check-certificate -t3 -T60 -c -P $(DL_DIR)
-
-# unpack archives into build directory
-UNTAR = tar -C $(BUILD_DIR) -xf $(DL_DIR)
-UNZIP = unzip -d $(BUILD_DIR) -o $(DL_DIR)
-
-# clean up
-REMOVE = rm -rf $(BUILD_DIR)
-
-# apply patches
-PATCH = patch -p1 -i $(PATCHES)
-
-# build helper variables
-CD    = set -e; cd
-CHDIR = $(CD) $(BUILD_DIR)
-MKDIR = mkdir -p $(BUILD_DIR)
-CPDIR = cp -a -t $(BUILD_DIR) $(DL_DIR)
-#TOUCH = @touch $(DEPS_DIR)/$(@)
-TOUCH = @touch $(if $(findstring host-,$(@)),$(HOST_DEPS_DIR),$(DEPS_DIR))/$(@)
-SED   = $(shell which sed || type -p sed) -i -e
-
-INSTALL      = install
-INSTALL_DATA = $(INSTALL) -m 0644
-INSTALL_EXEC = $(INSTALL) -m 0755
-INSTALL_COPY = cp -a
-
-define INSTALL_EXIST # (source, dest)
-	if [ -d $(dir $(1)) ]; then \
-		$(INSTALL) -d $(2); \
-		$(INSTALL_COPY) $(1) $(2); \
-	fi
-endef
+PKG_NAME        = $(basename $(@F))
+PKG_UPPER       = $(call UPPERCASE,$(PKG_NAME))
+PKG_LOWER       = $(call LOWERCASE,$(PKG_NAME))
+PKG             = $(PKG_UPPER)
+
+PKG_VER         = $($(PKG)_VER)
+PKG_DIR         = $($(PKG)_DIR)
+PKG_SOURCE      = $($(PKG)_SOURCE)
+PKG_SITE        = $($(PKG)_SITE)
+PKG_PATCH       = $($(PKG)_PATCH)
+
+PKG_BUILD_DIR   = $(BUILD_DIR)/$(PKG_DIR)
+PKG_FILES_DIR   = $(PACKAGE_DIR)/$(subst host-,,$(PKG_NAME))/files
+PKG_PATCHES_DIR = $(PACKAGE_DIR)/$(subst host-,,$(PKG_NAME))/patches

-GET-GIT-ARCHIVE = $(HELPERS_DIR)/get-git-archive.sh
-GET-GIT-SOURCE  = $(HELPERS_DIR)/get-git-source.sh
-GET-SVN-SOURCE  = $(HELPERS_DIR)/get-svn-source.sh
-UPDATE-RC.D     = $(HELPERS_DIR)/update-rc.d -r $(TARGET_DIR)
+PKG_CHDIR       = $(CD) $(PKG_BUILD_DIR)

 # -----------------------------------------------------------------------------

-MAKE_OPTS = \
+#TARGET_MAKE_ENV = \
+#	$($(PKG)_MAKE_ENV)
+
+TARGET_MAKE_OPTS = \
 	CROSS_COMPILE="$(TARGET_CROSS)" \
 	CC="$(TARGET_CC)" \
 	GCC="$(TARGET_CC)" \
@ -269,31 +235,122 @@ MAKE_OPTS = \
 	STRIP="$(TARGET_STRIP)" \
 	ARCH=$(TARGET_ARCH)

-MAKE_ENV = \
-	$(MAKE_OPTS) \
-	\
+#TARGET_MAKE_OPTS += \
+#	$($(PKG)_MAKE_OPTS)
+
+#HOST_MAKE_ENV = \
+#	$($(PKG)_MAKE_ENV)
+
+#HOST_MAKE_OPTS += \
+#	$($(PKG)_MAKE_OPTS)
+
+# -----------------------------------------------------------------------------
+
+TARGET_CONFIGURE_ENV = \
+	$(TARGET_MAKE_OPTS) \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	CPPFLAGS="$(TARGET_CPPFLAGS)" \
 	CXXFLAGS="$(TARGET_CXXFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS)"

-MAKE_ENV += \
+TARGET_CONFIGURE_ENV += \
 	PKG_CONFIG=$(PKG_CONFIG) \
 	PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" \
 	PKG_CONFIG_SYSROOT_DIR=$(PKG_CONFIG_SYSROOT_DIR)

-CONFIGURE_OPTS = \
+TARGET_CONFIGURE_ENV += \
+	$($(PKG)_CONF_ENV)
+
+TARGET_CONFIGURE_OPTS = \
 	--build=$(BUILD) \
 	--host=$(TARGET) \
 	--target=$(TARGET) \
 	\
-	--program-prefix= \
-	--program-suffix=
+	--program-prefix="" \
+	--program-suffix="" \
+	\
+	--prefix=$(prefix) \
+	--exec_prefix=$(exec_prefix) \
+	--sysconfdir=$(sysconfdir) \
+	--localstatedir=$(localstatedir) \
+	\
+	--mandir=$(REMOVE_mandir) \
+	--infodir=$(REMOVE_infodir)
+
+TARGET_CONFIGURE_OPTS += \
+	$($(PKG)_CONF_OPTS)
+
+#HOST_CONFIGURE_ENV = \
+#	$($(PKG)_CONF_ENV)
+
+#HOST_CONFIGURE_OPTS = \
+#	$($(PKG)_CONF_OPTS)

 CONFIGURE = \
+	if [ "$($(PKG)_AUTORECONF)" == "YES" ]; then \
+		$(call MESSAGE,"Autoreconfiguring"); \
+		$($(PKG)_AUTORECONF_ENV) autoreconf -fi $($(PKG)_AUTORECONF_OPTS); \
+	fi; \
 	test -f ./configure || ./autogen.sh && \
-	$(MAKE_ENV) \
-	./configure $(CONFIGURE_OPTS)
+	CONFIG_SITE=/dev/null \
+	$(TARGET_CONFIGURE_ENV) ./configure $(TARGET_CONFIGURE_OPTS)
+
+# -----------------------------------------------------------------------------
+
+TARGET_CMAKE_ENV = \
+	$($(PKG)_CONF_ENV)
+
+TARGET_CMAKE_OPTS = \
+	--no-warn-unused-cli 
+
+TARGET_CMAKE_OPTS += \
+	-DENABLE_STATIC=OFF \
+	-DBUILD_SHARED_LIBS=ON \
+	-DBUILD_DOC=OFF \
+	-DBUILD_DOCS=OFF \
+	-DBUILD_EXAMPLE=OFF \
+	-DBUILD_EXAMPLES=OFF \
+	-DBUILD_TEST=OFF \
+	-DBUILD_TESTS=OFF \
+	-DBUILD_TESTING=OFF \
+	-DCMAKE_BUILD_TYPE="None" \
+	-DCMAKE_SYSTEM_NAME="Linux" \
+	-DCMAKE_SYSTEM_PROCESSOR="$(TARGET_ARCH)" \
+	-DCMAKE_INSTALL_PREFIX="$(prefix)" \
+	-DCMAKE_INSTALL_DOCDIR="$(REMOVE_docdir)" \
+	-DCMAKE_INSTALL_MANDIR="$(REMOVE_mandir)" \
+	-DCMAKE_PREFIX_PATH="$(TARGET_DIR)" \
+	-DCMAKE_INCLUDE_PATH="$(TARGET_includedir)" \
+	-DCMAKE_C_COMPILER="$(TARGET_CC)" \
+	-DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \
+	-DCMAKE_CPP_COMPILER="$(TARGET_CPP)" \
+	-DCMAKE_CPP_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \
+	-DCMAKE_CXX_COMPILER="$(TARGET_CXX)" \
+	-DCMAKE_CXX_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \
+	-DCMAKE_LINKER="$(TARGET_LD)" \
+	-DCMAKE_AR="$(TARGET_AR)" \
+	-DCMAKE_AS="$(TARGET_AS)" \
+	-DCMAKE_NM="$(TARGET_NM)" \
+	-DCMAKE_OBJCOPY="$(TARGET_OBJCOPY)" \
+	-DCMAKE_OBJDUMP="$(TARGET_OBJDUMP)" \
+	-DCMAKE_RANLIB="$(TARGET_RANLIB)" \
+	-DCMAKE_READELF="$(TARGET_READELF)" \
+	-DCMAKE_STRIP="$(TARGET_STRIP)"
+
+TARGET_CMAKE_OPTS += \
+	$($(PKG)_CONF_OPTS)
+
+#HOST_CMAKE_ENV = \
+#	$($(PKG)_CONF_ENV)
+
+#HOST_CMAKE_OPTS = \
+#	$($(PKG)_CONF_OPTS)
+
+CMAKE = \
+	rm -f CMakeCache.txt; \
+	$(TARGET_CMAKE_ENV) cmake $(TARGET_CMAKE_OPTS)
+
+# -----------------------------------------------------------------------------

 define meson-cross-config # (dest dir)
 	mkdir -p $(1)
@ -329,8 +386,6 @@ define meson-cross-config # (dest dir)
 	) > $(1)/meson-cross.config
 endef

-# -----------------------------------------------------------------------------
-
 MESON_CONFIGURE = \
 	$(call meson-cross-config,$(PKG_BUILD_DIR)/build); \
 	unset CC CXX CPP LD AR NM STRIP; \
@ -349,39 +404,6 @@ NINJA_INSTALL = DESTDIR=$(TARGET_DIR) \

 # -----------------------------------------------------------------------------

-CMAKE_OPTS = \
-	-DBUILD_SHARED_LIBS=ON \
-	-DENABLE_STATIC=OFF \
-	-DCMAKE_BUILD_TYPE="None" \
-	-DCMAKE_SYSTEM_NAME="Linux" \
-	-DCMAKE_SYSTEM_PROCESSOR="$(TARGET_ARCH)" \
-	-DCMAKE_INSTALL_PREFIX="$(prefix)" \
-	-DCMAKE_INSTALL_DOCDIR="$(REMOVE_docdir)" \
-	-DCMAKE_INSTALL_MANDIR="$(REMOVE_mandir)" \
-	-DCMAKE_PREFIX_PATH="$(TARGET_DIR)" \
-	-DCMAKE_INCLUDE_PATH="$(TARGET_includedir)" \
-	-DCMAKE_C_COMPILER="$(TARGET_CC)" \
-	-DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \
-	-DCMAKE_CPP_COMPILER="$(TARGET_CPP)" \
-	-DCMAKE_CPP_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \
-	-DCMAKE_CXX_COMPILER="$(TARGET_CXX)" \
-	-DCMAKE_CXX_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \
-	-DCMAKE_LINKER="$(TARGET_LD)" \
-	-DCMAKE_AR="$(TARGET_AR)" \
-	-DCMAKE_AS="$(TARGET_AS)" \
-	-DCMAKE_NM="$(TARGET_NM)" \
-	-DCMAKE_OBJCOPY="$(TARGET_OBJCOPY)" \
-	-DCMAKE_OBJDUMP="$(TARGET_OBJDUMP)" \
-	-DCMAKE_RANLIB="$(TARGET_RANLIB)" \
-	-DCMAKE_READELF="$(TARGET_READELF)" \
-	-DCMAKE_STRIP="$(TARGET_STRIP)"
-
-CMAKE = \
-	rm -f CMakeCache.txt; \
-	cmake --no-warn-unused-cli $(CMAKE_OPTS)
-
-# -----------------------------------------------------------------------------
-
 GITHUB			= https://github.com
 GITHUB_SSH		= git@github.com
 BITBUCKET		= https://bitbucket.org
@ -390,20 +412,20 @@ BITBUCKET_SSH		= git@bitbucket.org
 GNU_MIRROR		= http://ftp.gnu.org/pub/gnu
 KERNEL_MIRROR		= https://cdn.kernel.org/pub

-NI-PUBLIC		= $(GITHUB)/neutrino-images
-NI-PRIVATE		= $(BITBUCKET_SSH):neutrino-images
-
-NI-NEUTRINO		= ni-neutrino
-NI-NEUTRINO-PLUGINS	= ni-neutrino-plugins
-
-BUILD-GENERIC-PC	= build-generic-pc
-NI-BUILD-GENERIC-PC	= ni-build-generic-pc
-NI-DRIVERS-BIN		= ni-drivers-bin
-NI-FFMPEG		= ni-ffmpeg
-NI-LIBSTB-HAL		= ni-libstb-hal
-NI-LINUX-KERNEL		= ni-linux-kernel
-NI-LOGO-STUFF		= ni-logo-stuff
-NI-OFGWRITE		= ni-ofgwrite
-NI-OPENTHREADS		= ni-openthreads
-NI-RTMPDUMP		= ni-rtmpdump
-NI-STREAMRIPPER		= ni-streamripper
+NI_PUBLIC		= $(GITHUB)/neutrino-images
+NI_PRIVATE		= $(BITBUCKET_SSH):neutrino-images
+
+NI_NEUTRINO		= ni-neutrino
+NI_NEUTRINO_PLUGINS	= ni-neutrino-plugins
+
+BUILD_GENERIC_PC	= build-generic-pc
+NI_BUILD_GENERIC_PC	= ni-build-generic-pc
+NI_DRIVERS_BIN		= ni-drivers-bin
+NI_FFMPEG		= ni-ffmpeg
+NI_LIBSTB_HAL		= ni-libstb-hal
+NI_LINUX_KERNEL		= ni-linux-kernel
+NI_LOGO_STUFF		= ni-logo-stuff
+NI_OFGWRITE		= ni-ofgwrite
+NI_OPENTHREADS		= ni-openthreads
+NI_RTMPDUMP		= ni-rtmpdump
+NI_STREAMRIPPER		= ni-streamripper
--- a/make/environment-image.mk
+++ b/make/environment-image.mk
@ -35,22 +35,22 @@ IMAGE_SUMMARIZE = yes
 IMAGE_NEW = no

 # Beta/Release Server
-NI-SERVER = http://neutrino-images.de/neutrino-images
+NI_SERVER = http://neutrino-images.de/neutrino-images
 ifeq ($(IMAGE_TYPE),0)
  # Release
-  NI-SUBDIR = release
+  NI_SUBDIR = release
  IMAGE_TYPE_STRING = release
 else ifeq ($(IMAGE_TYPE),1)
  # Beta
-  NI-SUBDIR = beta
+  NI_SUBDIR = beta
  IMAGE_TYPE_STRING = beta
 else ifeq ($(IMAGE_TYPE),2)
  # Nightly
-  NI-SUBDIR = nightly
+  NI_SUBDIR = nightly
  IMAGE_TYPE_STRING = nightly
 else
  # Selfmade; just for compatibility; not needed for our builds
-  NI-SUBDIR = selfmade
+  NI_SUBDIR = selfmade
  IMAGE_TYPE_STRING = selfmade
 endif

@ -60,7 +60,7 @@ else
  IMAGE_DESC ="$(BOXNAME) [$(IMAGE_SUFFIX)] $(shell echo $(IMAGE_TYPE_STRING) | sed 's/.*/\u&/')"
 endif

-IMAGE_SITE = $(NI-SERVER)/$(NI-SUBDIR)
+IMAGE_SITE = $(NI_SERVER)/$(NI_SUBDIR)
 IMAGE_MD5FILE = $(IMAGE_TYPE_STRING)-$(IMAGE_SUFFIX).txt

 IMAGE_BUILD_DIR = $(BUILD_DIR)/image-build
--- a/make/environment-linux.mk
+++ b/make/environment-linux.mk
@ -7,24 +7,24 @@ ifeq ($(BOXMODEL),nevis)
  KERNEL_VER    = 2.6.34.13
  KERNEL_DIR    = linux-$(KERNEL_VER)
  KERNEL_SOURCE = git
-  KERNEL_SITE   = $(EMPTY)
+  KERNEL_SITE   = $(empty)

  KERNEL_BRANCH = ni/linux-2.6.34.15
-  KERNEL_DTB    = $(EMPTY)
+  KERNEL_DTB    = $(empty)

 else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),apollo shiner kronos kronos_v2))
  KERNEL_VER    = 3.10.93
  KERNEL_DIR    = linux-$(KERNEL_VER)
  KERNEL_SOURCE = git
-  KERNEL_SITE   = $(EMPTY)
+  KERNEL_SITE   = $(empty)

  KERNEL_BRANCH = ni/linux-3.10.108
  ifeq ($(BOXMODEL),$(filter $(BOXMODEL),apollo shiner))
-    KERNEL_DTB    = $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/kernel-dtb/hd849x.dtb
-    KERNEL_CONFIG = $(CONFIGS)/kernel-apollo.config
+    KERNEL_DTB    = $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/kernel-dtb/hd849x.dtb
+    KERNEL_CONFIG = $(PKG_FILES_DIR)/kernel-apollo.defconfig
  else
-    KERNEL_DTB    = $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/kernel-dtb/en75x1.dtb
-    KERNEL_CONFIG = $(CONFIGS)/kernel-kronos.config
+    KERNEL_DTB    = $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/kernel-dtb/en75x1.dtb
+    KERNEL_CONFIG = $(PKG_FILES_DIR)/kernel-kronos.defconfig
  endif

 else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7))
@ -33,9 +33,9 @@ else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7))
  KERNEL_SOURCE = linux-$(KERNEL_VER)-arm.tar.gz
  KERNEL_SITE   = http://downloads.mutant-digital.net

-  KERNEL_BRANCH = $(EMPTY)
+  KERNEL_BRANCH = $(empty)
  KERNEL_DTB    = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(TARGET_ARCH)/boot/dts/bcm7445-bcm97445svmb.dtb
-  KERNEL_CONFIG = $(CONFIGS)/kernel-hd5x.config
+  KERNEL_CONFIG = $(PKG_FILES_DIR)/kernel-hd5x.defconfig

  BOOT_PARTITION = 1

@ -46,9 +46,9 @@ else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd60))
  KERNEL_SOURCE = linux-$(KERNEL_VER)-$(KERNEL_DATE)-arm.tar.gz
  KERNEL_SITE   = http://source.mynonpublic.com/gfutures

-  KERNEL_BRANCH = $(EMPTY)
+  KERNEL_BRANCH = $(empty)
  KERNEL_DTB    = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(TARGET_ARCH)/boot/dts/hi3798mv200.dtb
-  KERNEL_CONFIG = $(CONFIGS)/kernel-hd6x.config
+  KERNEL_CONFIG = $(PKG_FILES_DIR)/kernel-hd6x.defconfig

  BOOT_PARTITION = 4

@ -59,9 +59,9 @@ else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd61))
  KERNEL_SOURCE = linux-$(KERNEL_VER)-$(KERNEL_DATE)-arm.tar.gz
  KERNEL_SITE   = http://source.mynonpublic.com/gfutures

-  KERNEL_BRANCH = $(EMPTY)
+  KERNEL_BRANCH = $(empty)
  KERNEL_DTB    = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(TARGET_ARCH)/boot/dts/hi3798mv200.dtb
-  KERNEL_CONFIG = $(CONFIGS)/kernel-hd6x.config
+  KERNEL_CONFIG = $(PKG_FILES_DIR)/kernel-hd6x.defconfig

  BOOT_PARTITION = 4

@ -71,13 +71,13 @@ else ifeq ($(BOXMODEL),vusolo4k)
  KERNEL_SOURCE = stblinux-3.14-1.8.tar.bz2
  KERNEL_SITE   = http://code.vuplus.com/download/release/kernel

-  KERNEL_BRANCH = $(EMPTY)
-  KERNEL_DTB    = $(EMPTY)
+  KERNEL_BRANCH = $(empty)
+  KERNEL_DTB    = $(empty)

-  VMLINUZ-INITRD_VER    = 20190911
-  VMLINUZ-INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ-INITRD_VER).tar.gz
-  VMLINUZ-INITRD_SITE   = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
-  VMLINUZ-INITRD        = vmlinuz-initrd-7366c0
+  VMLINUZ_INITRD_VER    = 20190911
+  VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz
+  VMLINUZ_INITRD_SITE   = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
+  VMLINUZ_INITRD        = vmlinuz-initrd-7366c0

  BOOT_PARTITION = 1

@ -87,13 +87,13 @@ else ifeq ($(BOXMODEL),vuduo4k)
  KERNEL_SOURCE = stblinux-4.1-1.17.tar.bz2
  KERNEL_SITE   = http://code.vuplus.com/download/release/kernel

-  KERNEL_BRANCH = $(EMPTY)
-  KERNEL_DTB    = $(EMPTY)
+  KERNEL_BRANCH = $(empty)
+  KERNEL_DTB    = $(empty)

-  VMLINUZ-INITRD_VER    = 20190911
-  VMLINUZ-INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ-INITRD_VER).tar.gz
-  VMLINUZ-INITRD_SITE   = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
-  VMLINUZ-INITRD        = vmlinuz-initrd-7278b1
+  VMLINUZ_INITRD_VER    = 20190911
+  VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz
+  VMLINUZ_INITRD_SITE   = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
+  VMLINUZ_INITRD        = vmlinuz-initrd-7278b1

  BOOT_PARTITION = 6

@ -103,13 +103,13 @@ else ifeq ($(BOXMODEL),vuduo4kse)
  KERNEL_SOURCE = stblinux-4.1-1.17.tar.bz2
  KERNEL_SITE   = http://code.vuplus.com/download/release/kernel

-  KERNEL_BRANCH = $(EMPTY)
-  KERNEL_DTB    = $(EMPTY)
+  KERNEL_BRANCH = $(empty)
+  KERNEL_DTB    = $(empty)

-  VMLINUZ-INITRD_VER    = 20201010
-  VMLINUZ-INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ-INITRD_VER).tar.gz
-  VMLINUZ-INITRD_SITE   = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
-  VMLINUZ-INITRD        = vmlinuz-initrd-7445d0
+  VMLINUZ_INITRD_VER    = 20201010
+  VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz
+  VMLINUZ_INITRD_SITE   = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
+  VMLINUZ_INITRD        = vmlinuz-initrd-7445d0

  BOOT_PARTITION = 6

@ -119,13 +119,13 @@ else ifeq ($(BOXMODEL),vuultimo4k)
  KERNEL_SOURCE = stblinux-3.14-1.12.tar.bz2
  KERNEL_SITE   = http://code.vuplus.com/download/release/kernel

-  KERNEL_BRANCH = $(EMPTY)
-  KERNEL_DTB    = $(EMPTY)
+  KERNEL_BRANCH = $(empty)
+  KERNEL_DTB    = $(empty)

-  VMLINUZ-INITRD_VER    = 20190911
-  VMLINUZ-INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ-INITRD_VER).tar.gz
-  VMLINUZ-INITRD_SITE   = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
-  VMLINUZ-INITRD        = vmlinuz-initrd-7445d0
+  VMLINUZ_INITRD_VER    = 20190911
+  VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz
+  VMLINUZ_INITRD_SITE   = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
+  VMLINUZ_INITRD        = vmlinuz-initrd-7445d0

  BOOT_PARTITION = 1

@ -135,13 +135,13 @@ else ifeq ($(BOXMODEL),vuzero4k)
  KERNEL_SOURCE = stblinux-4.1-1.9.tar.bz2
  KERNEL_SITE   = http://code.vuplus.com/download/release/kernel

-  KERNEL_BRANCH = $(EMPTY)
-  KERNEL_DTB    = $(EMPTY)
+  KERNEL_BRANCH = $(empty)
+  KERNEL_DTB    = $(empty)

-  VMLINUZ-INITRD_VER    = 20190911
-  VMLINUZ-INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ-INITRD_VER).tar.gz
-  VMLINUZ-INITRD_SITE   = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
-  VMLINUZ-INITRD        = vmlinuz-initrd-7260a0
+  VMLINUZ_INITRD_VER    = 20190911
+  VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz
+  VMLINUZ_INITRD_SITE   = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
+  VMLINUZ_INITRD        = vmlinuz-initrd-7260a0

  BOOT_PARTITION = 4

@ -151,13 +151,13 @@ else ifeq ($(BOXMODEL),vuuno4k)
  KERNEL_SOURCE = stblinux-3.14-1.12.tar.bz2
  KERNEL_SITE   = http://code.vuplus.com/download/release/kernel

-  KERNEL_BRANCH = $(EMPTY)
-  KERNEL_DTB    = $(EMPTY)
+  KERNEL_BRANCH = $(empty)
+  KERNEL_DTB    = $(empty)

-  VMLINUZ-INITRD_VER    = 20191010
-  VMLINUZ-INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ-INITRD_VER).tar.gz
-  VMLINUZ-INITRD_SITE   = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
-  VMLINUZ-INITRD        = vmlinuz-initrd-7439b0
+  VMLINUZ_INITRD_VER    = 20191010
+  VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz
+  VMLINUZ_INITRD_SITE   = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
+  VMLINUZ_INITRD        = vmlinuz-initrd-7439b0

  BOOT_PARTITION = 1

@ -167,13 +167,13 @@ else ifeq ($(BOXMODEL),vuuno4kse)
  KERNEL_SOURCE = stblinux-4.1-1.9.tar.bz2
  KERNEL_SITE   = http://code.vuplus.com/download/release/kernel

-  KERNEL_BRANCH = $(EMPTY)
-  KERNEL_DTB    = $(EMPTY)
+  KERNEL_BRANCH = $(empty)
+  KERNEL_DTB    = $(empty)

-  VMLINUZ-INITRD_VER    = 20191010
-  VMLINUZ-INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ-INITRD_VER).tar.gz
-  VMLINUZ-INITRD_SITE   = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
-  VMLINUZ-INITRD        = vmlinuz-initrd-7439b0
+  VMLINUZ_INITRD_VER    = 20191010
+  VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz
+  VMLINUZ_INITRD_SITE   = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
+  VMLINUZ_INITRD        = vmlinuz-initrd-7439b0

  BOOT_PARTITION = 1

@ -183,8 +183,8 @@ else ifeq ($(BOXMODEL),vuduo)
  KERNEL_SOURCE = stblinux-$(KERNEL_VER).tar.bz2
  KERNEL_SITE   = http://code.vuplus.com/download/release/kernel

-  KERNEL_BRANCH = $(EMPTY)
-  KERNEL_DTB    = $(EMPTY)
+  KERNEL_BRANCH = $(empty)
+  KERNEL_DTB    = $(empty)

 endif

@ -194,7 +194,7 @@ KERNEL_OBJ      = linux-$(KERNEL_VER)-obj
 KERNEL_MODULES  = linux-$(KERNEL_VER)-modules
 KERNEL_HEADERS  = linux-$(KERNEL_VER)-headers

-KERNEL_CONFIG  ?= $(CONFIGS)/kernel-$(BOXMODEL).config
+KERNEL_CONFIG  ?= $(PKG_FILES_DIR)/kernel-$(BOXMODEL).defconfig
 KERNEL_NAME     = NI $(shell echo $(BOXFAMILY) | sed 's/.*/\u&/') Kernel

 # -----------------------------------------------------------------------------
@ -212,7 +212,7 @@ KERNEL_VMLINUX    = $(BUILD_DIR)/$(KERNEL_OBJ)/vmlinux

 # -----------------------------------------------------------------------------

-KERNEL_MAKEVARS = \
+KERNEL_MAKE_VARS = \
 	ARCH=$(TARGET_ARCH) \
 	CROSS_COMPILE=$(TARGET_CROSS) \
 	INSTALL_MOD_PATH=$(BUILD_DIR)/$(KERNEL_MODULES) \
@ -221,7 +221,7 @@ KERNEL_MAKEVARS = \
 	O=$(BUILD_DIR)/$(KERNEL_OBJ)

 # Compatibility variables
-KERNEL_MAKEVARS += \
+KERNEL_MAKE_VARS += \
 	KVER=$(KERNEL_VER) \
 	KSRC=$(BUILD_DIR)/$(KERNEL_DIR)

@ -233,9 +233,9 @@ else
  KERNEL_IMAGE = zImage
 endif

-KERNEL_MAKEOPTS = $(KERNEL_IMAGE) modules
+KERNEL_MAKE_TARGETS = $(KERNEL_IMAGE)

 # build also the kernel-dtb for arm-hd5x and arm-hd6x
 ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61))
-  KERNEL_MAKEOPTS += $(notdir $(KERNEL_DTB))
+  KERNEL_MAKE_TARGETS += $(notdir $(KERNEL_DTB))
 endif
--- a/make/environment-update.mk
+++ b/make/environment-update.mk
@ -32,7 +32,7 @@ UPDATE_TYPE	= U
 # Addon		= A
 # Text		= T

-UPDATE_SITE	= $(NI-SERVER)/$(NI-SUBDIR)
+UPDATE_SITE	= $(NI_SERVER)/$(NI_SUBDIR)
 UPDATE_MD5FILE	= update.txt
-UPDATE_MD5FILE-BOXSERIES= update-$(BOXTYPE_SC)-$(BOXSERIES).txt
-UPDATE_MD5FILE-BOXMODEL	= update-$(BOXTYPE_SC)-$(BOXMODEL).txt
+UPDATE_MD5FILE_BOXSERIES= update-$(BOXTYPE_SC)-$(BOXSERIES).txt
+UPDATE_MD5FILE_BOXMODEL	= update-$(BOXTYPE_SC)-$(BOXMODEL).txt
--- a/make/flash-images.mk
+++ b/make/flash-images.mk
@ -362,7 +362,7 @@ flash-image-vuplus-multi: | $(IMAGE_DIR)
 	rm -rf $(IMAGE_BUILD_DIR)
 	mkdir -p $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
 	cp $(TARGET_FILES)/splash-images/ni-splash.bmp $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/splash_auto.bin
-	cp $(BUILD_DIR)/$(VMLINUZ-INITRD) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/initrd_auto.bin
+	cp $(BUILD_DIR)/$(VMLINUZ_INITRD) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/initrd_auto.bin
 	echo Dummy for update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel_auto.bin
 	cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel1_auto.bin
 	cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel2_auto.bin
--- a/make/flash-updates.mk
+++ b/make/flash-updates.mk
@ -45,7 +45,7 @@ ifneq ($(DEBUG),yes)
 	find $(UPDATE_INST_DIR)/bin -type f ! -name *.sh -print0 | xargs -0 $(TARGET_STRIP) || true
 endif
 	$(MAKE) u-update-bin \
-			UPDATE_MD5FILE=$(UPDATE_MD5FILE-BOXSERIES)
+			UPDATE_MD5FILE=$(UPDATE_MD5FILE_BOXSERIES)

 # -----------------------------------------------------------------------------

@ -63,7 +63,7 @@ ifeq ($(PERSISTENT_VAR_PARTITION),yes)
 	mv $(UPDATE_INST_DIR)/var $(UPDATE_INST_DIR)/var_init
 endif
 	$(MAKE) u-update-bin \
-			UPDATE_MD5FILE=$(UPDATE_MD5FILE-BOXSERIES)
+			UPDATE_MD5FILE=$(UPDATE_MD5FILE_BOXSERIES)

 # -----------------------------------------------------------------------------

@ -80,30 +80,30 @@ u-update.urls: update.urls

 u-pr-auto-timer:
 	$(MAKE) u-init
-	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/preinstall.sh $(PREINSTALL_SH)
-	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/postinstall.sh $(POSTINSTALL_SH)
+	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/preinstall.sh $(PREINSTALL_SH)
+	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/postinstall.sh $(POSTINSTALL_SH)
 	mkdir -p $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins
-	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.sh $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
-	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.cfg $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
-	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
-	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer_hint.png $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
-	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
+	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.sh $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.cfg $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
+	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
+	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer_hint.png $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
+	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
 	mkdir -p $(UPDATE_INST_DIR)/var/tuxbox/config
-	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/
-	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.rules.template $(UPDATE_INST_DIR)/var/tuxbox/config/
-	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/
-	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner.rules.template $(UPDATE_INST_DIR)/var/tuxbox/config/
-	PKG_VERSION=`cat $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer | grep '^VERSION' | cut -d= -f2`; \
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.rules.template $(UPDATE_INST_DIR)/var/tuxbox/config/
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner.rules.template $(UPDATE_INST_DIR)/var/tuxbox/config/
+	PKG_VERSION=`cat $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer | grep '^VERSION' | cut -d= -f2`; \
 	$(MAKE) u-update-bin \
 			UPDATE_MD5FILE=pr-auto-timer.txt \
-			UPDATE_SITE=$(NI-SERVER)/plugins/pr-auto-timer \
+			UPDATE_SITE=$(NI_SERVER)/plugins/pr-auto-timer \
 			UPDATE_NAME=pr-auto-timer_$${PKG_VERSION//./} \
 			UPDATE_DESC=Auto-Timer \
 			UPDATE_VERSION=$$PKG_VERSION

 # -----------------------------------------------------------------------------

-CHANNELLISTS_SITE = $(NI-SERVER)/channellists
+CHANNELLISTS_SITE = $(NI_SERVER)/channellists
 CHANNELLISTS_MD5FILE = lists.txt

 channellists: matze-192 matze-192-130
@ -125,11 +125,11 @@ matze-192-130:
 	done
 	# sync sat-names with current satellites.xml
 	# Astra 19.2
-	P192=`grep -m 1 'position=\"192\"' $(SOURCE_DIR)/$(NI-NEUTRINO)/data/config/satellites.xml`; \
+	P192=`grep -m 1 'position=\"192\"' $(SOURCE_DIR)/$(NI_NEUTRINO)/data/config/satellites.xml`; \
 	P192=`echo $$P192`; \
 	$(SED) "/position=\"192\"/c\	$$P192" $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/services.xml
 	# Hotbird 13.0
-	P130=`grep -m 1 'position=\"130\"' $(SOURCE_DIR)/$(NI-NEUTRINO)/data/config/satellites.xml`; \
+	P130=`grep -m 1 'position=\"130\"' $(SOURCE_DIR)/$(NI_NEUTRINO)/data/config/satellites.xml`; \
 	P130=`echo $$P130`; \
 	$(SED) "/position=\"130\"/c\	$$P130" $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/services.xml
 	#
@ -165,11 +165,11 @@ initial-settings: matze-192
 	$(MKDIR)/initial
 	$(CHDIR)/initial && \
 		tar -xf $(STAGING_DIR)/updates/matze-192.bin && \
-		cp temp_inst/inst/var/tuxbox/config/zapit/* $(SOURCE_DIR)/$(NI-NEUTRINO)/data/initial/
-	P192=`grep -m 1 'position=\"192\"' $(SOURCE_DIR)/$(NI-NEUTRINO)/data/config/satellites.xml`; \
+		cp temp_inst/inst/var/tuxbox/config/zapit/* $(SOURCE_DIR)/$(NI_NEUTRINO)/data/initial/
+	P192=`grep -m 1 'position=\"192\"' $(SOURCE_DIR)/$(NI_NEUTRINO)/data/config/satellites.xml`; \
 	P192=`echo $$P192`; \
-	$(SED) "/position=\"192\"/c\	$$P192" $(SOURCE_DIR)/$(NI-NEUTRINO)/data/initial/services.xml
-	@echo -e "$(TERM_YELLOW)Commit your changes in $(SOURCE_DIR)/$(NI-NEUTRINO)/data/initial$(TERM_NORMAL)"
+	$(SED) "/position=\"192\"/c\	$$P192" $(SOURCE_DIR)/$(NI_NEUTRINO)/data/initial/services.xml
+	@echo -e "$(TERM_YELLOW)Commit your changes in $(SOURCE_DIR)/$(NI_NEUTRINO)/data/initial$(TERM_NORMAL)"

 # -----------------------------------------------------------------------------

--- a/make/host-tools.mk
+++ b/make/host-tools.mk
@ -10,16 +10,16 @@ $(HOST_DIR):

 # -----------------------------------------------------------------------------

-host-tools: $(HOST_DIR) \
+host-tools: $(BUILD_DIR) $(HOST_DIR) \
 	host-pkgconf \
 	$(PKG_CONFIG) \
 	host-mtd-utils \
-	host-mkimage \
+	host-u-boot \
 	host-zic \
 	host-parted \
 	host-dosfstools \
 	host-mtools \
-	host-e2fsprocs \
+	host-e2fsprogs \
 	host-lua \
 	host-luarocks \
 	host-ccache
@ -46,18 +46,19 @@ HOST_PKGCONF_SITE   = https://distfiles.dereferenced.org/pkgconf
 $(DL_DIR)/$(HOST_PKGCONF_SOURCE):
 	$(DOWNLOAD) $(HOST_PKGCONF_SITE)/$(HOST_PKGCONF_SOURCE)

+HOST_PKGCONF_CONF_OPTS = \
+	--prefix=$(HOST_DIR)
+
 host-pkgconf: $(DL_DIR)/$(HOST_PKGCONF_SOURCE) | $(HOST_DIR) pkg-config-preqs
-	$(REMOVE)/$(HOST_PKGCONF_DIR)
-	$(UNTAR)/$(HOST_PKGCONF_SOURCE)
-	$(CHDIR)/$(HOST_PKGCONF_DIR); \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
 		$(APPLY_PATCHES); \
-		./configure \
-			--prefix=$(HOST_DIR) \
-		; \
+		$($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS); \
 		$(MAKE); \
 		$(MAKE) install
 	$(INSTALL_EXEC) $(PKG_FILES_DIR)/pkg-config.in $(HOST_PKG-CONFIG)
-	$(REMOVE)/$(HOST_PKGCONF_DIR)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -69,85 +70,82 @@ $(PKG_CONFIG): $(PKG_CONFIG_DEPS) | $(HOST_DIR)

 # -----------------------------------------------------------------------------

-HOST_MTD-UTILS_VER    = $(MTD-UTILS_VER)
-HOST_MTD-UTILS_DIR    = mtd-utils-$(HOST_MTD-UTILS_VER)
-HOST_MTD-UTILS_SOURCE = mtd-utils-$(HOST_MTD-UTILS_VER).tar.bz2
-HOST_MTD-UTILS_SITE   = ftp://ftp.infradead.org/pub/mtd-utils
-
-#$(DL_DIR)/$(HOST_MTD-UTILS_SOURCE):
-#	$(DOWNLOAD) $(HOST_MTD-UTILS_SITE)/$(HOST_MTD-UTILS_SOURCE)
-
-host-mtd-utils: $(DL_DIR)/$(HOST_MTD-UTILS_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_MTD-UTILS_DIR)
-	$(UNTAR)/$(HOST_MTD-UTILS_SOURCE)
-	$(CHDIR)/$(HOST_MTD-UTILS_DIR); \
-		./configure \
-			ZLIB_CFLAGS=" " \
-			ZLIB_LIBS="-lz" \
-			UUID_CFLAGS=" " \
-			UUID_LIBS="-luuid" \
-			--prefix= \
-			--enable-silent-rules \
-			--without-ubifs \
-			--without-xattr \
-			--disable-tests \
-		; \
+HOST_MTD_UTILS_VER    = $(MTD_UTILS_VER)
+HOST_MTD_UTILS_DIR    = mtd-utils-$(HOST_MTD_UTILS_VER)
+HOST_MTD_UTILS_SOURCE = mtd-utils-$(HOST_MTD_UTILS_VER).tar.bz2
+HOST_MTD_UTILS_SITE   = ftp://ftp.infradead.org/pub/mtd-utils
+
+#$(DL_DIR)/$(HOST_MTD_UTILS_SOURCE):
+#	$(DOWNLOAD) $(HOST_MTD_UTILS_SITE)/$(HOST_MTD_UTILS_SOURCE)
+
+HOST_MTD_UTILS_CONF_ENV = \
+	ZLIB_CFLAGS=" " \
+	ZLIB_LIBS="-lz" \
+	UUID_CFLAGS=" " \
+	UUID_LIBS="-luuid"
+
+HOST_MTD_UTILS_CONF_OPTS = \
+	--prefix= \
+	--enable-silent-rules \
+	--without-ubifs \
+	--without-xattr \
+	--disable-tests
+
+host-mtd-utils: $(DL_DIR)/$(HOST_MTD_UTILS_SOURCE) | $(HOST_DIR)
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
+		$($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(HOST_DIR)
-	$(REMOVE)/$(HOST_MTD-UTILS_DIR)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

-HOST_U-BOOT_VER    = 2018.09
-HOST_U-BOOT_DIR    = u-boot-$(HOST_U-BOOT_VER)
-HOST_U-BOOT_SOURCE = u-boot-$(HOST_U-BOOT_VER).tar.bz2
-HOST_U-BOOT_SITE   = ftp://ftp.denx.de/pub/u-boot
+HOST_U_BOOT_VER    = 2018.09
+HOST_U_BOOT_DIR    = u-boot-$(HOST_U_BOOT_VER)
+HOST_U_BOOT_SOURCE = u-boot-$(HOST_U_BOOT_VER).tar.bz2
+HOST_U_BOOT_SITE   = ftp://ftp.denx.de/pub/u-boot
+
+$(DL_DIR)/$(HOST_U_BOOT_SOURCE):
+	$(DOWNLOAD) $(HOST_U_BOOT_SITE)/$(HOST_U_BOOT_SOURCE)

-$(DL_DIR)/$(HOST_U-BOOT_SOURCE):
-	$(DOWNLOAD) $(HOST_U-BOOT_SITE)/$(HOST_U-BOOT_SOURCE)
+HOST_MKIMAGE = $(HOST_DIR)/bin/mkimage

-host-mkimage: $(HOST_DIR)/bin/mkimage
-$(HOST_DIR)/bin/mkimage: $(DL_DIR)/$(HOST_U-BOOT_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_U-BOOT_DIR)
-	$(UNTAR)/$(HOST_U-BOOT_SOURCE)
-	$(CHDIR)/$(HOST_U-BOOT_DIR); \
+host-u-boot: $(DL_DIR)/$(HOST_U_BOOT_SOURCE) | $(HOST_DIR)
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
 		$(MAKE) defconfig; \
 		$(MAKE) silentoldconfig; \
 		$(MAKE) tools-only
-	$(INSTALL_EXEC) -D $(BUILD_DIR)/$(HOST_U-BOOT_DIR)/tools/mkimage $(HOST_DIR)/bin/
-	$(REMOVE)/$(HOST_U-BOOT_DIR)
+	$(INSTALL_EXEC) -D $(PKG_BUILD_DIR)/tools/mkimage $(HOST_MKIMAGE)
+	$(REMOVE)/$(PKG_DIR)
+	$(TOUCH)

 # -----------------------------------------------------------------------------

-HOST_TZCODE_VER    = 2020d
-HOST_TZCODE_DIR    = tzcode$(HOST_TZCODE_VER)
-HOST_TZCODE_SOURCE = tzcode$(HOST_TZCODE_VER).tar.gz
-HOST_TZCODE_SITE   = ftp://ftp.iana.org/tz/releases
-
-$(DL_DIR)/$(HOST_TZCODE_SOURCE):
-	$(DOWNLOAD) $(HOST_TZCODE_SITE)/$(HOST_TZCODE_SOURCE)
-
-HOST_TZDATA_VER    = $(TZDATA_VER)
-HOST_TZDATA_DIR    = tzdata$(HOST_TZDATA_VER)
-HOST_TZDATA_SOURCE = tzdata$(HOST_TZDATA_VER).tar.gz
-HOST_TZDATA_SITE   = ftp://ftp.iana.org/tz/releases
+HOST_ZIC_VER    = 2020f
+HOST_ZIC_DIR    = tzcode$(HOST_ZIC_VER)
+HOST_ZIC_SOURCE = tzcode$(HOST_ZIC_VER).tar.gz
+HOST_ZIC_SITE   = ftp://ftp.iana.org/tz/releases

-#$(DL_DIR)/$(HOST_TZDATA_SOURCE):
-#	$(DOWNLOAD) $(HOST_TZDATA_SITE)/$(HOST_TZDATA_SOURCE)
+$(DL_DIR)/$(HOST_ZIC_SOURCE):
+	$(DOWNLOAD) $(HOST_ZIC_SITE)/$(HOST_ZIC_SOURCE)

 HOST_ZIC = $(HOST_DIR)/sbin/zic

-host-zic: $(HOST_ZIC)
-$(HOST_ZIC): $(DL_DIR)/$(HOST_TZDATA_SOURCE) $(DL_DIR)/$(HOST_TZCODE_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_TZCODE_DIR)
-	$(MKDIR)/$(HOST_TZCODE_DIR)
-	$(CHDIR)/$(HOST_TZCODE_DIR); \
-		tar -xf $(DL_DIR)/$(HOST_TZCODE_SOURCE); \
-		tar -xf $(DL_DIR)/$(HOST_TZDATA_SOURCE); \
+host-zic: $(DL_DIR)/$(HOST_ZIC_SOURCE) | $(HOST_DIR)
+	$(REMOVE)/$(PKG_DIR)
+	$(MKDIR)/$(PKG_DIR)
+	$(CHDIR)/$(PKG_DIR); \
+		tar -xf $(DL_DIR)/$(PKG_SOURCE); \
+		$(APPLY_PATCHES); \
 		$(MAKE) zic
-	$(INSTALL_EXEC) -D $(BUILD_DIR)/$(HOST_TZCODE_DIR)/zic $(HOST_ZIC)
-	$(REMOVE)/$(HOST_TZCODE_DIR)
+	$(INSTALL_EXEC) -D $(PKG_BUILD_DIR)/zic $(HOST_ZIC)
+	$(REMOVE)/$(PKG_DIR)
+	$(TOUCH)

 # -----------------------------------------------------------------------------

@ -159,25 +157,23 @@ HOST_PARTED_SITE   = $(GNU_MIRROR)/parted
 #$(DL_DIR)/$(HOST_PARTED_SOURCE):
 #	$(DOWNLOAD) $(HOST_PARTED_SITE)/$(HOST_PARTED_SOURCE)

-HOST_PARTED_PATCH  = parted-device-mapper.patch
-HOST_PARTED_PATCH += parted-sysmacros.patch
+HOST_PARTED_CONF_OPTS = \
+	--prefix= \
+	--enable-silent-rules \
+	--enable-static \
+	--disable-shared \
+	--disable-device-mapper \
+	--without-readline

 host-parted: $(DL_DIR)/$(HOST_PARTED_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_PARTED_DIR)
-	$(UNTAR)/$(HOST_PARTED_SOURCE)
-	$(CHDIR)/$(HOST_PARTED_DIR); \
-		$(call apply_patches,$(HOST_PARTED_PATCH)); \
-		./configure \
-			--prefix= \
-			--enable-silent-rules \
-			--enable-static \
-			--disable-shared \
-			--disable-device-mapper \
-			--without-readline \
-		; \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
+		$(APPLY_PATCHES); \
+		$($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(HOST_DIR)
-	$(REMOVE)/$(HOST_PARTED_DIR)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -190,20 +186,21 @@ HOST_DOSFSTOOLS_SITE   = https://github.com/dosfstools/dosfstools/releases/downl
 #$(DL_DIR)/$(HOST_DOSFSTOOLS_SOURCE):
 #	$(DOWNLOAD) $(HOST_DOSFSTOOLS_SITE)/$(HOST_DOSFSTOOLS_SOURCE)

+HOST_DOSFSTOOLS_CONF_OPTS = \
+	--prefix= \
+	--without-udev
+
 host-dosfstools: $(DL_DIR)/$(HOST_DOSFSTOOLS_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_DOSFSTOOLS_DIR)
-	$(UNTAR)/$(HOST_DOSFSTOOLS_SOURCE)
-	$(CHDIR)/$(HOST_DOSFSTOOLS_DIR); \
-		./configure \
-			--prefix= \
-			--without-udev \
-		; \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
+		$($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(HOST_DIR)
 	ln -sf mkfs.fat $(HOST_DIR)/sbin/mkfs.vfat
 	ln -sf mkfs.fat $(HOST_DIR)/sbin/mkfs.msdos
 	ln -sf mkfs.fat $(HOST_DIR)/sbin/mkdosfs
-	$(REMOVE)/$(HOST_DOSFSTOOLS_DIR)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -216,16 +213,17 @@ HOST_MTOOLS_SITE   = $(GNU_MIRROR)/mtools
 $(DL_DIR)/$(HOST_MTOOLS_SOURCE):
 	$(DOWNLOAD) $(HOST_MTOOLS_SITE)/$(HOST_MTOOLS_SOURCE)

+HOST_MTOOLS_CONF_OPTS = \
+	--prefix=
+
 host-mtools: $(DL_DIR)/$(HOST_MTOOLS_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_MTOOLS_DIR)
-	$(UNTAR)/$(HOST_MTOOLS_SOURCE)
-	$(CHDIR)/$(HOST_MTOOLS_DIR); \
-		./configure \
-			--prefix= \
-		; \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
+		$($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS); \
 		$(MAKE1); \
 		$(MAKE1) install DESTDIR=$(HOST_DIR)
-	$(REMOVE)/$(HOST_MTOOLS_DIR)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -238,16 +236,17 @@ HOST_E2FSPROGS_SITE   = https://sourceforge.net/projects/e2fsprogs/files/e2fspro
 #$(DL_DIR)/$(HOST_E2FSPROGS_SOURCE):
 #	$(DOWNLOAD) $(HOST_E2FSPROGS_SITE)/$(HOST_E2FSPROGS_SOURCE)

-host-e2fsprocs: $(DL_DIR)/$(HOST_E2FSPROGS_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_E2FSPROGS_DIR)
-	$(UNTAR)/$(HOST_E2FSPROGS_SOURCE)
-	$(CHDIR)/$(HOST_E2FSPROGS_DIR); \
-		./configure \
-			--prefix= \
-			; \
+HOST_E2FSPROGS_CONF_OPTS = \
+	--prefix=
+
+host-e2fsprogs: $(DL_DIR)/$(HOST_E2FSPROGS_SOURCE) | $(HOST_DIR)
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
+		$($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(HOST_DIR)
-	$(REMOVE)/$(HOST_E2FSPROGS_DIR)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -260,7 +259,7 @@ HOST_MESON_SITE   = https://github.com/mesonbuild/meson/releases/download/$(HOST
 $(DL_DIR)/$(HOST_MESON_SOURCE):
 	$(DOWNLOAD) $(HOST_MESON_SITE)/$(HOST_MESON_SOURCE)

-HOST_MESON_DEPS   = host-ninja host-python3 host-python3-setuptools
+HOST_MESON_DEPS = host-ninja host-python3 host-python3-setuptools

 HOST_MESON = $(HOST_DIR)/bin/meson

@ -284,19 +283,20 @@ HOST_NINJA_SITE   = $(call github,ninja-build,ninja,v$(HOST_NINJA_VER))
 $(DL_DIR)/$(HOST_NINJA_SOURCE):
 	$(DOWNLOAD) $(HOST_NINJA_SITE)/$(HOST_NINJA_SOURCE)

+HOST_NINJA_CONF_OPTS = \
+	-DCMAKE_INSTALL_PREFIX=""
+
 HOST_NINJA = $(HOST_DIR)/bin/ninja

 host-ninja: $(DL_DIR)/$(HOST_NINJA_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_NINJA_DIR)
-	$(UNTAR)/$(HOST_NINJA_SOURCE)
-	$(CHDIR)/$(HOST_NINJA_DIR); \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
 		$(APPLY_PATCHES); \
-		cmake . \
-			-DCMAKE_INSTALL_PREFIX="" \
-			; \
+		$($(PKG)_CONF_ENV) cmake $($(PKG)_CONF_OPTS); \
 		$(MAKE)
-	$(INSTALL_EXEC) -D $(BUILD_DIR)/$(HOST_NINJA_DIR)/ninja $(HOST_NINJA)
-	$(REMOVE)/$(HOST_NINJA_DIR)
+	$(INSTALL_EXEC) -D $(PKG_BUILD_DIR)/ninja $(HOST_NINJA)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -309,14 +309,15 @@ HOST_EXPAT_SITE   = https://sourceforge.net/projects/expat/files/expat/$(EXPAT_V
 #$(DL_DIR)/$(HOST_EXPAT_SOURCE):
 #	$(DOWNLOAD) $(HOST_EXPAT_SITE)/$(EXPAT_SOURCE)

+HOST_EXPAT_CONF_OPTS = \
+	--prefix= \
+	--without-docbook
+
 host-expat: $(DL_DIR)/$(HOST_EXPAT_SOURCE) | $(HOST_DIR)
 	$(REMOVE)/$(HOST_EXPAT_DIR)
 	$(UNTAR)/$(HOST_EXPAT_SOURCE)
 	$(CHDIR)/$(HOST_EXPAT_DIR); \
-		./configure \
-			--prefix= \
-			--without-docbook \
-		; \
+		$($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(HOST_DIR)
 	$(REMOVE)/$(HOST_EXPAT_DIR)
@ -335,56 +336,59 @@ HOST_PYTHON3_INCLUDE_DIR = include/python$(basename $(HOST_PYTHON3_VER))
 $(DL_DIR)/$(HOST_PYTHON3_SOURCE):
 	$(DOWNLOAD) $(HOST_PYTHON3_SITE)/$(HOST_PYTHON3_SOURCE)

-HOST_PYTHON3_DEPS   = host-expat host-libffi
+HOST_PYTHON3_DEPS = host-expat host-libffi
+
+HOST_PYTHON3_CONF_ENV = \
+	CONFIG_SITE= \
+	OPT="$(HOST_CFLAGS)"
+
+HOST_PYTHON3_CONF_OPTS = \
+	--prefix=$(HOST_DIR) \
+	--without-ensurepip \
+	--without-cxx-main \
+	--disable-sqlite3 \
+	--disable-tk \
+	--with-expat=system \
+	--disable-curses \
+	--disable-codecs-cjk \
+	--disable-nis \
+	--enable-unicodedata \
+	--disable-test-modules \
+	--disable-idle3 \
+	--disable-ossaudiodev

 host-python3: $(HOST_PYTHON3_DEPS) $(DL_DIR)/$(HOST_PYTHON3_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_PYTHON3_DIR)
-	$(UNTAR)/$(HOST_PYTHON3_SOURCE)
-	$(CHDIR)/$(HOST_PYTHON3_DIR); \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
 		#$(APPLY_PATCHES); \
 		autoconf; \
-		CONFIG_SITE= \
-		OPT="$(HOST_CFLAGS)" \
-		./configure \
-			--prefix=$(HOST_DIR) \
-			--without-ensurepip \
-			--without-cxx-main \
-			--disable-sqlite3 \
-			--disable-tk \
-			--with-expat=system \
-			--disable-curses \
-			--disable-codecs-cjk \
-			--disable-nis \
-			--enable-unicodedata \
-			--disable-test-modules \
-			--disable-idle3 \
-			--disable-ossaudiodev \
-		; \
+		$($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS); \
 		$(MAKE); \
 		$(MAKE) install
-	$(REMOVE)/$(HOST_PYTHON3_DIR)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

-HOST_PYTHON3-SETUPTOOLS_VER    = 44.0.0
-HOST_PYTHON3-SETUPTOOLS_DIR    = setuptools-$(HOST_PYTHON3-SETUPTOOLS_VER)
-HOST_PYTHON3-SETUPTOOLS_SOURCE = setuptools-$(HOST_PYTHON3-SETUPTOOLS_VER).zip
-HOST_PYTHON3-SETUPTOOLS_SITE   = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485
+HOST_PYTHON3_SETUPTOOLS_VER    = 44.0.0
+HOST_PYTHON3_SETUPTOOLS_DIR    = setuptools-$(HOST_PYTHON3_SETUPTOOLS_VER)
+HOST_PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(HOST_PYTHON3_SETUPTOOLS_VER).zip
+HOST_PYTHON3_SETUPTOOLS_SITE   = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485

-$(DL_DIR)/$(HOST_PYTHON3-SETUPTOOLS_SOURCE):
-	$(DOWNLOAD) $(HOST_PYTHON3-SETUPTOOLS_SITE)/$(HOST_PYTHON3-SETUPTOOLS_SOURCE)
+$(DL_DIR)/$(HOST_PYTHON3_SETUPTOOLS_SOURCE):
+	$(DOWNLOAD) $(HOST_PYTHON3_SETUPTOOLS_SITE)/$(HOST_PYTHON3_SETUPTOOLS_SOURCE)

-HOST_PYTHON3-SETUPTOOLS_DEPS   = host-python3
+HOST_PYTHON3_SETUPTOOLS_DEPS = host-python3

-host-python3-setuptools: $(HOST_PYTHON3-SETUPTOOLS_DEPS) $(DL_DIR)/$(HOST_PYTHON3-SETUPTOOLS_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_PYTHON3-SETUPTOOLS_DIR)
-	$(UNZIP)/$(HOST_PYTHON3-SETUPTOOLS_SOURCE)
-	$(CHDIR)/$(HOST_PYTHON3-SETUPTOOLS_DIR); \
+host-python3-setuptools: $(HOST_PYTHON3_SETUPTOOLS_DEPS) $(DL_DIR)/$(HOST_PYTHON3_SETUPTOOLS_SOURCE) | $(HOST_DIR)
+	$(REMOVE)/$(PKG_DIR)
+	$(UNZIP)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
 		$(APPLY_PATCHES); \
 		$(HOST_PYTHON_BUILD); \
 		$(HOST_PYTHON_INSTALL)
-	$(REMOVE)/$(HOST_PYTHON3-SETUPTOOLS_DIR)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -397,17 +401,18 @@ HOST_LIBFFI_SITE   = https://github.com/libffi/libffi/releases/download/v$(HOST_
 #$(DL_DIR)/$(HOST_LIBFFI_SOURCE):
 #	$(DOWNLOAD) $(HOST_LIBFFI_SITE)/$(HOST_LIBFFI_SOURCE)

+HOST_LIBFFI_CONF_OPTS = \
+	--prefix=
+
 host-libffi: $(DL_DIR)/$(HOST_LIBFFI_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_LIBFFI_DIR)
-	$(UNTAR)/$(HOST_LIBFFI_SOURCE)
-	$(CHDIR)/$(HOST_LIBFFI_DIR); \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
 		$(APPLY_PATCHES); \
-		./configure \
-			--prefix= \
-			; \
+		$($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(HOST_DIR)
-	$(REMOVE)/$(HOST_LIBFFI_DIR)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -426,13 +431,13 @@ HOST_LUA_PATCH += lua-01-remove-readline.patch
 HOST_LUA = $(HOST_DIR)/bin/lua

 host-lua: $(DL_DIR)/$(HOST_LUA_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_LUA_DIR)
-	$(UNTAR)/$(HOST_LUA_SOURCE)
-	$(CHDIR)/$(HOST_LUA_DIR); \
-		$(call apply_patches,$(HOST_LUA_PATCH)); \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
+		$(call apply_patches,$(addprefix $(PKG_PATCHES_DIR)/,$(PKG_PATCH))); \
 		$(MAKE) linux; \
-		$(MAKE) install INSTALL_TOP=$(HOST_DIR)
-	$(REMOVE)/$(HOST_LUA_DIR)
+		$(MAKE) install INSTALL_TOP=$(HOST_DIR) INSTALL_MAN=$(HOST_DIR)/share/man/man1
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -445,9 +450,9 @@ HOST_LUAROCKS_SITE   = https://luarocks.github.io/luarocks/releases
 $(DL_DIR)/$(HOST_LUAROCKS_SOURCE):
 	$(DOWNLOAD) $(HOST_LUAROCKS_SITE)/$(HOST_LUAROCKS_SOURCE)

-HOST_LUAROCKS_PATCH  = luarocks-0001-allow-libluajit-detection.patch
+HOST_LUAROCKS_DEPS = host-lua

-HOST_LUAROCKS_CONFIG_FILE = $(HOST_DIR)/etc/luarocks/config-$(LUA_ABIVER).lua
+HOST_LUAROCKS_CONFIG = $(HOST_DIR)/etc/luarocks/config-$(LUA_ABIVER).lua

 HOST_LUAROCKS_MAKE_ENV = \
 	LUA_PATH="$(HOST_DIR)/share/lua/$(LUA_ABIVER)/?.lua" \
@ -459,25 +464,26 @@ HOST_LUAROCKS_MAKE_ENV = \
 	TARGET_includedir="$(TARGET_includedir)" \
 	TARGET_libdir="$(TARGET_libdir)"

+HOST_LUAROCKS_CONF_OPTS = \
+	--prefix=$(HOST_DIR) \
+	--sysconfdir=$(HOST_DIR)/etc \
+	--with-lua=$(HOST_DIR) \
+	--rocks-tree=$(TARGET_DIR)
+
 HOST_LUAROCKS = $(HOST_DIR)/bin/luarocks

-host-luarocks: $(HOST_LUAROCKS)
-$(HOST_LUAROCKS): $(HOST_LUA) $(DL_DIR)/$(HOST_LUAROCKS_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_LUAROCKS_DIR)
-	$(UNTAR)/$(HOST_LUAROCKS_SOURCE)
-	$(CHDIR)/$(HOST_LUAROCKS_DIR); \
-		$(call apply_patches,$(HOST_LUAROCKS_PATCH)); \
-		./configure $(SILENT_OPT) \
-			--prefix=$(HOST_DIR) \
-			--sysconfdir=$(HOST_DIR)/etc \
-			--with-lua=$(HOST_DIR) \
-			--rocks-tree=$(TARGET_DIR) \
-		; \
-		rm -f $(HOST_LUAROCKS_CONFIG_FILE); \
+host-luarocks: $(HOST_LUAROCKS_DEPS) $(DL_DIR)/$(HOST_LUAROCKS_SOURCE) | $(HOST_DIR)
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
+		$(APPLY_PATCHES); \
+		$($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS); \
+		rm -f $(PKG_CONFIG_FILE); \
 		$(MAKE); \
 		$(MAKE) install
-	cat $(CONFIGS)/luarocks-config.lua >> $(HOST_LUAROCKS_CONFIG_FILE)
-	$(REMOVE)/$(HOST_LUAROCKS_DIR)
+	cat $(PKG_FILES_DIR)/luarocks-config.lua >> $(HOST_LUAROCKS_CONFIG)
+	$(REMOVE)/$(PKG_DIR)
+	$(TOUCH)

 # -----------------------------------------------------------------------------

--- a/make/linux-drivers.mk
+++ b/make/linux-drivers.mk
@ -13,7 +13,7 @@ rtl8192eu: kernel-$(BOXTYPE) | $(TARGET_DIR)
 	$(GET-GIT-SOURCE) $(RTL8192EU_SITE) $(DL_DIR)/$(RTL8192EU_SOURCE)
 	$(CPDIR)/$(RTL8192EU_SOURCE)
 	$(CHDIR)/$(RTL8192EU_DIR); \
-		$(MAKE) $(KERNEL_MAKEVARS); \
+		$(MAKE) $(KERNEL_MAKE_VARS); \
 		$(INSTALL_DATA) 8192eu.ko $(TARGET_modulesdir)/kernel/drivers/net/wireless/
 	make depmod
 	$(REMOVE)/$(RTL8192EU_DIR)
@ -34,7 +34,7 @@ rtl8812au: kernel-$(BOXTYPE) $(DL_DIR)/$(RTL8812AU_SOURCE) | $(TARGET_DIR)
 	$(UNZIP)/$(RTL8812AU_SOURCE)
 	$(CHDIR)/$(RTL8812AU_DIR); \
 		$(APPLY_PATCHES); \
-		$(MAKE) $(KERNEL_MAKEVARS); \
+		$(MAKE) $(KERNEL_MAKE_VARS); \
 		$(INSTALL_DATA) 8812au.ko $(TARGET_modulesdir)/kernel/drivers/net/wireless/
 	make depmod
 	$(REMOVE)/$(RTL8812AU_DIR)
@ -55,7 +55,7 @@ rtl8822bu: kernel-$(BOXTYPE) $(DL_DIR)/$(RTL8822BU_SOURCE) | $(TARGET_DIR)
 	$(UNZIP)/$(RTL8822BU_SOURCE)
 	$(CHDIR)/$(RTL8822BU_DIR); \
 		$(APPLY_PATCHES); \
-		$(MAKE) $(KERNEL_MAKEVARS); \
+		$(MAKE) $(KERNEL_MAKE_VARS); \
 		$(INSTALL_DATA) 88x2bu.ko $(TARGET_modulesdir)/kernel/drivers/net/wireless/
 	make depmod
 	$(REMOVE)/$(RTL8822BU_DIR)
@ -63,18 +63,16 @@ rtl8822bu: kernel-$(BOXTYPE) $(DL_DIR)/$(RTL8822BU_SOURCE) | $(TARGET_DIR)

 # -----------------------------------------------------------------------------

-HD6x-MALI-DRIVERS_VER    = DX910-SW-99002-r7p0-00rel0
-HD6x-MALI-DRIVERS_DIR    = $(HD6x-MALI-DRIVERS_VER)
-HD6x-MALI-DRIVERS_SOURCE = $(HD6x-MALI-DRIVERS_VER).tgz
-HD6x-MALI-DRIVERS_SITE   = https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu
+HD6x_MALI_DRIVERS_VER    = DX910-SW-99002-r7p0-00rel0
+HD6x_MALI_DRIVERS_DIR    = $(HD6x_MALI_DRIVERS_VER)
+HD6x_MALI_DRIVERS_SOURCE = $(HD6x_MALI_DRIVERS_VER).tgz
+HD6x_MALI_DRIVERS_SITE   = https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu

-$(DL_DIR)/$(HD6x-MALI-DRIVERS_SOURCE):
-	$(DOWNLOAD) $(HD6x-MALI-DRIVERS_SITE)/$(HD6x-MALI-DRIVERS_SOURCE)
+$(DL_DIR)/$(HD6x_MALI_DRIVERS_SOURCE):
+	$(DOWNLOAD) $(HD6x_MALI_DRIVERS_SITE)/$(HD6x_MALI_DRIVERS_SOURCE)

-HD6x-MALI-DRIVERS_PATCH  = hi3798mv200-support.patch
-
-HD6x-MALI-DRIVERS_MAKEVARS = \
-	M=$(BUILD_DIR)/$(HD6x-MALI-DRIVERS_DIR)/driver/src/devicedrv/mali \
+HD6x_MALI_DRIVERS_MAKE_VARS = \
+	M=$(BUILD_DIR)/$(HD6x_MALI_DRIVERS_DIR)/driver/src/devicedrv/mali \
 	EXTRA_CFLAGS="-DCONFIG_MALI_DVFS=y -DCONFIG_GPU_AVS_ENABLE=y" \
 	CONFIG_MALI_SHARED_INTERRUPTS=y \
 	CONFIG_MALI400=m \
@ -82,14 +80,14 @@ HD6x-MALI-DRIVERS_MAKEVARS = \
 	CONFIG_MALI_DVFS=y \
 	CONFIG_GPU_AVS_ENABLE=y

-hd6x-mali-drivers: kernel-$(BOXTYPE) hd6x-libgles-headers $(DL_DIR)/$(HD6x-MALI-DRIVERS_SOURCE) | $(TARGET_DIR)
+hd6x-mali-drivers: kernel-$(BOXTYPE) hd6x-libgles-headers $(DL_DIR)/$(HD6x_MALI_DRIVERS_SOURCE) | $(TARGET_DIR)
 	$(START_BUILD)
-	$(REMOVE)/$(HD6x-MALI-DRIVERS_DIR)
-	$(UNTAR)/$(HD6x-MALI-DRIVERS_SOURCE)
-	$(CHDIR)/$(HD6x-MALI-DRIVERS_DIR); \
-		$(call apply_patches,$(HD6x-MALI-DRIVERS_PATCH)); \
-		$(MAKE) -C $(BUILD_DIR)/$(KERNEL_OBJ) $(KERNEL_MAKEVARS) $(HD6x-MALI-DRIVERS_MAKEVARS); \
-		$(MAKE) -C $(BUILD_DIR)/$(KERNEL_OBJ) $(KERNEL_MAKEVARS) $(HD6x-MALI-DRIVERS_MAKEVARS) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
+	$(REMOVE)/$(HD6x_MALI_DRIVERS_DIR)
+	$(UNTAR)/$(HD6x_MALI_DRIVERS_SOURCE)
+	$(CHDIR)/$(HD6x_MALI_DRIVERS_DIR); \
+		$(APPLY_PATCHES); \
+		$(MAKE) -C $(BUILD_DIR)/$(KERNEL_OBJ) $(KERNEL_MAKE_VARS) $(HD6x_MALI_DRIVERS_MAKE_VARS); \
+		$(MAKE) -C $(BUILD_DIR)/$(KERNEL_OBJ) $(KERNEL_MAKE_VARS) $(HD6x_MALI_DRIVERS_MAKE_VARS) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
 	make depmod
-	$(REMOVE)/$(HD6x-MALI-DRIVERS_DIR)
+	$(REMOVE)/$(HD6x_MALI_DRIVERS_DIR)
 	$(TOUCH)
--- a/make/linux-kernel.mk
+++ b/make/linux-kernel.mk
@ -193,17 +193,17 @@ VUDUO_PATCH = \
 $(DL_DIR)/$(KERNEL_SOURCE):
 	$(DOWNLOAD) $(KERNEL_SITE)/$(KERNEL_SOURCE)

-$(DL_DIR)/$(VMLINUZ-INITRD_SOURCE):
-	$(DOWNLOAD) $(VMLINUZ-INITRD_SITE)/$(VMLINUZ-INITRD_SOURCE)
+$(DL_DIR)/$(VMLINUZ_INITRD_SOURCE):
+	$(DOWNLOAD) $(VMLINUZ_INITRD_SITE)/$(VMLINUZ_INITRD_SOURCE)

 # -----------------------------------------------------------------------------

-kernel.do_checkout: $(SOURCE_DIR)/$(NI-LINUX-KERNEL)
-	$(CD) $(SOURCE_DIR)/$(NI-LINUX-KERNEL); \
+kernel.do_checkout: $(SOURCE_DIR)/$(NI_LINUX_KERNEL)
+	$(CD) $(SOURCE_DIR)/$(NI_LINUX_KERNEL); \
 		git checkout $(KERNEL_BRANCH)

 kernel.do_prepare:
-	$(MAKE) kernel.do_prepare.$(if $(filter $(KERNEL_SOURCE),git),git,tar)
+	$(MAKE) kernel.do_prepare_$(if $(filter $(KERNEL_SOURCE),git),git,tar)
 	#
 	$(REMOVE)/$(KERNEL_OBJ)
 	$(REMOVE)/$(KERNEL_MODULES)
@ -213,31 +213,31 @@ kernel.do_prepare:
 	$(MKDIR)/$(KERNEL_HEADERS)
 	$(INSTALL_DATA) $(KERNEL_CONFIG) $(BUILD_DIR)/$(KERNEL_OBJ)/.config
 ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61))
-	$(INSTALL_DATA) $(PATCHES)/initramfs-subdirboot.cpio.gz $(BUILD_DIR)/$(KERNEL_OBJ)
+	$(INSTALL_DATA) $(PKG_FILES_DIR)/initramfs-subdirboot.cpio.gz $(BUILD_DIR)/$(KERNEL_OBJ)
 endif
 	$(TOUCH)

-kernel.do_prepare.git:
+kernel.do_prepare_git:
 	$(MAKE) kernel.do_checkout
 	#
 	$(REMOVE)/$(KERNEL_DIR)
-	tar -C $(SOURCE_DIR) -cp $(NI-LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_DIR) -x
+	tar -C $(SOURCE_DIR) -cp $(NI_LINUX_KERNEL) --exclude-vcs | tar -C $(BUILD_DIR) -x
 	$(CD) $(BUILD_DIR); \
-		mv $(NI-LINUX-KERNEL) $(KERNEL_DIR)
+		mv $(NI_LINUX_KERNEL) $(KERNEL_DIR)

-kernel.do_prepare.tar: $(DL_DIR)/$(KERNEL_SOURCE)
+kernel.do_prepare_tar: $(DL_DIR)/$(KERNEL_SOURCE)
 	$(REMOVE)/$(KERNEL_DIR)
 	$(UNTAR)/$(KERNEL_SOURCE)
 	$(CHDIR)/$(KERNEL_DIR); \
-		$(call apply_patches,$(addprefix kernel/,$(KERNEL_PATCH)))
+		$(call apply_patches,$(addprefix $(PKG_PATCHES_DIR)/,$(KERNEL_PATCH)))

 kernel.do_compile: kernel.do_prepare
 	$(CHDIR)/$(KERNEL_DIR); \
-		$(MAKE) $(KERNEL_MAKEVARS) silentoldconfig; \
-		$(MAKE) $(KERNEL_MAKEVARS) $(KERNEL_MAKEOPTS); \
-		$(MAKE) $(KERNEL_MAKEVARS) modules_install; \
-		$(MAKE) $(KERNEL_MAKEVARS) headers_install
-ifneq ($(KERNEL_DTB),$(EMPTY))
+		$(MAKE) $(KERNEL_MAKE_VARS) silentoldconfig; \
+		$(MAKE) $(KERNEL_MAKE_VARS) modules $(KERNEL_MAKE_TARGETS); \
+		$(MAKE) $(KERNEL_MAKE_VARS) modules_install; \
+		$(MAKE) $(KERNEL_MAKE_VARS) headers_install
+ifneq ($(KERNEL_DTB),$(empty))
 	cat $(KERNEL_ZIMAGE) $(KERNEL_DTB) > $(KERNEL_ZIMAGE_DTB)
 endif
 	$(TOUCH)
@ -253,12 +253,12 @@ kernel-coolstream: kernel-coolstream-$(BOXSERIES)
 	$(TOUCH)

 kernel-coolstream-hd1: kernel.do_compile | $(IMAGE_DIR)
-	mkimage -A $(TARGET_ARCH) -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(KERNEL_UIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-uImage.img
-	mkimage -A $(TARGET_ARCH) -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(KERNEL_ZIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img
+	$(HOST_MKIMAGE) -A $(TARGET_ARCH) -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(KERNEL_UIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-uImage.img
+	$(HOST_MKIMAGE) -A $(TARGET_ARCH) -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(KERNEL_ZIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img
 	$(TOUCH)

 kernel-coolstream-hd2: kernel.do_compile | $(IMAGE_DIR)
-	mkimage -A $(TARGET_ARCH) -O linux -T kernel -C none -a 0x8000 -e 0x8000 -n "$(KERNEL_NAME)" -d $(KERNEL_ZIMAGE_DTB) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz
+	$(HOST_MKIMAGE) -A $(TARGET_ARCH) -O linux -T kernel -C none -a 0x8000 -e 0x8000 -n "$(KERNEL_NAME)" -d $(KERNEL_ZIMAGE_DTB) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz
 ifeq ($(BOXMODEL),$(filter $(BOXMODEL),apollo shiner))
  ifeq ($(BOXMODEL),apollo)
 	# create also shiner-kernel when building apollo
@ -271,7 +271,7 @@ endif
 	$(TOUCH)

 kernel-armbox: kernel.do_compile | $(IMAGE_DIR)
-#ifneq ($(KERNEL_DTB),$(EMPTY))
+#ifneq ($(KERNEL_DTB),$(empty))
 #	$(INSTALL_DATA) $(KERNEL_ZIMAGE_DTB) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL).bin
 #else
 #	$(INSTALL_DATA) $(KERNEL_ZIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL).bin
@ -287,21 +287,21 @@ kernel-mipsbox: kernel.do_compile | $(IMAGE_DIR)
 kernel-modules-coolstream: kernel-modules-coolstream-$(BOXSERIES)
 	$(TOUCH)

-STRIP-MODULES-COOLSTREAM-HD1  =
-STRIP-MODULES-COOLSTREAM-HD1 += kernel/drivers/mtd/devices/mtdram.ko
-STRIP-MODULES-COOLSTREAM-HD1 += kernel/drivers/mtd/devices/block2mtd.ko
-STRIP-MODULES-COOLSTREAM-HD1 += kernel/drivers/net/tun.ko
-STRIP-MODULES-COOLSTREAM-HD1 += kernel/drivers/staging/rt2870/rt2870sta.ko
-STRIP-MODULES-COOLSTREAM-HD1 += kernel/drivers/usb/serial/ftdi_sio.ko
-STRIP-MODULES-COOLSTREAM-HD1 += kernel/drivers/usb/serial/pl2303.ko
-STRIP-MODULES-COOLSTREAM-HD1 += kernel/drivers/usb/serial/usbserial.ko
-STRIP-MODULES-COOLSTREAM-HD1 += kernel/fs/autofs4/autofs4.ko
-STRIP-MODULES-COOLSTREAM-HD1 += kernel/fs/cifs/cifs.ko
-STRIP-MODULES-COOLSTREAM-HD1 += kernel/fs/fuse/fuse.ko
+STRIP_MODULES_COOLSTREAM_HD1  =
+STRIP_MODULES_COOLSTREAM_HD1 += kernel/drivers/mtd/devices/mtdram.ko
+STRIP_MODULES_COOLSTREAM_HD1 += kernel/drivers/mtd/devices/block2mtd.ko
+STRIP_MODULES_COOLSTREAM_HD1 += kernel/drivers/net/tun.ko
+STRIP_MODULES_COOLSTREAM_HD1 += kernel/drivers/staging/rt2870/rt2870sta.ko
+STRIP_MODULES_COOLSTREAM_HD1 += kernel/drivers/usb/serial/ftdi_sio.ko
+STRIP_MODULES_COOLSTREAM_HD1 += kernel/drivers/usb/serial/pl2303.ko
+STRIP_MODULES_COOLSTREAM_HD1 += kernel/drivers/usb/serial/usbserial.ko
+STRIP_MODULES_COOLSTREAM_HD1 += kernel/fs/autofs4/autofs4.ko
+STRIP_MODULES_COOLSTREAM_HD1 += kernel/fs/cifs/cifs.ko
+STRIP_MODULES_COOLSTREAM_HD1 += kernel/fs/fuse/fuse.ko

 kernel-modules-coolstream-hd1: kernel-coolstream
 	mkdir -p $(TARGET_modulesdir)
-	for module in $(STRIP-MODULES-COOLSTREAM-HD1); do \
+	for module in $(STRIP_MODULES_COOLSTREAM_HD1); do \
 		mkdir -p $(TARGET_modulesdir)/$$(dirname $$module); \
 		$(TARGET_OBJCOPY) --strip-unneeded $(KERNEL_modulesdir)/$$module $(TARGET_modulesdir)/$$module; \
 	done;
@ -344,8 +344,8 @@ kernel-modules-mipsbox: kernel-mipsbox

 # -----------------------------------------------------------------------------

-vmlinuz-initrd: $(DL_DIR)/$(VMLINUZ-INITRD_SOURCE)
-	$(UNTAR)/$(VMLINUZ-INITRD_SOURCE)
+vmlinuz-initrd: $(DL_DIR)/$(VMLINUZ_INITRD_SOURCE)
+	$(UNTAR)/$(VMLINUZ_INITRD_SOURCE)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -366,11 +366,11 @@ kernel-install-coolstream: kernel-install-coolstream-$(BOXSERIES)

 kernel-install-coolstream-hd1: kernel-coolstream-hd1
 	$(INSTALL_DATA) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img \
-		$(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/zImage
+		$(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/zImage

 kernel-install-coolstream-hd2: kernel-coolstream-hd2
 	$(INSTALL_DATA) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz \
-		$(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/vmlinux.ub.gz
+		$(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/vmlinux.ub.gz

 kernel-install-coolstream-all:
 	make clean BOXFAMILY=nevis
@ -396,8 +396,8 @@ kernel-install-coolstream-all:
 	#
 	make clean > /dev/null 2>&1
 	#
-	@echo -e "$(TERM_YELLOW)Align stb_update.data in $(SOURCE_DIR)/$(NI-DRIVERS-BIN)$(TERM_NORMAL)"
-	@echo -e "$(TERM_YELLOW)and commit your changes in $(SOURCE_DIR)/$(NI-DRIVERS-BIN)$(TERM_NORMAL)"
+	@echo -e "$(TERM_YELLOW)Align stb_update.data in $(SOURCE_DIR)/$(NI_DRIVERS_BIN)$(TERM_NORMAL)"
+	@echo -e "$(TERM_YELLOW)and commit your changes in $(SOURCE_DIR)/$(NI_DRIVERS_BIN)$(TERM_NORMAL)"

 # -----------------------------------------------------------------------------

--- a/make/ni.mk
+++ b/make/ni.mk
@ -3,7 +3,7 @@
 #
 # -----------------------------------------------------------------------------

-BOXMODEL_IMAGE  = $(EMPTY)
+BOXMODEL_IMAGE  =
 ifneq ($(DEBUG),yes)
  BOXMODEL_IMAGE += nevis
 endif
@ -35,29 +35,29 @@ ni-image:
 	$(MAKE) tzdata
 	$(MAKE) smartmontools
 	$(MAKE) sg3_utils
-	$(MAKE) nfs-utils
-	$(MAKE) procps-ng
 	$(MAKE) nano
 	make hd-idle
+	$(MAKE) hdparm
+	$(MAKE) nfs-utils
 	$(MAKE) e2fsprogs
 	$(MAKE) ntfs-3g
 	$(MAKE) exfat-utils
-	$(MAKE) vsftpd
+	$(MAKE) dosfstools
+	$(MAKE) mtd-utils
 	make djmount
 	$(MAKE) ushare
 	$(MAKE) xupnpd
 	make inadyn
 	make samba
+	$(MAKE) vsftpd
 	make dropbear
-	$(MAKE) hdparm
 	$(MAKE) busybox
 	$(MAKE) sysvinit
 	$(MAKE) coreutils
-	$(MAKE) dosfstools
+	$(MAKE) procps-ng
 	$(MAKE) wpa_supplicant
-	$(MAKE) mtd-utils
 	$(MAKE) wget
-	#$(MAKE) streamripper
+	$(MAKE) streamripper
 ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd2 hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo))
 	$(MAKE) less
 	$(MAKE) parted
--- a/make/target-blobs.mk
+++ b/make/target-blobs.mk
@ -22,104 +22,104 @@ endif

 firmware: firmware-boxmodel firmware-wireless

-firmware-boxmodel: $(SOURCE_DIR)/$(NI-DRIVERS-BIN) | $(TARGET_DIR)
-	$(call INSTALL_EXIST,$(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib-firmware/.,$(TARGET_base_libdir)/firmware)
-	$(call INSTALL_EXIST,$(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib-firmware-dvb/.,$(TARGET_base_libdir)/firmware)
+firmware-boxmodel: $(SOURCE_DIR)/$(NI_DRIVERS_BIN) | $(TARGET_DIR)
+	$(call INSTALL_EXIST,$(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/lib-firmware/.,$(TARGET_base_libdir)/firmware)
+	$(call INSTALL_EXIST,$(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/lib-firmware-dvb/.,$(TARGET_base_libdir)/firmware)

 ifeq ($(BOXMODEL),nevis)
-  FIRMWARE-WIRELESS  = rt2870.bin
-  FIRMWARE-WIRELESS += rt3070.bin
-  FIRMWARE-WIRELESS += rt3071.bin
-  FIRMWARE-WIRELESS += rtlwifi/rtl8192cufw.bin
-  FIRMWARE-WIRELESS += rtlwifi/rtl8712u.bin
+  FIRMWARE_WIRELESS  = rt2870.bin
+  FIRMWARE_WIRELESS += rt3070.bin
+  FIRMWARE_WIRELESS += rt3071.bin
+  FIRMWARE_WIRELESS += rtlwifi/rtl8192cufw.bin
+  FIRMWARE_WIRELESS += rtlwifi/rtl8712u.bin
 else
-  FIRMWARE-WIRELESS  = $(shell cd $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/general/firmware-wireless; find * -type f)
+  FIRMWARE_WIRELESS  = $(shell cd $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/general/firmware-wireless; find * -type f)
 endif

-firmware-wireless: $(SOURCE_DIR)/$(NI-DRIVERS-BIN) | $(TARGET_DIR)
-	for firmware in $(FIRMWARE-WIRELESS); do \
-		$(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/general/firmware-wireless/$$firmware $(TARGET_base_libdir)/firmware/$$firmware; \
+firmware-wireless: $(SOURCE_DIR)/$(NI_DRIVERS_BIN) | $(TARGET_DIR)
+	for firmware in $(FIRMWARE_WIRELESS); do \
+		$(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/general/firmware-wireless/$$firmware $(TARGET_base_libdir)/firmware/$$firmware; \
 	done

 # -----------------------------------------------------------------------------

-HD51-DRIVERS_VER    = 20191120
-HD51-DRIVERS_SOURCE = hd51-drivers-$(KERNEL_VER)-$(HD51-DRIVERS_VER).zip
-HD51-DRIVERS_SITE   = http://source.mynonpublic.com/gfutures
+HD51_DRIVERS_VER    = 20191120
+HD51_DRIVERS_SOURCE = hd51-drivers-$(KERNEL_VER)-$(HD51_DRIVERS_VER).zip
+HD51_DRIVERS_SITE   = http://source.mynonpublic.com/gfutures

-BRE2ZE4K-DRIVERS_VER    = 20191120
-BRE2ZE4K-DRIVERS_SOURCE = bre2ze4k-drivers-$(KERNEL_VER)-$(BRE2ZE4K-DRIVERS_VER).zip
-BRE2ZE4K-DRIVERS_SITE   = http://source.mynonpublic.com/gfutures
+BRE2ZE4K_DRIVERS_VER    = 20191120
+BRE2ZE4K_DRIVERS_SOURCE = bre2ze4k-drivers-$(KERNEL_VER)-$(BRE2ZE4K_DRIVERS_VER).zip
+BRE2ZE4K_DRIVERS_SITE   = http://source.mynonpublic.com/gfutures

-H7-DRIVERS_VER    = 20191123
-H7-DRIVERS_SOURCE = h7-drivers-$(KERNEL_VER)-$(H7-DRIVERS_VER).zip
-H7-DRIVERS_SITE   = http://source.mynonpublic.com/zgemma
+H7_DRIVERS_VER    = 20191123
+H7_DRIVERS_SOURCE = h7-drivers-$(KERNEL_VER)-$(H7_DRIVERS_VER).zip
+H7_DRIVERS_SITE   = http://source.mynonpublic.com/zgemma

-HD60-DRIVERS_VER    = 20200731
-HD60-DRIVERS_SOURCE = hd60-drivers-$(KERNEL_VER)-$(HD60-DRIVERS_VER).zip
-HD60-DRIVERS_SITE   = http://source.mynonpublic.com/gfutures
+HD60_DRIVERS_VER    = 20200731
+HD60_DRIVERS_SOURCE = hd60-drivers-$(KERNEL_VER)-$(HD60_DRIVERS_VER).zip
+HD60_DRIVERS_SITE   = http://source.mynonpublic.com/gfutures

-HD61-DRIVERS_VER    = 20200731
-HD61-DRIVERS_SOURCE = hd61-drivers-$(KERNEL_VER)-$(HD61-DRIVERS_VER).zip
-HD61-DRIVERS_SITE   = http://source.mynonpublic.com/gfutures
+HD61_DRIVERS_VER    = 20200731
+HD61_DRIVERS_SOURCE = hd61-drivers-$(KERNEL_VER)-$(HD61_DRIVERS_VER).zip
+HD61_DRIVERS_SITE   = http://source.mynonpublic.com/gfutures

-VUSOLO4K-DRIVERS_VER    = 20190424
-VUSOLO4K-DRIVERS_SOURCE = vuplus-dvb-proxy-vusolo4k-3.14.28-$(VUSOLO4K-DRIVERS_VER).r0.tar.gz
-VUSOLO4K-DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-proxy
+VUSOLO4K_DRIVERS_VER    = 20190424
+VUSOLO4K_DRIVERS_SOURCE = vuplus-dvb-proxy-vusolo4k-3.14.28-$(VUSOLO4K_DRIVERS_VER).r0.tar.gz
+VUSOLO4K_DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-proxy

-ifeq ($(VUPLUS-DRIVERS_LATEST),yes)
-VUDUO4K-DRIVERS_VER    = 20191218
+ifeq ($(VUPLUS_DRIVERS_LATEST),yes)
+VUDUO4K_DRIVERS_VER    = 20191218
 else
-VUDUO4K-DRIVERS_VER    = 20190212
+VUDUO4K_DRIVERS_VER    = 20190212
 endif
-VUDUO4K-DRIVERS_SOURCE = vuplus-dvb-proxy-vuduo4k-4.1.45-$(VUDUO4K-DRIVERS_VER).r0.tar.gz
-VUDUO4K-DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-proxy
+VUDUO4K_DRIVERS_SOURCE = vuplus-dvb-proxy-vuduo4k-4.1.45-$(VUDUO4K_DRIVERS_VER).r0.tar.gz
+VUDUO4K_DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-proxy

-VUDUO4KSE-DRIVERS_VER    = 20200903
-VUDUO4KSE-DRIVERS_SOURCE = vuplus-dvb-proxy-vuduo4kse-4.1.45-$(VUDUO4KSE-DRIVERS_VER).r0.tar.gz
-VUDUO4KSE-DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-proxy
+VUDUO4KSE_DRIVERS_VER    = 20200903
+VUDUO4KSE_DRIVERS_SOURCE = vuplus-dvb-proxy-vuduo4kse-4.1.45-$(VUDUO4KSE_DRIVERS_VER).r0.tar.gz
+VUDUO4KSE_DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-proxy

-ifeq ($(VUPLUS-DRIVERS_LATEST),yes)
-VUULTIMO4K-DRIVERS_VER    = 20190424
+ifeq ($(VUPLUS_DRIVERS_LATEST),yes)
+VUULTIMO4K_DRIVERS_VER    = 20190424
 else
-VUULTIMO4K-DRIVERS_VER    = 20190104
+VUULTIMO4K_DRIVERS_VER    = 20190104
 endif
-VUULTIMO4K-DRIVERS_SOURCE = vuplus-dvb-proxy-vuultimo4k-3.14.28-$(VUULTIMO4K-DRIVERS_VER).r0.tar.gz
-VUULTIMO4K-DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-proxy
+VUULTIMO4K_DRIVERS_SOURCE = vuplus-dvb-proxy-vuultimo4k-3.14.28-$(VUULTIMO4K_DRIVERS_VER).r0.tar.gz
+VUULTIMO4K_DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-proxy

-VUZERO4K-DRIVERS_VER    = 20190424
-VUZERO4K-DRIVERS_SOURCE = vuplus-dvb-proxy-vuzero4k-4.1.20-$(VUZERO4K-DRIVERS_VER).r0.tar.gz
-VUZERO4K-DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-proxy
+VUZERO4K_DRIVERS_VER    = 20190424
+VUZERO4K_DRIVERS_SOURCE = vuplus-dvb-proxy-vuzero4k-4.1.20-$(VUZERO4K_DRIVERS_VER).r0.tar.gz
+VUZERO4K_DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-proxy

-ifeq ($(VUPLUS-DRIVERS_LATEST),yes)
-VUUNO4K-DRIVERS_VER    = 20190424
+ifeq ($(VUPLUS_DRIVERS_LATEST),yes)
+VUUNO4K_DRIVERS_VER    = 20190424
 else
-VUUNO4K-DRIVERS_VER    = 20190104
+VUUNO4K_DRIVERS_VER    = 20190104
 endif
-VUUNO4K-DRIVERS_SOURCE = vuplus-dvb-proxy-vuuno4k-3.14.28-$(VUUNO4K-DRIVERS_VER).r0.tar.gz
-VUUNO4K-DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-proxy
+VUUNO4K_DRIVERS_SOURCE = vuplus-dvb-proxy-vuuno4k-3.14.28-$(VUUNO4K_DRIVERS_VER).r0.tar.gz
+VUUNO4K_DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-proxy

-ifeq ($(VUPLUS-DRIVERS_LATEST),yes)
-VUUNO4KSE-DRIVERS_VER    = 20190424
+ifeq ($(VUPLUS_DRIVERS_LATEST),yes)
+VUUNO4KSE_DRIVERS_VER    = 20190424
 else
-VUUNO4KSE-DRIVERS_VER    = 20190104
+VUUNO4KSE_DRIVERS_VER    = 20190104
 endif
-VUUNO4KSE-DRIVERS_SOURCE = vuplus-dvb-proxy-vuuno4kse-4.1.20-$(VUUNO4KSE-DRIVERS_VER).r0.tar.gz
-VUUNO4KSE-DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-proxy
+VUUNO4KSE_DRIVERS_SOURCE = vuplus-dvb-proxy-vuuno4kse-4.1.20-$(VUUNO4KSE_DRIVERS_VER).r0.tar.gz
+VUUNO4KSE_DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-proxy

-VUDUO-DRIVERS_VER    = 20151124
-VUDUO-DRIVERS_SOURCE = vuplus-dvb-modules-bm750-3.9.6-$(VUDUO-DRIVERS_VER).tar.gz
-VUDUO-DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-modules
+VUDUO_DRIVERS_VER    = 20151124
+VUDUO_DRIVERS_SOURCE = vuplus-dvb-modules-bm750-3.9.6-$(VUDUO_DRIVERS_VER).tar.gz
+VUDUO_DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-modules

 # -----------------------------------------------------------------------------

-BOXMODEL-DRIVERS_VER    = $($(call UPPERCASE,$(BOXMODEL))-DRIVERS_VER)
-BOXMODEL-DRIVERS_SOURCE = $($(call UPPERCASE,$(BOXMODEL))-DRIVERS_SOURCE)
-BOXMODEL-DRIVERS_SITE   = $($(call UPPERCASE,$(BOXMODEL))-DRIVERS_SITE)
+BOXMODEL_DRIVERS_VER    = $($(call UPPERCASE,$(BOXMODEL))_DRIVERS_VER)
+BOXMODEL_DRIVERS_SOURCE = $($(call UPPERCASE,$(BOXMODEL))_DRIVERS_SOURCE)
+BOXMODEL_DRIVERS_SITE   = $($(call UPPERCASE,$(BOXMODEL))_DRIVERS_SITE)

-ifneq ($(BOXMODEL-DRIVERS_SOURCE),$(EMPTY))
-$(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE):
-	$(DOWNLOAD) $(BOXMODEL-DRIVERS_SITE)/$(BOXMODEL-DRIVERS_SOURCE)
+ifneq ($(BOXMODEL_DRIVERS_SOURCE),$(empty))
+$(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE):
+	$(DOWNLOAD) $(BOXMODEL_DRIVERS_SITE)/$(BOXMODEL_DRIVERS_SOURCE)
 endif

 nevis-drivers \
@ -127,15 +127,15 @@ apollo-drivers \
 shiner-drivers \
 kronos-drivers \
 kronos_v2-drivers \
-coolstream-drivers: $(SOURCE_DIR)/$(NI-DRIVERS-BIN) | $(TARGET_DIR)
+coolstream-drivers: $(SOURCE_DIR)/$(NI_DRIVERS_BIN) | $(TARGET_DIR)
 	mkdir -p $(TARGET_libdir)
-	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib/. $(TARGET_libdir)
-	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/libcoolstream/$(shell echo -n $(FFMPEG_BRANCH) | sed 's,/,-,g')/. $(TARGET_libdir)
+	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/lib/. $(TARGET_libdir)
+	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/libcoolstream/$(shell echo -n $(FFMPEG_BRANCH) | sed 's,/,-,g')/. $(TARGET_libdir)
 ifeq ($(BOXMODEL),nevis)
 	ln -sf libnxp.so $(TARGET_libdir)/libconexant.so
 endif
 	mkdir -p $(TARGET_modulesdir)
-	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib-modules/$(KERNEL_VER)/. $(TARGET_modulesdir)
+	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/lib-modules/$(KERNEL_VER)/. $(TARGET_modulesdir)
 ifeq ($(BOXMODEL),nevis)
 	ln -sf $(KERNEL_VER) $(TARGET_modulesdir)-$(BOXMODEL)
 endif
@ -144,16 +144,16 @@ endif

 hd51-drivers \
 bre2ze4k-drivers \
-h7-drivers: $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) | $(TARGET_DIR)
+h7-drivers: $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) | $(TARGET_DIR)
 	mkdir -p $(TARGET_modulesdir)/extra
-	unzip -o $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) -d $(TARGET_modulesdir)/extra
+	unzip -o $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) -d $(TARGET_modulesdir)/extra
 	make depmod
 	$(TOUCH)

 hd60-drivers \
-hd61-drivers: $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) | $(TARGET_DIR)
+hd61-drivers: $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) | $(TARGET_DIR)
 	mkdir -p $(TARGET_modulesdir)/extra
-	unzip -o $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) -d $(TARGET_modulesdir)/extra
+	unzip -o $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) -d $(TARGET_modulesdir)/extra
 	rm -f $(TARGET_modulesdir)/extra/hi_play.ko
 	mv $(TARGET_modulesdir)/extra/turnoff_power $(TARGET_bindir)
 	make depmod
@ -167,107 +167,107 @@ vuzero4k-drivers \
 vuuno4k-drivers \
 vuuno4kse-drivers \
 vuduo-drivers \
-vuplus-drivers: $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) | $(TARGET_DIR)
+vuplus-drivers: $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) | $(TARGET_DIR)
 	mkdir -p $(TARGET_modulesdir)/extra
-	tar -xf $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) -C $(TARGET_modulesdir)/extra
+	tar -xf $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) -C $(TARGET_modulesdir)/extra
 	make depmod
 	$(TOUCH)

 # -----------------------------------------------------------------------------

-HD51-LIBGLES_VER    = 20191101
-HD51-LIBGLES_DIR    = $(EMPTY)
-HD51-LIBGLES_SOURCE = hd51-v3ddriver-$(HD51-LIBGLES_VER).zip
-HD51-LIBGLES_SITE   = http://downloads.mutant-digital.net/v3ddriver
-
-BRE2ZE4K-LIBGLES_VER    = 20191101
-BRE2ZE4K-LIBGLES_DIR    = $(EMPTY)
-BRE2ZE4K-LIBGLES_SOURCE = bre2ze4k-v3ddriver-$(BRE2ZE4K-LIBGLES_VER).zip
-BRE2ZE4K-LIBGLES_SITE   = http://downloads.mutant-digital.net/v3ddriver
-
-H7-LIBGLES_VER    = 20191110
-H7-LIBGLES_DIR    = $(EMPTY)
-H7-LIBGLES_SOURCE = h7-v3ddriver-$(H7-LIBGLES_VER).zip
-H7-LIBGLES_SITE   = http://source.mynonpublic.com/zgemma
-
-HD60-LIBGLES_VER    = 20181201
-HD60-LIBGLES_DIR    = $(EMPTY)
-HD60-LIBGLES_SOURCE = hd60-mali-$(HD60-LIBGLES_VER).zip
-HD60-LIBGLES_SITE   = http://downloads.mutant-digital.net/hd60
-
-HD61-LIBGLES_VER    = 20181201
-HD61-LIBGLES_DIR    = $(EMPTY)
-HD61-LIBGLES_SOURCE = hd61-mali-$(HD61-LIBGLES_VER).zip
-HD61-LIBGLES_SITE   = http://downloads.mutant-digital.net/hd61
-
-HD6x-LIBGLES-HEADERS_SOURCE = libgles-mali-utgard-headers.zip
-HD6x-LIBGLES-HEADERS_SITE   = https://github.com/HD-Digital/meta-gfutures/raw/release-6.2/recipes-bsp/mali/files
-
-VUSOLO4K-LIBGLES_VER    = $(VUSOLO4K-DRIVERS_VER)
-VUSOLO4K-LIBGLES_DIR    = libgles-vusolo4k
-VUSOLO4K-LIBGLES_SOURCE = libgles-vusolo4k-17.1-$(VUSOLO4K-LIBGLES_VER).r0.tar.gz
-VUSOLO4K-LIBGLES_SITE   = http://code.vuplus.com/download/release/libgles
-
-VUDUO4K-LIBGLES_VER    = $(VUDUO4K-DRIVERS_VER)
-VUDUO4K-LIBGLES_DIR    = libgles-vuduo4k
-VUDUO4K-LIBGLES_SOURCE = libgles-vuduo4k-18.1-$(VUDUO4K-LIBGLES_VER).r0.tar.gz
-VUDUO4K-LIBGLES_SITE   = http://code.vuplus.com/download/release/libgles
-
-VUDUO4KSE-LIBGLES_VER    = $(VUDUO4KSE-DRIVERS_VER)
-VUDUO4KSE-LIBGLES_DIR    = libgles-vuduo4kse
-VUDUO4KSE-LIBGLES_SOURCE = libgles-vuduo4kse-17.1-$(VUDUO4KSE-LIBGLES_VER).r0.tar.gz
-VUDUO4KSE-LIBGLES_SITE   = http://code.vuplus.com/download/release/libgles
-
-VUULTIMO4K-LIBGLES_VER    = $(VUULTIMO4K-DRIVERS_VER)
-VUULTIMO4K-LIBGLES_DIR    = libgles-vuultimo4k
-VUULTIMO4K-LIBGLES_SOURCE = libgles-vuultimo4k-17.1-$(VUULTIMO4K-LIBGLES_VER).r0.tar.gz
-VUULTIMO4K-LIBGLES_SITE   = http://code.vuplus.com/download/release/libgles
-
-VUZERO4K-LIBGLES_VER    = $(VUZERO4K-DRIVERS_VER)
-VUZERO4K-LIBGLES_DIR    = libgles-vuzero4k
-VUZERO4K-LIBGLES_SOURCE = libgles-vuzero4k-17.1-$(VUZERO4K-LIBGLES_VER).r0.tar.gz
-VUZERO4K-LIBGLES_SITE   = http://code.vuplus.com/download/release/libgles
-
-VUUNO4K-LIBGLES_VER    = $(VUUNO4K-DRIVERS_VER)
-VUUNO4K-LIBGLES_DIR    = libgles-vuuno4k
-VUUNO4K-LIBGLES_SOURCE = libgles-vuuno4k-17.1-$(VUUNO4K-LIBGLES_VER).r0.tar.gz
-VUUNO4K-LIBGLES_SITE   = http://code.vuplus.com/download/release/libgles
-
-VUUNO4KSE-LIBGLES_VER    = $(VUUNO4KSE-DRIVERS_VER)
-VUUNO4KSE-LIBGLES_DIR    = libgles-vuuno4kse
-VUUNO4KSE-LIBGLES_SOURCE = libgles-vuuno4kse-17.1-$(VUUNO4KSE-LIBGLES_VER).r0.tar.gz
-VUUNO4KSE-LIBGLES_SITE   = http://code.vuplus.com/download/release/libgles
+HD51_LIBGLES_VER    = 20191101
+HD51_LIBGLES_DIR    = $(empty)
+HD51_LIBGLES_SOURCE = hd51-v3ddriver-$(HD51_LIBGLES_VER).zip
+HD51_LIBGLES_SITE   = http://downloads.mutant-digital.net/v3ddriver
+
+BRE2ZE4K_LIBGLES_VER    = 20191101
+BRE2ZE4K_LIBGLES_DIR    = $(empty)
+BRE2ZE4K_LIBGLES_SOURCE = bre2ze4k-v3ddriver-$(BRE2ZE4K_LIBGLES_VER).zip
+BRE2ZE4K_LIBGLES_SITE   = http://downloads.mutant-digital.net/v3ddriver
+
+H7_LIBGLES_VER    = 20191110
+H7_LIBGLES_DIR    = $(empty)
+H7_LIBGLES_SOURCE = h7-v3ddriver-$(H7_LIBGLES_VER).zip
+H7_LIBGLES_SITE   = http://source.mynonpublic.com/zgemma
+
+HD60_LIBGLES_VER    = 20181201
+HD60_LIBGLES_DIR    = $(empty)
+HD60_LIBGLES_SOURCE = hd60-mali-$(HD60_LIBGLES_VER).zip
+HD60_LIBGLES_SITE   = http://downloads.mutant-digital.net/hd60
+
+HD61_LIBGLES_VER    = 20181201
+HD61_LIBGLES_DIR    = $(empty)
+HD61_LIBGLES_SOURCE = hd61-mali-$(HD61_LIBGLES_VER).zip
+HD61_LIBGLES_SITE   = http://downloads.mutant-digital.net/hd61
+
+HD6x_LIBGLES_HEADERS_SOURCE = libgles-mali-utgard-headers.zip
+HD6x_LIBGLES_HEADERS_SITE   = https://github.com/HD-Digital/meta-gfutures/raw/release-6.2/recipes-bsp/mali/files
+
+VUSOLO4K_LIBGLES_VER    = $(VUSOLO4K_DRIVERS_VER)
+VUSOLO4K_LIBGLES_DIR    = libgles-vusolo4k
+VUSOLO4K_LIBGLES_SOURCE = libgles-vusolo4k-17.1-$(VUSOLO4K_LIBGLES_VER).r0.tar.gz
+VUSOLO4K_LIBGLES_SITE   = http://code.vuplus.com/download/release/libgles
+
+VUDUO4K_LIBGLES_VER    = $(VUDUO4K_DRIVERS_VER)
+VUDUO4K_LIBGLES_DIR    = libgles-vuduo4k
+VUDUO4K_LIBGLES_SOURCE = libgles-vuduo4k-18.1-$(VUDUO4K_LIBGLES_VER).r0.tar.gz
+VUDUO4K_LIBGLES_SITE   = http://code.vuplus.com/download/release/libgles
+
+VUDUO4KSE_LIBGLES_VER    = $(VUDUO4KSE_DRIVERS_VER)
+VUDUO4KSE_LIBGLES_DIR    = libgles-vuduo4kse
+VUDUO4KSE_LIBGLES_SOURCE = libgles-vuduo4kse-17.1-$(VUDUO4KSE_LIBGLES_VER).r0.tar.gz
+VUDUO4KSE_LIBGLES_SITE   = http://code.vuplus.com/download/release/libgles
+
+VUULTIMO4K_LIBGLES_VER    = $(VUULTIMO4K_DRIVERS_VER)
+VUULTIMO4K_LIBGLES_DIR    = libgles-vuultimo4k
+VUULTIMO4K_LIBGLES_SOURCE = libgles-vuultimo4k-17.1-$(VUULTIMO4K_LIBGLES_VER).r0.tar.gz
+VUULTIMO4K_LIBGLES_SITE   = http://code.vuplus.com/download/release/libgles
+
+VUZERO4K_LIBGLES_VER    = $(VUZERO4K_DRIVERS_VER)
+VUZERO4K_LIBGLES_DIR    = libgles-vuzero4k
+VUZERO4K_LIBGLES_SOURCE = libgles-vuzero4k-17.1-$(VUZERO4K_LIBGLES_VER).r0.tar.gz
+VUZERO4K_LIBGLES_SITE   = http://code.vuplus.com/download/release/libgles
+
+VUUNO4K_LIBGLES_VER    = $(VUUNO4K_DRIVERS_VER)
+VUUNO4K_LIBGLES_DIR    = libgles-vuuno4k
+VUUNO4K_LIBGLES_SOURCE = libgles-vuuno4k-17.1-$(VUUNO4K_LIBGLES_VER).r0.tar.gz
+VUUNO4K_LIBGLES_SITE   = http://code.vuplus.com/download/release/libgles
+
+VUUNO4KSE_LIBGLES_VER    = $(VUUNO4KSE_DRIVERS_VER)
+VUUNO4KSE_LIBGLES_DIR    = libgles-vuuno4kse
+VUUNO4KSE_LIBGLES_SOURCE = libgles-vuuno4kse-17.1-$(VUUNO4KSE_LIBGLES_VER).r0.tar.gz
+VUUNO4KSE_LIBGLES_SITE   = http://code.vuplus.com/download/release/libgles

 # -----------------------------------------------------------------------------

-BOXMODEL-LIBGLES_VER    = $($(call UPPERCASE,$(BOXMODEL))-LIBGLES_VER)
-BOXMODEL-LIBGLES_DIR    = $($(call UPPERCASE,$(BOXMODEL))-LIBGLES_DIR)
-BOXMODEL-LIBGLES_SOURCE = $($(call UPPERCASE,$(BOXMODEL))-LIBGLES_SOURCE)
-BOXMODEL-LIBGLES_SITE   = $($(call UPPERCASE,$(BOXMODEL))-LIBGLES_SITE)
+BOXMODEL_LIBGLES_VER    = $($(call UPPERCASE,$(BOXMODEL))_LIBGLES_VER)
+BOXMODEL_LIBGLES_DIR    = $($(call UPPERCASE,$(BOXMODEL))_LIBGLES_DIR)
+BOXMODEL_LIBGLES_SOURCE = $($(call UPPERCASE,$(BOXMODEL))_LIBGLES_SOURCE)
+BOXMODEL_LIBGLES_SITE   = $($(call UPPERCASE,$(BOXMODEL))_LIBGLES_SITE)

-ifneq ($(BOXMODEL-LIBGLES_SOURCE),$(EMPTY))
-$(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE):
-	$(DOWNLOAD) $(BOXMODEL-LIBGLES_SITE)/$(BOXMODEL-LIBGLES_SOURCE)
+ifneq ($(BOXMODEL_LIBGLES_SOURCE),$(empty))
+$(DL_DIR)/$(BOXMODEL_LIBGLES_SOURCE):
+	$(DOWNLOAD) $(BOXMODEL_LIBGLES_SITE)/$(BOXMODEL_LIBGLES_SOURCE)
 endif

 hd51-libgles \
 bre2ze4k-libgles \
-h7-libgles: $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) | $(TARGET_DIR)
-	unzip -o $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) -d $(TARGET_libdir)
+h7-libgles: $(DL_DIR)/$(BOXMODEL_LIBGLES_SOURCE) | $(TARGET_DIR)
+	unzip -o $(DL_DIR)/$(BOXMODEL_LIBGLES_SOURCE) -d $(TARGET_libdir)
 	ln -sf libv3ddriver.so $(TARGET_libdir)/libEGL.so
 	ln -sf libv3ddriver.so $(TARGET_libdir)/libGLESv2.so
 	$(TOUCH)

-$(DL_DIR)/$(HD6x-LIBGLES-HEADERS_SOURCE):
-	$(DOWNLOAD) $(HD6x-LIBGLES-HEADERS_SITE)/$(HD6x-LIBGLES-HEADERS_SOURCE)
+$(DL_DIR)/$(HD6x_LIBGLES_HEADERS_SOURCE):
+	$(DOWNLOAD) $(HD6x_LIBGLES_HEADERS_SITE)/$(HD6x_LIBGLES_HEADERS_SOURCE)

-hd6x-libgles-headers: $(DL_DIR)/$(HD6x-LIBGLES-HEADERS_SOURCE) | $(TARGET_DIR)
-	unzip -o $(DL_DIR)/$(HD6x-LIBGLES-HEADERS_SOURCE) -d $(TARGET_includedir)
+hd6x-libgles-headers: $(DL_DIR)/$(HD6x_LIBGLES_HEADERS_SOURCE) | $(TARGET_DIR)
+	unzip -o $(DL_DIR)/$(HD6x_LIBGLES_HEADERS_SOURCE) -d $(TARGET_includedir)
 	$(TOUCH)

 hd60-libgles \
-hd61-libgles: $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) | $(TARGET_DIR)
-	unzip -o $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) -d $(TARGET_libdir)
+hd61-libgles: $(DL_DIR)/$(BOXMODEL_LIBGLES_SOURCE) | $(TARGET_DIR)
+	unzip -o $(DL_DIR)/$(BOXMODEL_LIBGLES_SOURCE) -d $(TARGET_libdir)
 	$(CD) $(TARGET_libdir); \
 		ln -sf libMali.so libmali.so; \
 		ln -sf libMali.so libEGL.so.1.4; ln -sf libEGL.so.1.4 libEGL.so.1; ln -sf libEGL.so.1 libEGL.so; \
@ -283,107 +283,107 @@ vuultimo4k-libgles \
 vuzero4k-libgles \
 vuuno4k-libgles \
 vuuno4kse-libgles \
-vuplus-libgles: $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(BOXMODEL-LIBGLES_DIR)
-	$(UNTAR)/$(BOXMODEL-LIBGLES_SOURCE)
-	$(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBGLES_DIR)/lib/* $(TARGET_libdir)
+vuplus-libgles: $(DL_DIR)/$(BOXMODEL_LIBGLES_SOURCE) | $(TARGET_DIR)
+	$(REMOVE)/$(BOXMODEL_LIBGLES_DIR)
+	$(UNTAR)/$(BOXMODEL_LIBGLES_SOURCE)
+	$(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL_LIBGLES_DIR)/lib/* $(TARGET_libdir)
 	ln -sf libv3ddriver.so $(TARGET_libdir)/libEGL.so
 	ln -sf libv3ddriver.so $(TARGET_libdir)/libGLESv2.so
-	$(INSTALL_COPY) $(BUILD_DIR)/$(BOXMODEL-LIBGLES_DIR)/include/* $(TARGET_includedir)
-	$(REMOVE)/$(BOXMODEL-LIBGLES_DIR)
+	$(INSTALL_COPY) $(BUILD_DIR)/$(BOXMODEL_LIBGLES_DIR)/include/* $(TARGET_includedir)
+	$(REMOVE)/$(BOXMODEL_LIBGLES_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

-HD60-LIBS_VER    = 20200622
-HD60-LIBS_DIR    = hiplay
-HD60-LIBS_SOURCE = gfutures-libs-3798mv200-$(HD60-LIBS_VER).zip
-HD60-LIBS_SITE   = http://source.mynonpublic.com/gfutures
+HD60_LIBS_VER    = 20200622
+HD60_LIBS_DIR    = hiplay
+HD60_LIBS_SOURCE = gfutures-libs-3798mv200-$(HD60_LIBS_VER).zip
+HD60_LIBS_SITE   = http://source.mynonpublic.com/gfutures

-HD61-LIBS_VER    = 20200622
-HD61-LIBS_DIR    = hiplay
-HD61-LIBS_SOURCE = gfutures-libs-3798mv200-$(HD61-LIBS_VER).zip
-HD61-LIBS_SITE   = http://source.mynonpublic.com/gfutures
+HD61_LIBS_VER    = 20200622
+HD61_LIBS_DIR    = hiplay
+HD61_LIBS_SOURCE = gfutures-libs-3798mv200-$(HD61_LIBS_VER).zip
+HD61_LIBS_SITE   = http://source.mynonpublic.com/gfutures

 # -----------------------------------------------------------------------------

-BOXMODEL-LIBS_VER    = $($(call UPPERCASE,$(BOXMODEL))-LIBS_VER)
-BOXMODEL-LIBS_DIR    = $($(call UPPERCASE,$(BOXMODEL))-LIBS_DIR)
-BOXMODEL-LIBS_SOURCE = $($(call UPPERCASE,$(BOXMODEL))-LIBS_SOURCE)
-BOXMODEL-LIBS_SITE   = $($(call UPPERCASE,$(BOXMODEL))-LIBS_SITE)
+BOXMODEL_LIBS_VER    = $($(call UPPERCASE,$(BOXMODEL))_LIBS_VER)
+BOXMODEL_LIBS_DIR    = $($(call UPPERCASE,$(BOXMODEL))_LIBS_DIR)
+BOXMODEL_LIBS_SOURCE = $($(call UPPERCASE,$(BOXMODEL))_LIBS_SOURCE)
+BOXMODEL_LIBS_SITE   = $($(call UPPERCASE,$(BOXMODEL))_LIBS_SITE)

-ifneq ($(BOXMODEL-LIBS_SOURCE),$(EMPTY))
-$(DL_DIR)/$(BOXMODEL-LIBS_SOURCE):
-	$(DOWNLOAD) $(BOXMODEL-LIBS_SITE)/$(BOXMODEL-LIBS_SOURCE)
+ifneq ($(BOXMODEL_LIBS_SOURCE),$(empty))
+$(DL_DIR)/$(BOXMODEL_LIBS_SOURCE):
+	$(DOWNLOAD) $(BOXMODEL_LIBS_SITE)/$(BOXMODEL_LIBS_SOURCE)
 endif

 hd60-libs \
-hd61-libs: $(DL_DIR)/$(BOXMODEL-LIBS_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(BOXMODEL-LIBS_DIR)
-	unzip -o $(DL_DIR)/$(BOXMODEL-LIBS_SOURCE) -d $(BUILD_DIR)/$(BOXMODEL-LIBS_DIR)
+hd61-libs: $(DL_DIR)/$(BOXMODEL_LIBS_SOURCE) | $(TARGET_DIR)
+	$(REMOVE)/$(BOXMODEL_LIBS_DIR)
+	unzip -o $(DL_DIR)/$(BOXMODEL_LIBS_SOURCE) -d $(BUILD_DIR)/$(BOXMODEL_LIBS_DIR)
 	mkdir -p $(TARGET_libdir)/hisilicon
-	$(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBS_DIR)/hisilicon/* $(TARGET_libdir)/hisilicon
-	$(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBS_DIR)/ffmpeg/* $(TARGET_libdir)/hisilicon
+	$(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL_LIBS_DIR)/hisilicon/* $(TARGET_libdir)/hisilicon
+	$(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL_LIBS_DIR)/ffmpeg/* $(TARGET_libdir)/hisilicon
 	ln -sf /lib/ld-linux-armhf.so.3 $(TARGET_libdir)/hisilicon/ld-linux.so
-	$(REMOVE)/$(BOXMODEL-LIBS_DIR)
+	$(REMOVE)/$(BOXMODEL_LIBS_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

-VUSOLO4K-PLATFORM-UTIL_VER    = $(VUSOLO4K-DRIVERS_VER)
-VUSOLO4K-PLATFORM-UTIL_DIR    = platform-util-vusolo4k
-VUSOLO4K-PLATFORM-UTIL_SOURCE = platform-util-vusolo4k-17.1-$(VUSOLO4K-PLATFORM-UTIL_VER).r0.tar.gz
-VUSOLO4K-PLATFORM-UTIL_SITE   = http://code.vuplus.com/download/release/platform-util
-
-VUDUO4K-PLATFORM-UTIL_VER    = $(VUDUO4K-DRIVERS_VER)
-VUDUO4K-PLATFORM-UTIL_DIR    = platform-util-vuduo4k
-VUDUO4K-PLATFORM-UTIL_SOURCE = platform-util-vuduo4k-18.1-$(VUDUO4K-PLATFORM-UTIL_VER).r0.tar.gz
-VUDUO4K-PLATFORM-UTIL_SITE   = http://code.vuplus.com/download/release/platform-util
-
-VUDUO4KSE-PLATFORM-UTIL_VER    = $(VUDUO4KSE-DRIVERS_VER)
-VUDUO4KSE-PLATFORM-UTIL_DIR    = platform-util-vuduo4kse
-VUDUO4KSE-PLATFORM-UTIL_SOURCE = platform-util-vuduo4kse-17.1-$(VUDUO4KSE-PLATFORM-UTIL_VER).r0.tar.gz
-VUDUO4KSE-PLATFORM-UTIL_SITE   = http://code.vuplus.com/download/release/platform-util
-
-VUULTIMO4K-PLATFORM-UTIL_VER    = $(VUULTIMO4K-DRIVERS_VER)
-VUULTIMO4K-PLATFORM-UTIL_DIR    = platform-util-vuultimo4k
-VUULTIMO4K-PLATFORM-UTIL_SOURCE = platform-util-vuultimo4k-17.1-$(VUULTIMO4K-PLATFORM-UTIL_VER).r0.tar.gz
-VUULTIMO4K-PLATFORM-UTIL_SITE   = http://code.vuplus.com/download/release/platform-util
-
-VUZERO4K-PLATFORM-UTIL_VER    = $(VUZERO4K-DRIVERS_VER)
-VUZERO4K-PLATFORM-UTIL_DIR    = platform-util-vuzero4k
-VUZERO4K-PLATFORM-UTIL_SOURCE = platform-util-vuzero4k-17.1-$(VUZERO4K-PLATFORM-UTIL_VER).r0.tar.gz
-VUZERO4K-PLATFORM-UTIL_SITE   = http://code.vuplus.com/download/release/platform-util
-
-VUUNO4K-PLATFORM-UTIL_VER    = $(VUUNO4K-DRIVERS_VER)
-VUUNO4K-PLATFORM-UTIL_DIR    = platform-util-vuuno4k
-VUUNO4K-PLATFORM-UTIL_SOURCE = platform-util-vuuno4k-17.1-$(VUUNO4K-PLATFORM-UTIL_VER).r0.tar.gz
-VUUNO4K-PLATFORM-UTIL_SITE   = http://code.vuplus.com/download/release/platform-util
-
-VUUNO4KSE-PLATFORM-UTIL_VER    = $(VUUNO4KSE-DRIVERS_VER)
-VUUNO4KSE-PLATFORM-UTIL_DIR    = platform-util-vuuno4kse
-VUUNO4KSE-PLATFORM-UTIL_SOURCE = platform-util-vuuno4kse-17.1-$(VUUNO4KSE-PLATFORM-UTIL_VER).r0.tar.gz
-VUUNO4KSE-PLATFORM-UTIL_SITE   = http://code.vuplus.com/download/release/platform-util
+VUSOLO4K_PLATFORM_UTIL_VER    = $(VUSOLO4K_DRIVERS_VER)
+VUSOLO4K_PLATFORM_UTIL_DIR    = platform-util-vusolo4k
+VUSOLO4K_PLATFORM_UTIL_SOURCE = platform-util-vusolo4k-17.1-$(VUSOLO4K_PLATFORM_UTIL_VER).r0.tar.gz
+VUSOLO4K_PLATFORM_UTIL_SITE   = http://code.vuplus.com/download/release/platform-util
+
+VUDUO4K_PLATFORM_UTIL_VER    = $(VUDUO4K_DRIVERS_VER)
+VUDUO4K_PLATFORM_UTIL_DIR    = platform-util-vuduo4k
+VUDUO4K_PLATFORM_UTIL_SOURCE = platform-util-vuduo4k-18.1-$(VUDUO4K_PLATFORM_UTIL_VER).r0.tar.gz
+VUDUO4K_PLATFORM_UTIL_SITE   = http://code.vuplus.com/download/release/platform-util
+
+VUDUO4KSE_PLATFORM_UTIL_VER    = $(VUDUO4KSE_DRIVERS_VER)
+VUDUO4KSE_PLATFORM_UTIL_DIR    = platform-util-vuduo4kse
+VUDUO4KSE_PLATFORM_UTIL_SOURCE = platform-util-vuduo4kse-17.1-$(VUDUO4KSE_PLATFORM_UTIL_VER).r0.tar.gz
+VUDUO4KSE_PLATFORM_UTIL_SITE   = http://code.vuplus.com/download/release/platform-util
+
+VUULTIMO4K_PLATFORM_UTIL_VER    = $(VUULTIMO4K_DRIVERS_VER)
+VUULTIMO4K_PLATFORM_UTIL_DIR    = platform-util-vuultimo4k
+VUULTIMO4K_PLATFORM_UTIL_SOURCE = platform-util-vuultimo4k-17.1-$(VUULTIMO4K_PLATFORM_UTIL_VER).r0.tar.gz
+VUULTIMO4K_PLATFORM_UTIL_SITE   = http://code.vuplus.com/download/release/platform-util
+
+VUZERO4K_PLATFORM_UTIL_VER    = $(VUZERO4K_DRIVERS_VER)
+VUZERO4K_PLATFORM_UTIL_DIR    = platform-util-vuzero4k
+VUZERO4K_PLATFORM_UTIL_SOURCE = platform-util-vuzero4k-17.1-$(VUZERO4K_PLATFORM_UTIL_VER).r0.tar.gz
+VUZERO4K_PLATFORM_UTIL_SITE   = http://code.vuplus.com/download/release/platform-util
+
+VUUNO4K_PLATFORM_UTIL_VER    = $(VUUNO4K_DRIVERS_VER)
+VUUNO4K_PLATFORM_UTIL_DIR    = platform-util-vuuno4k
+VUUNO4K_PLATFORM_UTIL_SOURCE = platform-util-vuuno4k-17.1-$(VUUNO4K_PLATFORM_UTIL_VER).r0.tar.gz
+VUUNO4K_PLATFORM_UTIL_SITE   = http://code.vuplus.com/download/release/platform-util
+
+VUUNO4KSE_PLATFORM_UTIL_VER    = $(VUUNO4KSE_DRIVERS_VER)
+VUUNO4KSE_PLATFORM_UTIL_DIR    = platform-util-vuuno4kse
+VUUNO4KSE_PLATFORM_UTIL_SOURCE = platform-util-vuuno4kse-17.1-$(VUUNO4KSE_PLATFORM_UTIL_VER).r0.tar.gz
+VUUNO4KSE_PLATFORM_UTIL_SITE   = http://code.vuplus.com/download/release/platform-util

 # -----------------------------------------------------------------------------

-BOXMODEL-PLATFORM-UTIL_VER    = $($(call UPPERCASE,$(BOXMODEL))-PLATFORM-UTIL_VER)
-BOXMODEL-PLATFORM-UTIL_DIR    = $($(call UPPERCASE,$(BOXMODEL))-PLATFORM-UTIL_DIR)
-BOXMODEL-PLATFORM-UTIL_SOURCE = $($(call UPPERCASE,$(BOXMODEL))-PLATFORM-UTIL_SOURCE)
-BOXMODEL-PLATFORM-UTIL_SITE   = $($(call UPPERCASE,$(BOXMODEL))-PLATFORM-UTIL_SITE)
+BOXMODEL_PLATFORM_UTIL_VER    = $($(call UPPERCASE,$(BOXMODEL))_PLATFORM_UTIL_VER)
+BOXMODEL_PLATFORM_UTIL_DIR    = $($(call UPPERCASE,$(BOXMODEL))_PLATFORM_UTIL_DIR)
+BOXMODEL_PLATFORM_UTIL_SOURCE = $($(call UPPERCASE,$(BOXMODEL))_PLATFORM_UTIL_SOURCE)
+BOXMODEL_PLATFORM_UTIL_SITE   = $($(call UPPERCASE,$(BOXMODEL))_PLATFORM_UTIL_SITE)

-ifneq ($(BOXMODEL-PLATFORM-UTIL_SOURCE),$(EMPTY))
-$(DL_DIR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE):
-	$(DOWNLOAD) $(BOXMODEL-PLATFORM-UTIL_SITE)/$(BOXMODEL-PLATFORM-UTIL_SOURCE)
+ifneq ($(BOXMODEL_PLATFORM_UTIL_SOURCE),$(empty))
+$(DL_DIR)/$(BOXMODEL_PLATFORM_UTIL_SOURCE):
+	$(DOWNLOAD) $(BOXMODEL_PLATFORM_UTIL_SITE)/$(BOXMODEL_PLATFORM_UTIL_SOURCE)
 endif

-vuplus-platform-util: $(DL_DIR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_DIR)
-	$(UNTAR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE)
-	$(INSTALL_EXEC) -D $(BUILD_DIR)/$(BOXMODEL-PLATFORM-UTIL_DIR)/* $(TARGET_bindir)
+vuplus-platform-util: $(DL_DIR)/$(BOXMODEL_PLATFORM_UTIL_SOURCE) | $(TARGET_DIR)
+	$(REMOVE)/$(BOXMODEL_PLATFORM_UTIL_DIR)
+	$(UNTAR)/$(BOXMODEL_PLATFORM_UTIL_SOURCE)
+	$(INSTALL_EXEC) -D $(BUILD_DIR)/$(BOXMODEL_PLATFORM_UTIL_DIR)/* $(TARGET_bindir)
 	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/vuplus-platform-util.init $(TARGET_sysconfdir)/init.d/vuplus-platform-util
 ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vuduo4k))
 	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/bp3flash.sh $(TARGET_bindir)/bp3flash.sh
 endif
-	$(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_DIR)
+	$(REMOVE)/$(BOXMODEL_PLATFORM_UTIL_DIR)
 	$(TOUCH)
--- a/make/target-development.mk
+++ b/make/target-development.mk
@ -3,13 +3,6 @@
 #
 # -----------------------------------------------------------------------------

-VALGRIND_TARGET = $(if $(filter $(BOXMODEL),nevis),valgrind12305, valgrind3)
-
-valgrind: $(VALGRIND_TARGET)
-	$(TOUCH)
-
-# -----------------------------------------------------------------------------
-
 VALGRIND_VER    = 3.13.0
 VALGRIND_DIR    = valgrind-$(VALGRIND_VER)
 VALGRIND_SOURCE = valgrind-$(VALGRIND_VER).tar.bz2
@ -20,47 +13,23 @@ $(DL_DIR)/$(VALGRIND_SOURCE):

 VALGRIND_PATCH  = valgrind-fix-build-$(TARGET_CPU).patch

-valgrind3: $(DL_DIR)/$(VALGRIND_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(VALGRIND_DIR)
-	$(UNTAR)/$(VALGRIND_SOURCE)
-	$(CHDIR)/$(VALGRIND_DIR); \
-		$(call apply_patches,$(VALGRIND_PATCH)); \
-		export AR=$(TARGET_AR); \
-		autoreconf -fi; \
-		$(CONFIGURE) \
-			--prefix=$(prefix) \
-			--enable-only32bit \
-			--mandir=$(REMOVE_mandir) \
-			--datadir=$(REMOVE_datadir) \
-			; \
-		$(MAKE); \
-		make install DESTDIR=$(TARGET_DIR)
-	rm -f $(addprefix $(TARGET_libdir)/valgrind/,*.a *.xml)
-	rm -f $(addprefix $(TARGET_bindir)/,cg_* callgrind_* ms_print)
-	$(REMOVE)/$(VALGRIND_DIR)
-	$(TOUCH)
+VALGRIND_AUTORECONF = YES

-# -----------------------------------------------------------------------------
+VALGRIND_CONF_OPTS = \
+	--enable-only32bit \
+	--datadir=$(REMOVE_datadir)

-VALGRIND12305_PATCH  = valgrind12305-nevis-patch.diff
-VALGRIND12305_PATCH += valgrind12305-automake-1.11.2.patch
-
-valgrind12305: | $(TARGET_DIR)
-	$(REMOVE)/valgrind
-	svn co -r 12305 svn://svn.valgrind.org/valgrind/trunk $(BUILD_DIR)/valgrind; \
-	$(CHDIR)/valgrind; \
-		svn up --force -r {2011-12-13} VEX; \
-		$(call apply_patches,$(VALGRIND12305_PATCH)); \
-		autoreconf -fi; \
-		$(CONFIGURE) \
-			--prefix=$(prefix) \
-			--enable-only32bit \
-			--mandir=$(REMOVE_mandir) \
-			--datadir=$(REMOVE_datadir) \
-			; \
+valgrind: $(DL_DIR)/$(VALGRIND_SOURCE) | $(TARGET_DIR)
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
+		$(call apply_patches,$(PKG_PATCH)); \
+		$(CONFIGURE); \
 		$(MAKE); \
 		make install DESTDIR=$(TARGET_DIR)
-	$(REMOVE)/valgrind
+	-rm $(addprefix $(TARGET_libdir)/valgrind/,*.a *.xml)
+	-rm $(addprefix $(TARGET_bindir)/,cg_* callgrind_* ms_print)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -77,14 +46,10 @@ strace: $(DL_DIR)/$(STRACE_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(STRACE_DIR)
 	$(UNTAR)/$(STRACE_SOURCE)
 	$(CHDIR)/$(STRACE_DIR); \
-		$(CONFIGURE) \
-			--prefix=$(prefix) \
-			--mandir=$(REMOVE_mandir) \
-			--enable-silent-rules \
-			; \
+		$(CONFIGURE); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	rm -f $(addprefix $(TARGET_bindir)/,strace-graph strace-log-merge)
+	-rm $(addprefix $(TARGET_bindir)/,strace-graph strace-log-merge)
 	$(REMOVE)/$(STRACE_DIR)
 	$(TOUCH)

@ -98,32 +63,31 @@ GDB_SITE   = https://sourceware.org/pub/gdb/releases
 $(DL_DIR)/$(GDB_SOURCE):
 	$(DOWNLOAD) $(GDB_SITE)/$(GDB_SOURCE)

-GDB_DEPS   = zlib ncurses
+GDB_DEPS = zlib ncurses
+
+GDB_CONF_OPTS = \
+	--infodir=$(REMOVE_infodir) \
+	--disable-binutils \
+	--disable-gdbserver \
+	--disable-gdbtk \
+	--disable-sim \
+	--disable-tui \
+	--disable-werror \
+	--with-curses \
+	--with-zlib \
+	--without-mpfr \
+	--without-uiout \
+	--without-x \
+	--enable-static

 gdb: $(GDB_DEPS) $(DL_DIR)/$(GDB_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(GDB_DIR)
 	$(UNTAR)/$(GDB_SOURCE)
 	$(CHDIR)/$(GDB_DIR); \
-		$(CONFIGURE) \
-			--prefix=$(prefix) \
-			--mandir=$(REMOVE_mandir) \
-			--infodir=$(REMOVE_infodir) \
-			--disable-binutils \
-			--disable-gdbserver \
-			--disable-gdbtk \
-			--disable-sim \
-			--disable-tui \
-			--disable-werror \
-			--with-curses \
-			--with-zlib \
-			--without-mpfr \
-			--without-uiout \
-			--without-x \
-			--enable-static \
-			; \
+		$(CONFIGURE); \
 		$(MAKE) all-gdb; \
 		$(MAKE) install-gdb DESTDIR=$(TARGET_DIR)
-	rm -rf $(addprefix $(TARGET_datadir)/,system-gdbinit)
+	-rm $(addprefix $(TARGET_datadir)/,system-gdbinit)
 	find $(TARGET_datadir)/gdb/syscalls -type f -not -name 'arm-linux.xml' -not -name 'gdb-syscalls.dtd' -print0 | xargs -0 rm --
 	$(REMOVE)/$(GDB_DIR)
 	$(TOUCH)
--- a/make/target-ffmpeg-coolstream.mk
+++ b/make/target-ffmpeg-coolstream.mk
@ -4,187 +4,175 @@
 # -----------------------------------------------------------------------------

 FFMPEG_BRANCH ?= ni/ffmpeg/2.8
+#FFMPEG_BRANCH ?= ni/ffmpeg/master
 #FFMPEG_BRANCH ?= ffmpeg/master

-FFMPEG_DEPS = openssl rtmpdump libbluray libass
+FFMPEG_CONF_OPTS = \
+	--prefix=$(prefix) \
+	--cross-prefix=$(TARGET_CROSS) \
+	--datadir=$(REMOVE_datadir) \
+	\
+	--disable-doc \
+	--disable-htmlpages \
+	--disable-manpages \
+	--disable-podpages \
+	--disable-txtpages \
+	\
+	--disable-ffmpeg \
+	--disable-ffplay \
+	--disable-ffprobe \
+	--disable-ffserver \
+	\
+	--disable-altivec \
+	--disable-mmx \
+	--disable-neon \
+	--disable-swscale \
+	\
+	--disable-parsers \
+		--enable-parser=aac \
+		--enable-parser=aac_latm \
+		--enable-parser=ac3 \
+		--enable-parser=dca \
+		--enable-parser=dvbsub \
+		--enable-parser=dvdsub \
+		--enable-parser=flac \
+		--enable-parser=h264 \
+		--enable-parser=mjpeg \
+		--enable-parser=mpeg4video \
+		--enable-parser=mpegaudio \
+		--enable-parser=mpegvideo \
+		--enable-parser=vc1 \
+		--enable-parser=vorbis \
+	\
+	--disable-decoders \
+		--enable-decoder=aac \
+		--enable-decoder=aac_latm \
+		--enable-decoder=ass \
+		--enable-decoder=adpcm_ms \
+		--enable-decoder=dca \
+		--enable-decoder=dvbsub \
+		--enable-decoder=dvdsub \
+		--enable-decoder=flac \
+		--enable-decoder=flv \
+		--enable-decoder=gif \
+		--enable-decoder=mjpeg \
+		--enable-decoder=movtext \
+		--enable-decoder=mp3 \
+		--enable-decoder=mp3adu \
+		--enable-decoder=mp3adufloat \
+		--enable-decoder=mp3float \
+		--enable-decoder=mp3on4 \
+		--enable-decoder=mp3on4float \
+		--enable-decoder=pcm_s16le \
+		--enable-decoder=pcm_s16le_planar \
+		--enable-decoder=pgssub \
+		--enable-decoder=srt \
+		--enable-decoder=ssa \
+		--enable-decoder=subrip \
+		--enable-decoder=subviewer \
+		--enable-decoder=subviewer1 \
+		--enable-decoder=text \
+		--enable-decoder=vorbis \
+		--enable-decoder=xsub \
+	\
+	--disable-encoders \
+	\
+	--disable-demuxers \
+		--enable-demuxer=aac \
+		--enable-demuxer=ac3 \
+		--enable-demuxer=ass \
+		--enable-demuxer=avi \
+		--enable-demuxer=dts \
+		--enable-demuxer=flac \
+		--enable-demuxer=flv \
+		--enable-demuxer=gif \
+		--enable-demuxer=hds \
+		--enable-demuxer=hls \
+		--enable-demuxer=live_flv \
+		--enable-demuxer=m4v \
+		--enable-demuxer=matroska \
+		--enable-demuxer=mjpeg \
+		--enable-demuxer=mov \
+		--enable-demuxer=mp3 \
+		--enable-demuxer=mpegps \
+		--enable-demuxer=mpegts \
+		--enable-demuxer=mpegtsraw \
+		--enable-demuxer=mpegvideo \
+		--enable-demuxer=mpjpeg \
+		--enable-demuxer=ogg \
+		--enable-demuxer=pcm_s16be \
+		--enable-demuxer=pcm_s16le \
+		--enable-demuxer=rm \
+		--enable-demuxer=rtp \
+		--enable-demuxer=rtsp \
+		--enable-demuxer=srt \
+		--enable-demuxer=vc1 \
+		--enable-demuxer=wav \
+	\
+	--disable-muxers \
+		--enable-muxer=mpegts \
+	\
+	--disable-filters \
+	\
+	--disable-devices \
+	\
+	--disable-extra-warnings \
+	--disable-postproc \
+	\
+	--enable-bsfs \
+	--enable-libass \
+	--enable-libbluray \
+	--enable-librtmp \
+	--enable-network \
+	--enable-nonfree \
+	--enable-openssl \
+	--enable-swresample \
+	\
+	--disable-debug \
+	--enable-cross-compile \
+	--enable-stripping \
+	--disable-static \
+	--enable-shared \
+	\
+	--target-os=linux \
+	--arch=$(TARGET_ARCH) \
+	--extra-ldflags="$(TARGET_LDFLAGS)"

-# -----------------------------------------------------------------------------
+FFMPEG_DEPS = openssl rtmpdump libbluray libass

 ifeq ($(FFMPEG_BRANCH),ni/ffmpeg/2.8)
  FFMPEG_DEPS += libroxml
-  FFMPEG_CONFIGURE_BRANCH =
 else
  FFMPEG_DEPS +=  libxml2
-  FFMPEG_CONFIGURE_BRANCH = \
-			--enable-demuxer=dash \
-			--enable-libxml2
+  FFMPEG_CONF_OPTS += \
+	--enable-demuxer=dash \
+	--enable-libxml2
 endif

-# -----------------------------------------------------------------------------
-
-FFMPEG_CONFIGURE_GENERIC = \
-			--prefix=$(prefix) \
-			--cross-prefix=$(TARGET_CROSS) \
-			--datadir=$(REMOVE_datadir) \
-			\
-			--disable-doc \
-			--disable-htmlpages \
-			--disable-manpages \
-			--disable-podpages \
-			--disable-txtpages \
-			\
-			--disable-ffmpeg \
-			--disable-ffplay \
-			--disable-ffprobe \
-			--disable-ffserver \
-			\
-			--disable-altivec \
-			--disable-mmx \
-			--disable-neon \
-			--disable-swscale \
-			\
-			--disable-parsers \
-				--enable-parser=aac \
-				--enable-parser=aac_latm \
-				--enable-parser=ac3 \
-				--enable-parser=dca \
-				--enable-parser=dvbsub \
-				--enable-parser=dvdsub \
-				--enable-parser=flac \
-				--enable-parser=h264 \
-				--enable-parser=mjpeg \
-				--enable-parser=mpeg4video \
-				--enable-parser=mpegaudio \
-				--enable-parser=mpegvideo \
-				--enable-parser=vc1 \
-				--enable-parser=vorbis \
-			\
-			--disable-decoders \
-				--enable-decoder=aac \
-				--enable-decoder=aac_latm \
-				--enable-decoder=ass \
-				--enable-decoder=adpcm_ms \
-				--enable-decoder=dca \
-				--enable-decoder=dvbsub \
-				--enable-decoder=dvdsub \
-				--enable-decoder=flac \
-				--enable-decoder=flv \
-				--enable-decoder=gif \
-				--enable-decoder=mjpeg \
-				--enable-decoder=movtext \
-				--enable-decoder=mp3 \
-				--enable-decoder=mp3adu \
-				--enable-decoder=mp3adufloat \
-				--enable-decoder=mp3float \
-				--enable-decoder=mp3on4 \
-				--enable-decoder=mp3on4float \
-				--enable-decoder=pcm_s16le \
-				--enable-decoder=pcm_s16le_planar \
-				--enable-decoder=pgssub \
-				--enable-decoder=srt \
-				--enable-decoder=ssa \
-				--enable-decoder=subrip \
-				--enable-decoder=subviewer \
-				--enable-decoder=subviewer1 \
-				--enable-decoder=text \
-				--enable-decoder=vorbis \
-				--enable-decoder=xsub \
-			\
-			--disable-encoders \
-			\
-			--disable-demuxers \
-				--enable-demuxer=aac \
-				--enable-demuxer=ac3 \
-				--enable-demuxer=ass \
-				--enable-demuxer=avi \
-				--enable-demuxer=dts \
-				--enable-demuxer=flac \
-				--enable-demuxer=flv \
-				--enable-demuxer=gif \
-				--enable-demuxer=hds \
-				--enable-demuxer=hls \
-				--enable-demuxer=live_flv \
-				--enable-demuxer=m4v \
-				--enable-demuxer=matroska \
-				--enable-demuxer=mjpeg \
-				--enable-demuxer=mov \
-				--enable-demuxer=mp3 \
-				--enable-demuxer=mpegps \
-				--enable-demuxer=mpegts \
-				--enable-demuxer=mpegtsraw \
-				--enable-demuxer=mpegvideo \
-				--enable-demuxer=mpjpeg \
-				--enable-demuxer=ogg \
-				--enable-demuxer=pcm_s16be \
-				--enable-demuxer=pcm_s16le \
-				--enable-demuxer=rm \
-				--enable-demuxer=rtp \
-				--enable-demuxer=rtsp \
-				--enable-demuxer=srt \
-				--enable-demuxer=vc1 \
-				--enable-demuxer=wav \
-			\
-			--disable-muxers \
-				--enable-muxer=mpegts \
-			\
-			--disable-filters \
-			\
-			--disable-devices \
-			\
-			--disable-extra-warnings \
-			--disable-postproc \
-			\
-			--enable-bsfs \
-			--enable-libass \
-			--enable-libbluray \
-			--enable-librtmp \
-			--enable-network \
-			--enable-nonfree \
-			--enable-openssl \
-			--enable-swresample \
-			\
-			--disable-debug \
-			--enable-cross-compile \
-			--enable-stripping \
-			--disable-static \
-			--enable-shared \
-			\
-			--target-os=linux \
-			--arch=$(TARGET_ARCH) \
-			--extra-ldflags="$(TARGET_LDFLAGS)"
-
-# -----------------------------------------------------------------------------
-
 ifeq ($(BOXSERIES),hd1)
-  FFMPEG_CONFIGURE_PLATFORM = \
-			--enable-small \
-			--cpu=armv6 \
-			--extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir)"
+  FFMPEG_CONF_OPTS += \
+	--enable-small \
+	--cpu=armv6 \
+	--extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir)"
 endif

 ifeq ($(BOXSERIES),hd2)
-  FFMPEG_CONFIGURE_PLATFORM = \
-			--enable-decoder=h264 \
-			--enable-decoder=vc1 \
-			--enable-hardcoded-tables \
-			--cpu=cortex-a9 \
-			--extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir) -mfpu=vfpv3-d16 -mfloat-abi=hard"
+  FFMPEG_CONF_OPTS += \
+	--enable-decoder=h264 \
+	--enable-decoder=vc1 \
+	--enable-hardcoded-tables \
+	--cpu=cortex-a9 \
+	--extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir) -mfpu=vfpv3-d16 -mfloat-abi=hard"
 endif

-# -----------------------------------------------------------------------------
-
 ffmpeg: $(FFMPEG_DEPS) | $(TARGET_DIR)
-	$(REMOVE)/$(NI-FFMPEG)
-	$(CD) $(SOURCE_DIR)/$(NI-FFMPEG); \
+	$(REMOVE)/$(NI_FFMPEG)
+	$(CD) $(SOURCE_DIR)/$(NI_FFMPEG); \
 		git checkout $(FFMPEG_BRANCH)
-	tar -C $(SOURCE_DIR) -cp $(NI-FFMPEG) --exclude-vcs | tar -C $(BUILD_DIR) -x
-	$(CHDIR)/$(NI-FFMPEG); \
-		./configure \
-			$(FFMPEG_CONFIGURE_GENERIC) \
-			$(FFMPEG_CONFIGURE_PLATFORM) \
-			$(FFMPEG_CONFIGURE_BRANCH) \
-			; \
+	tar -C $(SOURCE_DIR) -cp $(NI_FFMPEG) --exclude-vcs | tar -C $(BUILD_DIR) -x
+	$(CHDIR)/$(NI_FFMPEG); \
+		./configure $($(PKG)_CONF_OPTS); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REMOVE)/$(NI-FFMPEG)
+	$(REMOVE)/$(NI_FFMPEG)
 	$(TOUCH)
--- a/make/target-ffmpeg.mk
+++ b/make/target-ffmpeg.mk
@ -13,348 +13,337 @@ $(DL_DIR)/$(FFMPEG_SOURCE):

 FFMPEG_UNPATCHED := no

-# -----------------------------------------------------------------------------
-
-FFMPEG_DEPS = openssl freetype rtmpdump libbluray libass libxml2 alsa-lib
-
-# -----------------------------------------------------------------------------
-
-FFMPEG_CONFIGURE_GENERIC = \
-			--prefix=$(prefix) \
-			--cross-prefix=$(TARGET_CROSS) \
-			--datadir=$(REMOVE_datadir) \
-			\
-			--disable-doc \
-			--disable-htmlpages \
-			--disable-manpages \
-			--disable-podpages \
-			--disable-txtpages \
-			\
-			--disable-ffplay \
-			--enable-ffprobe \
-			\
-			--disable-altivec \
-			--disable-amd3dnow \
-			--disable-amd3dnowext \
-			--disable-armv5te \
-			--disable-armv6 \
-			--disable-armv6t2 \
-			--disable-avx \
-			--disable-avx2 \
-			--disable-fast-unaligned \
-			--disable-fma3 \
-			--disable-fma4 \
-			--disable-inline-asm \
-			--disable-mips32r2 \
-			--disable-mipsdsp \
-			--disable-mipsdspr2 \
-			--disable-mmx \
-			--disable-mmxext \
-			--disable-sse \
-			--disable-sse2 \
-			--disable-sse3 \
-			--disable-sse4 \
-			--disable-sse42 \
-			--disable-ssse3 \
-			--disable-vfp \
-			--disable-xop \
-			--disable-x86asm \
-			\
-			--disable-dxva2 \
-			--disable-vaapi \
-			--disable-vdpau \
-			\
-			--disable-parsers \
-				--enable-parser=aac \
-				--enable-parser=aac_latm \
-				--enable-parser=ac3 \
-				--enable-parser=dca \
-				--enable-parser=dvbsub \
-				--enable-parser=dvd_nav \
-				--enable-parser=dvdsub \
-				--enable-parser=flac \
-				--enable-parser=h264 \
-				--enable-parser=hevc \
-				--enable-parser=mjpeg \
-				--enable-parser=mpeg4video \
-				--enable-parser=mpegaudio \
-				--enable-parser=mpegvideo \
-				--enable-parser=png \
-				--enable-parser=vc1 \
-				--enable-parser=vorbis \
-				--enable-parser=vp8 \
-				--enable-parser=vp9 \
-			\
-			--disable-decoders \
-				--enable-decoder=aac \
-				--enable-decoder=aac_latm \
-				--enable-decoder=adpcm_ct \
-				--enable-decoder=adpcm_g722 \
-				--enable-decoder=adpcm_g726 \
-				--enable-decoder=adpcm_g726le \
-				--enable-decoder=adpcm_ima_amv \
-				--enable-decoder=adpcm_ima_oki \
-				--enable-decoder=adpcm_ima_qt \
-				--enable-decoder=adpcm_ima_rad \
-				--enable-decoder=adpcm_ima_wav \
-				--enable-decoder=adpcm_ms \
-				--enable-decoder=adpcm_sbpro_2 \
-				--enable-decoder=adpcm_sbpro_3 \
-				--enable-decoder=adpcm_sbpro_4 \
-				--enable-decoder=adpcm_swf \
-				--enable-decoder=adpcm_yamaha \
-				--enable-decoder=alac \
-				--enable-decoder=ape \
-				--enable-decoder=ass \
-				--enable-decoder=atrac1 \
-				--enable-decoder=atrac3 \
-				--enable-decoder=atrac3p \
-				--enable-decoder=cook \
-				--enable-decoder=dca \
-				--enable-decoder=dsd_lsbf \
-				--enable-decoder=dsd_lsbf_planar \
-				--enable-decoder=dsd_msbf \
-				--enable-decoder=dsd_msbf_planar \
-				--enable-decoder=dvbsub \
-				--enable-decoder=dvdsub \
-				--enable-decoder=eac3 \
-				--enable-decoder=evrc \
-				--enable-decoder=flac \
-				--enable-decoder=flv \
-				--enable-decoder=g723_1 \
-				--enable-decoder=g729 \
-				--enable-decoder=gif \
-				--enable-decoder=h261 \
-				--enable-decoder=h263 \
-				--enable-decoder=h263i \
-				--enable-decoder=h264 \
-				--enable-decoder=hevc \
-				--enable-decoder=iac \
-				--enable-decoder=imc \
-				--enable-decoder=jpeg2000 \
-				--enable-decoder=jpegls \
-				--enable-decoder=mace3 \
-				--enable-decoder=mace6 \
-				--enable-decoder=metasound \
-				--enable-decoder=mjpeg \
-				--enable-decoder=mlp \
-				--enable-decoder=movtext \
-				--enable-decoder=mp1 \
-				--enable-decoder=mp3 \
-				--enable-decoder=mp3adu \
-				--enable-decoder=mp3adufloat \
-				--enable-decoder=mp3float \
-				--enable-decoder=mp3on4 \
-				--enable-decoder=mp3on4float \
-				--enable-decoder=mpeg1video \
-				--enable-decoder=mpeg2video \
-				--enable-decoder=mpeg4 \
-				--enable-decoder=nellymoser \
-				--enable-decoder=opus \
-				--enable-decoder=pcm_alaw \
-				--enable-decoder=pcm_bluray \
-				--enable-decoder=pcm_dvd \
-				--enable-decoder=pcm_f32be \
-				--enable-decoder=pcm_f32le \
-				--enable-decoder=pcm_f64be \
-				--enable-decoder=pcm_f64le \
-				--enable-decoder=pcm_lxf \
-				--enable-decoder=pcm_mulaw \
-				--enable-decoder=pcm_s16be \
-				--enable-decoder=pcm_s16be_planar \
-				--enable-decoder=pcm_s16le \
-				--enable-decoder=pcm_s16le_planar \
-				--enable-decoder=pcm_s24be \
-				--enable-decoder=pcm_s24daud \
-				--enable-decoder=pcm_s24le \
-				--enable-decoder=pcm_s24le_planar \
-				--enable-decoder=pcm_s32be \
-				--enable-decoder=pcm_s32le \
-				--enable-decoder=pcm_s32le_planar \
-				--enable-decoder=pcm_s8 \
-				--enable-decoder=pcm_s8_planar \
-				--enable-decoder=pcm_u16be \
-				--enable-decoder=pcm_u16le \
-				--enable-decoder=pcm_u24be \
-				--enable-decoder=pcm_u24le \
-				--enable-decoder=pcm_u32be \
-				--enable-decoder=pcm_u32le \
-				--enable-decoder=pcm_u8 \
-				--enable-decoder=pcm_zork \
-				--enable-decoder=pgssub \
-				--enable-decoder=png \
-				--enable-decoder=qcelp \
-				--enable-decoder=qdm2 \
-				--enable-decoder=ra_144 \
-				--enable-decoder=ra_288 \
-				--enable-decoder=ralf \
-				--enable-decoder=s302m \
-				--enable-decoder=shorten \
-				--enable-decoder=sipr \
-				--enable-decoder=sonic \
-				--enable-decoder=srt \
-				--enable-decoder=ssa \
-				--enable-decoder=subrip \
-				--enable-decoder=subviewer \
-				--enable-decoder=subviewer1 \
-				--enable-decoder=tak \
-				--enable-decoder=text \
-				--enable-decoder=truehd \
-				--enable-decoder=truespeech \
-				--enable-decoder=tta \
-				--enable-decoder=vorbis \
-				--enable-decoder=wavpack \
-				--enable-decoder=wmalossless \
-				--enable-decoder=wmapro \
-				--enable-decoder=wmav1 \
-				--enable-decoder=wmav2 \
-				--enable-decoder=wmavoice \
-				--enable-decoder=xsub \
-			\
-			--disable-encoders \
-				--enable-encoder=aac \
-				--enable-encoder=h261 \
-				--enable-encoder=h263 \
-				--enable-encoder=h263p \
-				--enable-encoder=jpeg2000 \
-				--enable-encoder=jpegls \
-				--enable-encoder=ljpeg \
-				--enable-encoder=mjpeg \
-				--enable-encoder=mpeg1video \
-				--enable-encoder=mpeg2video \
-				--enable-encoder=mpeg4 \
-				--enable-encoder=png \
-				--enable-encoder=rawvideo \
-			\
-			--disable-demuxers \
-				--enable-demuxer=aac \
-				--enable-demuxer=ac3 \
-				--enable-demuxer=apng \
-				--enable-demuxer=ass \
-				--enable-demuxer=avi \
-				--enable-demuxer=dash \
-				--enable-demuxer=dts \
-				--enable-demuxer=ffmetadata \
-				--enable-demuxer=flac \
-				--enable-demuxer=flv \
-				--enable-demuxer=gif \
-				--enable-demuxer=h264 \
-				--enable-demuxer=hls \
-				--enable-demuxer=live_flv \
-				--enable-demuxer=image_bmp_pipe \
-				--enable-demuxer=image_jpeg_pipe \
-				--enable-demuxer=image_jpegls_pipe \
-				--enable-demuxer=image_png_pipe \
-				--enable-demuxer=image2 \
-				--enable-demuxer=image2pipe \
-				--enable-demuxer=m4v \
-				--enable-demuxer=matroska \
-				--enable-demuxer=mjpeg \
-				--enable-demuxer=mov \
-				--enable-demuxer=mp3 \
-				--enable-demuxer=mpegps \
-				--enable-demuxer=mpegts \
-				--enable-demuxer=mpegtsraw \
-				--enable-demuxer=mpegvideo \
-				--enable-demuxer=mpjpeg \
-				--enable-demuxer=ogg \
-				--enable-demuxer=pcm_s16be \
-				--enable-demuxer=pcm_s16le \
-				--enable-demuxer=rawvideo \
-				--enable-demuxer=realtext \
-				--enable-demuxer=rm \
-				--enable-demuxer=rtp \
-				--enable-demuxer=rtsp \
-				--enable-demuxer=srt \
-				--enable-demuxer=vc1 \
-				--enable-demuxer=wav \
-				--enable-demuxer=webm_dash_manifest \
-			\
-			--disable-muxers \
-				--enable-muxer=apng \
-				--enable-muxer=flac \
-				--enable-muxer=h261 \
-				--enable-muxer=h263 \
-				--enable-muxer=h264 \
-				--enable-muxer=hevc \
-				--enable-muxer=image2 \
-				--enable-muxer=image2pipe \
-				--enable-muxer=m4v \
-				--enable-muxer=matroska \
-				--enable-muxer=mjpeg \
-				--enable-muxer=mp3 \
-				--enable-muxer=mp4 \
-				--enable-muxer=mpeg1video \
-				--enable-muxer=mpeg2video \
-				--enable-muxer=mpegts \
-				--enable-muxer=ogg \
-			\
-			--disable-filters \
-				--enable-filter=drawtext \
-				--enable-filter=scale \
-			\
-			--disable-extra-warnings \
-			--disable-postproc \
-			\
-			--enable-bsfs \
-			--enable-libass \
-			--enable-libbluray \
-			--enable-libfreetype \
-			--enable-librtmp \
-			--enable-network \
-			--enable-nonfree \
-			--enable-openssl \
-			--enable-zlib \
-			\
-			--disable-xlib \
-			--disable-libxcb \
-			--disable-libxcb-shm \
-			--disable-libxcb-xfixes \
-			--disable-libxcb-shape \
-			\
-			--disable-debug \
-			--enable-cross-compile \
-			--enable-stripping \
-			--disable-static \
-			--enable-shared \
-			--disable-runtime-cpudetect \
-			--enable-pic \
-			--enable-pthreads \
-			--enable-swresample \
-			--enable-hardcoded-tables \
-			\
-			--target-os=linux \
-			--arch=$(TARGET_ARCH) \
-			--extra-ldflags="$(TARGET_LDFLAGS)"
-
-# -----------------------------------------------------------------------------
+FFMPEG_CONF_OPTS = \
+	--prefix=$(prefix) \
+	--cross-prefix=$(TARGET_CROSS) \
+	--datadir=$(REMOVE_datadir) \
+	\
+	--disable-doc \
+	--disable-htmlpages \
+	--disable-manpages \
+	--disable-podpages \
+	--disable-txtpages \
+	\
+	--disable-ffplay \
+	--enable-ffprobe \
+	\
+	--disable-altivec \
+	--disable-amd3dnow \
+	--disable-amd3dnowext \
+	--disable-armv5te \
+	--disable-armv6 \
+	--disable-armv6t2 \
+	--disable-avx \
+	--disable-avx2 \
+	--disable-fast-unaligned \
+	--disable-fma3 \
+	--disable-fma4 \
+	--disable-inline-asm \
+	--disable-mips32r2 \
+	--disable-mipsdsp \
+	--disable-mipsdspr2 \
+	--disable-mmx \
+	--disable-mmxext \
+	--disable-sse \
+	--disable-sse2 \
+	--disable-sse3 \
+	--disable-sse4 \
+	--disable-sse42 \
+	--disable-ssse3 \
+	--disable-vfp \
+	--disable-xop \
+	--disable-x86asm \
+	\
+	--disable-dxva2 \
+	--disable-vaapi \
+	--disable-vdpau \
+	\
+	--disable-parsers \
+		--enable-parser=aac \
+		--enable-parser=aac_latm \
+		--enable-parser=ac3 \
+		--enable-parser=dca \
+		--enable-parser=dvbsub \
+		--enable-parser=dvd_nav \
+		--enable-parser=dvdsub \
+		--enable-parser=flac \
+		--enable-parser=h264 \
+		--enable-parser=hevc \
+		--enable-parser=mjpeg \
+		--enable-parser=mpeg4video \
+		--enable-parser=mpegaudio \
+		--enable-parser=mpegvideo \
+		--enable-parser=png \
+		--enable-parser=vc1 \
+		--enable-parser=vorbis \
+		--enable-parser=vp8 \
+		--enable-parser=vp9 \
+	\
+	--disable-decoders \
+		--enable-decoder=aac \
+		--enable-decoder=aac_latm \
+		--enable-decoder=adpcm_ct \
+		--enable-decoder=adpcm_g722 \
+		--enable-decoder=adpcm_g726 \
+		--enable-decoder=adpcm_g726le \
+		--enable-decoder=adpcm_ima_amv \
+		--enable-decoder=adpcm_ima_oki \
+		--enable-decoder=adpcm_ima_qt \
+		--enable-decoder=adpcm_ima_rad \
+		--enable-decoder=adpcm_ima_wav \
+		--enable-decoder=adpcm_ms \
+		--enable-decoder=adpcm_sbpro_2 \
+		--enable-decoder=adpcm_sbpro_3 \
+		--enable-decoder=adpcm_sbpro_4 \
+		--enable-decoder=adpcm_swf \
+		--enable-decoder=adpcm_yamaha \
+		--enable-decoder=alac \
+		--enable-decoder=ape \
+		--enable-decoder=ass \
+		--enable-decoder=atrac1 \
+		--enable-decoder=atrac3 \
+		--enable-decoder=atrac3p \
+		--enable-decoder=cook \
+		--enable-decoder=dca \
+		--enable-decoder=dsd_lsbf \
+		--enable-decoder=dsd_lsbf_planar \
+		--enable-decoder=dsd_msbf \
+		--enable-decoder=dsd_msbf_planar \
+		--enable-decoder=dvbsub \
+		--enable-decoder=dvdsub \
+		--enable-decoder=eac3 \
+		--enable-decoder=evrc \
+		--enable-decoder=flac \
+		--enable-decoder=flv \
+		--enable-decoder=g723_1 \
+		--enable-decoder=g729 \
+		--enable-decoder=gif \
+		--enable-decoder=h261 \
+		--enable-decoder=h263 \
+		--enable-decoder=h263i \
+		--enable-decoder=h264 \
+		--enable-decoder=hevc \
+		--enable-decoder=iac \
+		--enable-decoder=imc \
+		--enable-decoder=jpeg2000 \
+		--enable-decoder=jpegls \
+		--enable-decoder=mace3 \
+		--enable-decoder=mace6 \
+		--enable-decoder=metasound \
+		--enable-decoder=mjpeg \
+		--enable-decoder=mlp \
+		--enable-decoder=movtext \
+		--enable-decoder=mp1 \
+		--enable-decoder=mp3 \
+		--enable-decoder=mp3adu \
+		--enable-decoder=mp3adufloat \
+		--enable-decoder=mp3float \
+		--enable-decoder=mp3on4 \
+		--enable-decoder=mp3on4float \
+		--enable-decoder=mpeg1video \
+		--enable-decoder=mpeg2video \
+		--enable-decoder=mpeg4 \
+		--enable-decoder=nellymoser \
+		--enable-decoder=opus \
+		--enable-decoder=pcm_alaw \
+		--enable-decoder=pcm_bluray \
+		--enable-decoder=pcm_dvd \
+		--enable-decoder=pcm_f32be \
+		--enable-decoder=pcm_f32le \
+		--enable-decoder=pcm_f64be \
+		--enable-decoder=pcm_f64le \
+		--enable-decoder=pcm_lxf \
+		--enable-decoder=pcm_mulaw \
+		--enable-decoder=pcm_s16be \
+		--enable-decoder=pcm_s16be_planar \
+		--enable-decoder=pcm_s16le \
+		--enable-decoder=pcm_s16le_planar \
+		--enable-decoder=pcm_s24be \
+		--enable-decoder=pcm_s24daud \
+		--enable-decoder=pcm_s24le \
+		--enable-decoder=pcm_s24le_planar \
+		--enable-decoder=pcm_s32be \
+		--enable-decoder=pcm_s32le \
+		--enable-decoder=pcm_s32le_planar \
+		--enable-decoder=pcm_s8 \
+		--enable-decoder=pcm_s8_planar \
+		--enable-decoder=pcm_u16be \
+		--enable-decoder=pcm_u16le \
+		--enable-decoder=pcm_u24be \
+		--enable-decoder=pcm_u24le \
+		--enable-decoder=pcm_u32be \
+		--enable-decoder=pcm_u32le \
+		--enable-decoder=pcm_u8 \
+		--enable-decoder=pcm_zork \
+		--enable-decoder=pgssub \
+		--enable-decoder=png \
+		--enable-decoder=qcelp \
+		--enable-decoder=qdm2 \
+		--enable-decoder=ra_144 \
+		--enable-decoder=ra_288 \
+		--enable-decoder=ralf \
+		--enable-decoder=s302m \
+		--enable-decoder=shorten \
+		--enable-decoder=sipr \
+		--enable-decoder=sonic \
+		--enable-decoder=srt \
+		--enable-decoder=ssa \
+		--enable-decoder=subrip \
+		--enable-decoder=subviewer \
+		--enable-decoder=subviewer1 \
+		--enable-decoder=tak \
+		--enable-decoder=text \
+		--enable-decoder=truehd \
+		--enable-decoder=truespeech \
+		--enable-decoder=tta \
+		--enable-decoder=vorbis \
+		--enable-decoder=wavpack \
+		--enable-decoder=wmalossless \
+		--enable-decoder=wmapro \
+		--enable-decoder=wmav1 \
+		--enable-decoder=wmav2 \
+		--enable-decoder=wmavoice \
+		--enable-decoder=xsub \
+	\
+	--disable-encoders \
+		--enable-encoder=aac \
+		--enable-encoder=h261 \
+		--enable-encoder=h263 \
+		--enable-encoder=h263p \
+		--enable-encoder=jpeg2000 \
+		--enable-encoder=jpegls \
+		--enable-encoder=ljpeg \
+		--enable-encoder=mjpeg \
+		--enable-encoder=mpeg1video \
+		--enable-encoder=mpeg2video \
+		--enable-encoder=mpeg4 \
+		--enable-encoder=png \
+		--enable-encoder=rawvideo \
+	\
+	--disable-demuxers \
+		--enable-demuxer=aac \
+		--enable-demuxer=ac3 \
+		--enable-demuxer=apng \
+		--enable-demuxer=ass \
+		--enable-demuxer=avi \
+		--enable-demuxer=dash \
+		--enable-demuxer=dts \
+		--enable-demuxer=ffmetadata \
+		--enable-demuxer=flac \
+		--enable-demuxer=flv \
+		--enable-demuxer=gif \
+		--enable-demuxer=h264 \
+		--enable-demuxer=hls \
+		--enable-demuxer=live_flv \
+		--enable-demuxer=image_bmp_pipe \
+		--enable-demuxer=image_jpeg_pipe \
+		--enable-demuxer=image_jpegls_pipe \
+		--enable-demuxer=image_png_pipe \
+		--enable-demuxer=image2 \
+		--enable-demuxer=image2pipe \
+		--enable-demuxer=m4v \
+		--enable-demuxer=matroska \
+		--enable-demuxer=mjpeg \
+		--enable-demuxer=mov \
+		--enable-demuxer=mp3 \
+		--enable-demuxer=mpegps \
+		--enable-demuxer=mpegts \
+		--enable-demuxer=mpegtsraw \
+		--enable-demuxer=mpegvideo \
+		--enable-demuxer=mpjpeg \
+		--enable-demuxer=ogg \
+		--enable-demuxer=pcm_s16be \
+		--enable-demuxer=pcm_s16le \
+		--enable-demuxer=rawvideo \
+		--enable-demuxer=realtext \
+		--enable-demuxer=rm \
+		--enable-demuxer=rtp \
+		--enable-demuxer=rtsp \
+		--enable-demuxer=srt \
+		--enable-demuxer=vc1 \
+		--enable-demuxer=wav \
+		--enable-demuxer=webm_dash_manifest \
+	\
+	--disable-muxers \
+		--enable-muxer=apng \
+		--enable-muxer=flac \
+		--enable-muxer=h261 \
+		--enable-muxer=h263 \
+		--enable-muxer=h264 \
+		--enable-muxer=hevc \
+		--enable-muxer=image2 \
+		--enable-muxer=image2pipe \
+		--enable-muxer=m4v \
+		--enable-muxer=matroska \
+		--enable-muxer=mjpeg \
+		--enable-muxer=mp3 \
+		--enable-muxer=mp4 \
+		--enable-muxer=mpeg1video \
+		--enable-muxer=mpeg2video \
+		--enable-muxer=mpegts \
+		--enable-muxer=ogg \
+	\
+	--disable-filters \
+		--enable-filter=drawtext \
+		--enable-filter=scale \
+	\
+	--disable-extra-warnings \
+	--disable-postproc \
+	\
+	--enable-bsfs \
+	--enable-libass \
+	--enable-libbluray \
+	--enable-libfreetype \
+	--enable-librtmp \
+	--enable-network \
+	--enable-nonfree \
+	--enable-openssl \
+	--enable-zlib \
+	\
+	--disable-xlib \
+	--disable-libxcb \
+	--disable-libxcb-shm \
+	--disable-libxcb-xfixes \
+	--disable-libxcb-shape \
+	\
+	--disable-debug \
+	--enable-cross-compile \
+	--enable-stripping \
+	--disable-static \
+	--enable-shared \
+	--disable-runtime-cpudetect \
+	--enable-pic \
+	--enable-pthreads \
+	--enable-swresample \
+	--enable-hardcoded-tables \
+	\
+	--target-os=linux \
+	--arch=$(TARGET_ARCH) \
+	--extra-ldflags="$(TARGET_LDFLAGS)"

 ifeq ($(TARGET_ARCH),arm)
-  FFMPEG_CONFIGURE_PLATFORM = \
-			--cpu=cortex-a15 \
-			--extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir) -mfpu=neon-vfpv4 -mfloat-abi=hard"
+  FFMPEG_CONF_OPTS += \
+	--cpu=cortex-a15 \
+	--extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir) -mfpu=neon-vfpv4 -mfloat-abi=hard"

 else ifeq ($(TARGET_ARCH),mips)
-  FFMPEG_CONFIGURE_PLATFORM = \
-			--cpu=generic \
-			--extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir)"
+  FFMPEG_CONF_OPTS += \
+	--cpu=generic \
+	--extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir)"
 endif

-# -----------------------------------------------------------------------------
+FFMPEG_DEPS = openssl freetype rtmpdump libbluray libass libxml2 alsa-lib

 ffmpeg: $(FFMPEG_DEPS) $(DL_DIR)/$(FFMPEG_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(FFMPEG_DIR)
-	$(UNTAR)/$(FFMPEG_SOURCE)
-ifneq ($(FFMPEG_UNPATCHED),yes)
-	$(CHDIR)/$(FFMPEG_DIR); \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+ifneq ($($(PKG)_UNPATCHED),yes)
+	$(CHDIR)/$(PKG_DIR); \
 		$(APPLY_PATCHES)
 endif
-	$(CHDIR)/$(FFMPEG_DIR); \
-		./configure \
-			$(FFMPEG_CONFIGURE_GENERIC) \
-			$(FFMPEG_CONFIGURE_PLATFORM) \
-			; \
+	$(CHDIR)/$(PKG_DIR); \
+		./configure $($(PKG)_CONF_OPTS); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REMOVE)/$(FFMPEG_DIR)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)
--- a/make/target-files.mk
+++ b/make/target-files.mk
@ -90,7 +90,7 @@ endif

 $(TARGET_sysconfdir)/profile.d:
 	$(foreach p,$(wildcard $(TARGET_FILES)/files-etc/profile.d/*.sh),\
-		$(INSTALL_DATA) -D $(p) $(TARGET_sysconfdir)/profile.d/$(notdir $(p)) $(sep))
+		$(INSTALL_DATA) -D $(p) $(TARGET_sysconfdir)/profile.d/$(notdir $(p))$(sep))

 $(TARGET_sysconfdir)/services:
 	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/services $(@)
--- a/make/target-libs-static.mk
+++ b/make/target-libs-static.mk
@ -10,39 +10,40 @@ endif

 libs-static: $(LIBS-STATIC) | $(TARGET_DIR)
 	$(INSTALL_COPY) $(STATIC_DIR)/. $(TARGET_DIR)/
-	$(REWRITE_LIBTOOL_LA)
+	$(REWRITE_LIBTOOL)

 # -----------------------------------------------------------------------------

-CORTEX-STRINGS_VER    = 48fd30c
-CORTEX-STRINGS_DIR    = cortex-strings-$(CORTEX-STRINGS_VER)
-CORTEX-STRINGS_SOURCE = cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2
-CORTEX-STRINGS_SITE   = http://git.linaro.org/git-ro/toolchain/cortex-strings.git
+CORTEX_STRINGS_VER    = 48fd30c
+CORTEX_STRINGS_DIR    = cortex-strings-$(CORTEX_STRINGS_VER)
+CORTEX_STRINGS_SOURCE = cortex-strings-$(CORTEX_STRINGS_VER).tar.bz2
+CORTEX_STRINGS_SITE   = http://git.linaro.org/git-ro/toolchain/cortex-strings.git

-$(DL_DIR)/$(CORTEX-STRINGS_SOURCE):
-	$(GET-GIT-ARCHIVE) $(CORTEX-STRINGS_SITE) $(CORTEX-STRINGS_VER) $(@F) $(DL_DIR)
+$(DL_DIR)/$(CORTEX_STRINGS_SOURCE):
+	$(GET-GIT-ARCHIVE) $(CORTEX_STRINGS_SITE) $(CORTEX_STRINGS_VER) $(@F) $(DL_DIR)

-CORTEX-STRINGS_CONF   = $(if $(filter $(BOXSERIES),hd5x hd6x vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse),--with-neon,--without-neon)
+CORTEX_STRINGS_CONF_ENV = \
+	CFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_includedir)" \
+	CPPFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_includedir)" \
+	CXXFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_includedir)" \
+	LDFLAGS="-Wl,-O1 -L$(TARGET_libdir)"
+
+CORTEX_STRINGS_CONF_OPTS = \
+	$(TARGET_CONFIGURE_OPTS) \
+	$(if $(filter $(BOXSERIES),hd5x hd6x vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse),--with-neon,--without-neon) \
+	--enable-static \
+	--disable-shared

 cortex-strings: $(STATIC_libdir)/libcortex-strings.la
-$(STATIC_libdir)/libcortex-strings.la: $(DL_DIR)/$(CORTEX-STRINGS_SOURCE) | $(STATIC_DIR)
-	$(REMOVE)/$(CORTEX-STRINGS_DIR)
-	$(UNTAR)/$(CORTEX-STRINGS_SOURCE)
-	$(CHDIR)/$(CORTEX-STRINGS_DIR); \
+$(STATIC_libdir)/libcortex-strings.la: $(DL_DIR)/$(CORTEX_STRINGS_SOURCE) | $(STATIC_DIR)
+	$(REMOVE)/$(CORTEX_STRINGS_DIR)
+	$(UNTAR)/$(CORTEX_STRINGS_SOURCE)
+	$(CHDIR)/$(CORTEX_STRINGS_DIR); \
 		./autogen.sh; \
-		CFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_includedir)" \
-		CPPFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_includedir)" \
-		CXXFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_includedir)" \
-		LDFLAGS="-Wl,-O1 -L$(TARGET_libdir)" \
-		./configure $(CONFIGURE_OPTS) \
-			--prefix=$(prefix) \
-			--disable-shared \
-			--enable-static \
-			$(CORTEX-STRINGS_CONF) \
-			; \
+		$(CORTEX_STRINGS_CONF_ENV) ./configure $(CORTEX_STRINGS_CONF_OPTS); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(STATIC_DIR)
-	$(REMOVE)/$(CORTEX-STRINGS_DIR)
+	$(REMOVE)/$(CORTEX_STRINGS_DIR)

 # -----------------------------------------------------------------------------

--- a/make/target-libs-unused.mk
+++ b/make/target-libs-unused.mk
@ -11,49 +11,23 @@ LIBID3TAG_SITE   = https://sourceforge.net/projects/mad/files/libid3tag/$(LIBID3
 $(DL_DIR)/$(LIBID3TAG_SOURCE):
 	$(DOWNLOAD) $(LIBID3TAG_SITE)/$(LIBID3TAG_SOURCE)

-LIBID3TAG_PATCH  = libid3tag-pc.patch
+LIBID3TAG_DEPS = zlib

-LIBID3TAG_DEPS   = zlib
+LIBID3TAG_AUTORECONF = YES
+
+LIBID3TAG_CONF_OPTS = \
+	--enable-shared=yes

 libid3tag: $(LIBID3TAG_DEPS) $(DL_DIR)/$(LIBID3TAG_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(LIBID3TAG_DIR)
-	$(UNTAR)/$(LIBID3TAG_SOURCE)
-	$(CHDIR)/$(LIBID3TAG_DIR); \
-		$(call apply_patches,$(LIBID3TAG_PATCH)); \
-		autoreconf -fi; \
-		$(CONFIGURE) \
-			--prefix=$(prefix) \
-			--enable-shared=yes \
-			; \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
+		$(APPLY_PATCHES); \
+		$(CONFIGURE); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_LIBTOOL_LA)
-	$(REMOVE)/$(LIBID3TAG_DIR)
-	$(TOUCH)
-
-# -----------------------------------------------------------------------------
-
-BZIP2_VER    = 1.0.8
-BZIP2_DIR    = bzip2-$(BZIP2_VER)
-BZIP2_SOURCE = bzip2-$(BZIP2_VER).tar.gz
-BZIP2_SITE   = https://sourceware.org/pub/bzip2
-
-$(DL_DIR)/$(BZIP2_SOURCE):
-	$(DOWNLOAD) $(BZIP2_SITE)/$(BZIP2_SOURCE)
-
-BZIP2_PATCH  = bzip2.patch
-
-bzip2: $(DL_DIR)/$(BZIP2_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(BZIP2_DIR)
-	$(UNTAR)/$(BZIP2_SOURCE)
-	$(CHDIR)/$(BZIP2_DIR); \
-		$(call apply_patches,$(BZIP2_PATCH)); \
-		mv Makefile-libbz2_so Makefile; \
-		$(MAKE_ENV) \
-		$(MAKE); \
-		$(MAKE) install PREFIX=$(TARGET_DIR)
-	rm -f $(TARGET_bindir)/bzip2
-	$(REMOVE)/$(BZIP2_DIR)
+	$(REWRITE_LIBTOOL)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -66,24 +40,25 @@ FONTCONFIG_SITE   = https://www.freedesktop.org/software/fontconfig/release
 $(DL_DIR)/$(FONTCONFIG_SOURCE):
 	$(DOWNLOAD) $(FONTCONFIG_SITE)/$(FONTCONFIG_SOURCE)

-FONTCONFIG_DEPS   = freetype expat
+FONTCONFIG_DEPS = freetype expat
+
+FONTCONFIG_CONF_OPTS = \
+	--with-freetype-config=$(HOST_DIR)/bin/freetype-config \
+	--with-expat-includes=$(TARGET_includedir) \
+	--with-expat-lib=$(TARGET_libdir) \
+	--disable-docs

 fontconfig: $(FONTCONFIG_DEPS) $(DL_DIR)/$(FONTCONFIG_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(FONTCONFIG_DIR)
-	$(UNTAR)/$(FONTCONFIG_SOURCE)
-	$(CHDIR)/$(FONTCONFIG_DIR); \
-		$(CONFIGURE) \
-			--prefix=$(prefix) \
-			--with-freetype-config=$(HOST_DIR)/bin/freetype-config \
-			--with-expat-includes=$(TARGET_includedir) \
-			--with-expat-lib=$(TARGET_libdir) \
-			--sysconfdir=/etc \
-			--disable-docs \
-			; \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
+		$(APPLY_PATCHES); \
+		$(CONFIGURE); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_LIBTOOL_LA)
-	$(REMOVE)/$(FONTCONFIG_DIR)
+	$(REWRITE_CONFIG) $(HOST_DIR)/bin/freetype-config
+	$(REWRITE_LIBTOOL)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -96,28 +71,24 @@ PIXMAN_SITE   = https://www.cairographics.org/releases
 $(DL_DIR)/$(PIXMAN_SOURCE):
 	$(DOWNLOAD) $(PIXMAN_SITE)/$(PIXMAN_SOURCE)

-PIXMAN_PATCH  = pixman-0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
-PIXMAN_PATCH += pixman-asm_include.patch
-PIXMAN_PATCH += pixman-0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch
+PIXMAN_DEPS = zlib libpng

-PIXMAN_DEPS   = zlib libpng
+PIXMAN_CONF_OPTS = \
+	--disable-gtk \
+	--disable-arm-simd \
+	--disable-loongson-mmi \
+	--disable-docs

 pixman: $(PIXMAN_DEPS) $(DL_DIR)/$(PIXMAN_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(PIXMAN_DIR)
-	$(UNTAR)/$(PIXMAN_SOURCE)
-	$(CHDIR)/$(PIXMAN_DIR); \
-		$(call apply_patches,$(PIXMAN_PATCH)); \
-		$(CONFIGURE) \
-			--prefix=$(prefix) \
-			--disable-gtk \
-			--disable-arm-simd \
-			--disable-loongson-mmi \
-			--disable-docs \
-			; \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
+		$(APPLY_PATCHES); \
+		$(CONFIGURE); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_LIBTOOL_LA)
-	$(REMOVE)/$(PIXMAN_DIR)
+	$(REWRITE_LIBTOOL)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -130,27 +101,27 @@ CAIRO_SITE   = https://www.cairographics.org/releases
 $(DL_DIR)/$(CAIRO_SOURCE):
 	$(DOWNLOAD) $(CAIRO_SITE)/$(CAIRO_SOURCE)

-CAIRO_PATCH  = cairo-get_bitmap_surface.diff
+CAIRO_DEPS = fontconfig glib2 libpng pixman zlib
+
+CAIRO_CONF_ENV = \
+	ax_cv_c_float_words_bigendian="no"

-CAIRO_DEPS   = fontconfig glib2 libpng pixman zlib
+CAIRO_CONF_OPTS = \
+	--with-html-dir=$(REMOVE_htmldir) \
+	--with-x=no \
+	--disable-xlib \
+	--disable-xcb \
+	--disable-egl \
+	--disable-glesv2 \
+	--disable-gl \
+	--enable-tee

 cairo: $(CAIRO_DEPS) $(DL_DIR)/$(CAIRO_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(CAIRO_DIR)
-	$(UNTAR)/$(CAIRO_SOURCE)
-	$(CHDIR)/$(CAIRO_DIR); \
-		$(call apply_patches,$(CAIRO_PATCH)); \
-		$(MAKE_ENV) \
-		ax_cv_c_float_words_bigendian="no" \
-		./configure $(CONFIGURE_OPTS) \
-			--prefix=$(prefix) \
-			--with-x=no \
-			--disable-xlib \
-			--disable-xcb \
-			--disable-egl \
-			--disable-glesv2 \
-			--disable-gl \
-			--enable-tee \
-			; \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
+		$(APPLY_PATCHES); \
+		$(CONFIGURE); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	rm -rf $(TARGET_bindir)/cairo-sphinx
@ -158,8 +129,8 @@ cairo: $(CAIRO_DEPS) $(DL_DIR)/$(CAIRO_SOURCE) | $(TARGET_DIR)
 	rm -rf $(TARGET_libdir)/cairo/cairo-sphinx*
 	rm -rf $(TARGET_libdir)/cairo/.debug/cairo-fdr*
 	rm -rf $(TARGET_libdir)/cairo/.debug/cairo-sphinx*
-	$(REWRITE_LIBTOOL_LA)
-	$(REMOVE)/$(CAIRO_DIR)
+	$(REWRITE_LIBTOOL)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -172,27 +143,26 @@ HARFBUZZ_SITE   = https://www.freedesktop.org/software/harfbuzz/release
 $(DL_DIR)/$(HARFBUZZ_SOURCE):
 	$(DOWNLOAD) $(HARFBUZZ_SITE)/$(HARFBUZZ_SOURCE)

-HARFBUZZ_PATCH  = harfbuzz-disable-docs.patch
+HARFBUZZ_DEPS = fontconfig glib2 cairo freetype
+
+HARFBUZZ_AUTORECONF = YES

-HARFBUZZ_DEPS   = fontconfig glib2 cairo freetype
+HARFBUZZ_CONF_OPTS = \
+	--with-cairo \
+	--with-fontconfig \
+	--with-freetype \
+	--with-glib \
+	--without-graphite2 \
+	--without-icu

 harfbuzz: $(HARFBUZZ_DEPS) $(DL_DIR)/$(HARFBUZZ_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(HARFBUZZ_DIR)
-	$(UNTAR)/$(HARFBUZZ_SOURCE)
-	$(CHDIR)/$(HARFBUZZ_DIR); \
-		$(call apply_patches,$(HARFBUZZ_PATCH)); \
-		autoreconf -fi; \
-		$(CONFIGURE) \
-			--prefix=$(prefix) \
-			--with-cairo \
-			--with-fontconfig \
-			--with-freetype \
-			--with-glib \
-			--without-graphite2 \
-			--without-icu \
-			; \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
+		$(APPLY_PATCHES); \
+		$(CONFIGURE); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_LIBTOOL_LA)
-	$(REMOVE)/$(HARFBUZZ_DIR)
+	$(REWRITE_LIBTOOL)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)
--- a/make/target-libs.mk
+++ b/make/target-libs.mk
--- a/make/target-lua.mk
+++ b/make/target-lua.mk
@ -12,22 +12,16 @@ LUA_SITE   = https://www.lua.org
 $(DL_DIR)/$(LUA_SOURCE):
 	$(DOWNLOAD) $(LUA_SITE)/ftp/$(LUA_SOURCE)

-LUA_PATCH  = lua-01-fix-LUA_ROOT.patch
-LUA_PATCH += lua-01-remove-readline.patch
-LUA_PATCH += lua-02-shared-libs-for-lua.patch
-LUA_PATCH += lua-03-lua-pc.patch
-LUA_PATCH += lua-04-crashfix.diff
-
 LUA_DEPS   = ncurses

 lua: $(LUA_DEPS) $(DL_DIR)/$(LUA_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LUA_DIR)
 	$(UNTAR)/$(LUA_SOURCE)
 	$(CHDIR)/$(LUA_DIR); \
-		$(call apply_patches,$(LUA_PATCH)); \
+		$(APPLY_PATCHES); \
 		$(MAKE) linux \
 			PKG_VERSION=$(LUA_VER) \
-			$(MAKE_OPTS) \
+			$(TARGET_MAKE_OPTS) \
 			AR="$(TARGET_AR) rcu" \
 			LDFLAGS="$(TARGET_LDFLAGS)" \
 			; \
@ -47,47 +41,47 @@ LUAEXPAT_SITE   = https://github.com/tomasguisasola/luaexpat/archive
 $(DL_DIR)/$(LUAEXPAT_SOURCE):
 	$(DOWNLOAD) $(LUAEXPAT_SITE)/v$(LUAEXPAT_VER).tar.gz -O $(@)

-LUAEXPAT_DEPS   = expat lua
+LUAEXPAT_DEPS = expat lua
+
+LUAEXPAT_MAKE_ENV = \
+	$(TARGET_CONFIGURE_ENV)
+
+LUAEXPAT_MAKE_OPTS = \
+	PREFIX=$(TARGET_prefix) \
+	LUA_SYS_VER=$(LUA_ABIVER)

 luaexpat: $(LUAEXPAT_DEPS) $(DL_DIR)/$(LUAEXPAT_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(LUAEXPAT_DIR)
-	$(UNTAR)/$(LUAEXPAT_SOURCE)
-	$(CHDIR)/$(LUAEXPAT_DIR); \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
 		$(SED) 's|^EXPAT_INC=.*|EXPAT_INC= $(TARGET_includedir)|' makefile; \
 		$(SED) 's|^CFLAGS =.*|& -L$(TARGET_libdir)|' makefile; \
 		$(SED) 's|^CC =.*|CC = $(TARGET_CC)|' makefile; \
-		$(MAKE_ENV) \
-		$(MAKE) \
-			PREFIX=$(TARGET_prefix) \
-			LUA_SYS_VER=$(LUA_ABIVER); \
-		$(MAKE) install \
-			PREFIX=$(TARGET_prefix) \
-			LUA_SYS_VER=$(LUA_ABIVER)
-	$(REMOVE)/$(LUAEXPAT_DIR)
+		$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPTS); \
+		$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPTS) install
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

-LUA-FEEDPARSER_VER    = 0.71
-LUA-FEEDPARSER_DIR    = lua-feedparser-$(LUA-FEEDPARSER_VER)
-LUA-FEEDPARSER_SOURCE = lua-feedparser-$(LUA-FEEDPARSER_VER).tar.gz
-LUA-FEEDPARSER_SITE   = https://github.com/slact/lua-feedparser/archive
+LUA_FEEDPARSER_VER    = 0.71
+LUA_FEEDPARSER_DIR    = lua-feedparser-$(LUA_FEEDPARSER_VER)
+LUA_FEEDPARSER_SOURCE = lua-feedparser-$(LUA_FEEDPARSER_VER).tar.gz
+LUA_FEEDPARSER_SITE   = https://github.com/slact/lua-feedparser/archive

-$(DL_DIR)/$(LUA-FEEDPARSER_SOURCE):
-	$(DOWNLOAD) $(LUA-FEEDPARSER_SITE)/$(LUA-FEEDPARSER_VER).tar.gz -O $(@)
+$(DL_DIR)/$(LUA_FEEDPARSER_SOURCE):
+	$(DOWNLOAD) $(LUA_FEEDPARSER_SITE)/$(LUA_FEEDPARSER_VER).tar.gz -O $(@)

-LUA-FEEDPARSER_PATCH  = lua-feedparser.patch
+LUA_FEEDPARSER_DEPS = luaexpat

-LUA-DEEDPARSER_DEPS   = luaexpat
-
-lua-feedparser: $(LUA-DEEDPARSER_DEPS) $(DL_DIR)/$(LUA-FEEDPARSER_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(LUA-FEEDPARSER_DIR)
-	$(UNTAR)/$(LUA-FEEDPARSER_SOURCE)
-	$(CHDIR)/$(LUA-FEEDPARSER_DIR); \
+lua-feedparser: $(LUA-DEEDPARSER_DEPS) $(DL_DIR)/$(LUA_FEEDPARSER_SOURCE) | $(TARGET_DIR)
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
 		$(SED) 's|^PREFIX =|PREFIX ?=|' Makefile; \
-		$(call apply_patches,$(LUA-FEEDPARSER_PATCH)); \
+		$(APPLY_PATCHES); \
 		$(MAKE) install PREFIX=$(TARGET_prefix)
-	$(REMOVE)/$(LUA-FEEDPARSER_DIR)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -100,9 +94,9 @@ $(DL_DIR)/$(LUAJSON_SOURCE):

 luajson: $(DL_DIR)/$(LUAJSON_SOURCE) | $(TARGET_DIR)
 	$(CD) $(DL_DIR); \
-		curl --remote-name --time-cond $(LUAJSON_SOURCE) $(LUAJSON_SITE)/$(LUAJSON_SOURCE) || true
-	$(INSTALL_DATA) -D $(DL_DIR)/$(LUAJSON_SOURCE) $(TARGET_datadir)/lua/$(LUA_ABIVER)
-	ln -sf $(LUAJSON_SOURCE) $(TARGET_datadir)/lua/$(LUA_ABIVER)/json.lua
+		curl --remote-name --time-cond $(PKG_SOURCE) $(PKG_SITE)/$(PKG_SOURCE) || true
+	$(INSTALL_DATA) -D $(DL_DIR)/$(PKG_SOURCE) $(TARGET_datadir)/lua/$(LUA_ABIVER)
+	ln -sf $(PKG_SOURCE) $(TARGET_datadir)/lua/$(LUA_ABIVER)/json.lua
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -112,24 +106,25 @@ LUACURL_DIR    = lua-curlv3.$(LUACURL_VER)
 LUACURL_SOURCE = lua-curlv3.$(LUACURL_VER)
 LUACURL_SITE   = https://github.com/lua-curl/$(LUACURL_SOURCE)

-LUACURL_DEPS   = libcurl lua
+LUACURL_DEPS = libcurl lua
+
+LUACURL_MAKE_ENV = \
+	$(TARGET_CONFIGURE_ENV)
+
+LUACURL_MAKE_OPTS = \
+	LIBDIR=$(TARGET_libdir) \
+	LUA_INC=$(TARGET_includedir) \
+	LUA_CMOD=$(libdir)/lua/$(LUA_ABIVER) \
+	LUA_LMOD=$(datadir)/lua/$(LUA_ABIVER)

 luacurl: $(LUACURL_DEPS) | $(TARGET_DIR)
-	echo $(TARGET_libdir)
-	echo $(TARGET_includedir)
-	echo $(TARGET_datadir)
-	$(REMOVE)/$(LUACURL_DIR)
-	$(GET-GIT-SOURCE) $(LUACURL_SITE) $(DL_DIR)/$(LUACURL_SOURCE)
-	$(CPDIR)/$(LUACURL_SOURCE)
-	$(CHDIR)/$(LUACURL_DIR); \
-		$(MAKE_ENV) \
-		$(MAKE) \
-			LIBDIR=$(TARGET_libdir) \
-			LUA_INC=$(TARGET_includedir); \
-		$(MAKE) install DESTDIR=$(TARGET_DIR) \
-			LUA_CMOD=$(libdir)/lua/$(LUA_ABIVER) \
-			LUA_LMOD=$(datadir)/lua/$(LUA_ABIVER)
-	$(REMOVE)/$(LUACURL_DIR)
+	$(REMOVE)/$(PKG_DIR)
+	$(GET-GIT-SOURCE) $(PKG_SITE) $(DL_DIR)/$(PKG_SOURCE)
+	$(CPDIR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
+		$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPTS); \
+		$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPTS) install DESTDIR=$(TARGET_DIR)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -142,9 +137,19 @@ LUAPOSIX_SITE   = https://github.com/luaposix/luaposix/archive
 $(DL_DIR)/$(LUAPOSIX_SOURCE):
 	$(DOWNLOAD) $(LUAPOSIX_SITE)/v$(LUAPOSIX_VER).tar.gz -O $(@)

-LUAPOSIX_PATCH  = luaposix-fix-docdir-build.patch
+LUAPOSIX_DEPS = $(HOST_LUA) lua luaexpat
+
+LUAPOSIX_AUTORECONF = YES

-LUAPOSIX_DEPS   = $(HOST_LUA) lua luaexpat
+LUAPOSIX_CONF_ENV = \
+	LUA=$(HOST_LUA)
+
+LUAPOSIX_CONF_OPTS = \
+	--libdir=$(TARGET_libdir)/lua/$(LUA_ABIVER) \
+	--datadir=$(TARGET_datadir)/lua/$(LUA_ABIVER) \
+	--mandir=$(TARGET_DIR)$(REMOVE_mandir) \
+	--docdir=$(TARGET_DIR)$(REMOVE_docdir) \
+	--enable-silent-rules

 GNULIB_VER    = 20140202
 GNULIB_SOURCE = gnulib-$(GNULIB_VER)-stable.tar.gz
@ -161,25 +166,15 @@ $(DL_DIR)/$(SLINGSHOT_SOURCE):
 	$(DOWNLOAD) $(SLINGSHOT_SITE)/v$(SLINGSHOT_VER).tar.gz -O $(@)

 luaposix: $(LUAPOSIX_DEPS) $(DL_DIR)/$(SLINGSHOT_SOURCE) $(DL_DIR)/$(GNULIB_SOURCE) $(DL_DIR)/$(LUAPOSIX_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(LUAPOSIX_DIR)
-	$(UNTAR)/$(LUAPOSIX_SOURCE)
-	$(CHDIR)/$(LUAPOSIX_DIR); \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
 		tar -C gnulib --strip=1 -xf $(DL_DIR)/$(GNULIB_SOURCE); \
 		tar -C slingshot --strip=1 -xf $(DL_DIR)/$(SLINGSHOT_SOURCE); \
-		$(call apply_patches,$(LUAPOSIX_PATCH)); \
-		export LUA=$(HOST_LUA); \
+		$(APPLY_PATCHES); \
 		./bootstrap; \
-		autoreconf -fi; \
-		$(CONFIGURE) \
-			--prefix=$(prefix) \
-			--exec-prefix=$(exec_prefix) \
-			--libdir=$(TARGET_libdir)/lua/$(LUA_ABIVER) \
-			--datarootdir=$(TARGET_datadir)/lua/$(LUA_ABIVER) \
-			--mandir=$(TARGET_DIR)$(REMOVE_mandir) \
-			--docdir=$(TARGET_DIR)$(REMOVE_docdir) \
-			--enable-silent-rules \
-			; \
+		$(CONFIGURE); \
 		$(MAKE); \
 		$(MAKE) install
-	$(REMOVE)/$(LUAPOSIX_DIR)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)
--- a/make/target-neutrino-plugins.mk
+++ b/make/target-neutrino-plugins.mk
@ -17,39 +17,40 @@ endif

 # -----------------------------------------------------------------------------

-NEUTRINO-PLUGINS_OBJ       = $(NI-NEUTRINO-PLUGINS)-obj
-NEUTRINO-PLUGINS_BUILD_DIR = $(BUILD_DIR)/$(NEUTRINO-PLUGINS_OBJ)
+NEUTRINO_PLUGINS_OBJ       = $(NI_NEUTRINO_PLUGINS)-obj
+NEUTRINO_PLUGINS_BUILD_DIR = $(BUILD_DIR)/$(NEUTRINO_PLUGINS_OBJ)

 # -----------------------------------------------------------------------------

-NEUTRINO-PLUGINS_DEPS  = ffmpeg
-NEUTRINO-PLUGINS_DEPS += libcurl
-NEUTRINO-PLUGINS_DEPS += libpng
-NEUTRINO-PLUGINS_DEPS += libjpeg-turbo
-NEUTRINO-PLUGINS_DEPS += giflib
-NEUTRINO-PLUGINS_DEPS += freetype
-NEUTRINO-PLUGINS_DEPS += luaexpat
-NEUTRINO-PLUGINS_DEPS += luajson
-NEUTRINO-PLUGINS_DEPS += luacurl
-NEUTRINO-PLUGINS_DEPS += luaposix
-NEUTRINO-PLUGINS_DEPS += lua-feedparser
+NEUTRINO_PLUGINS_DEPS  = ffmpeg
+NEUTRINO_PLUGINS_DEPS += libcurl
+NEUTRINO_PLUGINS_DEPS += libpng
+NEUTRINO_PLUGINS_DEPS += libjpeg-turbo
+NEUTRINO_PLUGINS_DEPS += giflib
+NEUTRINO_PLUGINS_DEPS += freetype
+NEUTRINO_PLUGINS_DEPS += luaexpat
+NEUTRINO_PLUGINS_DEPS += luajson
+NEUTRINO_PLUGINS_DEPS += luacurl
+NEUTRINO_PLUGINS_DEPS += luaposix
+NEUTRINO_PLUGINS_DEPS += lua-feedparser

 # -----------------------------------------------------------------------------

-NEUTRINO-PLUGINS_CONF_ENV = \
-	$(MAKE_ENV)
+NEUTRINO_PLUGINS_CONF_ENV = \
+	$(TARGET_CONFIGURE_ENV)

 # -----------------------------------------------------------------------------

-NEUTRINO-PLUGINS_CONF_OPTS = \
-	--host=$(TARGET) \
+NEUTRINO_PLUGINS_CONF_OPTS = \
 	--build=$(BUILD) \
+	--host=$(TARGET) \
+	--target=$(TARGET) \
 	--prefix=$(prefix) \
 	--sysconfdir=$(sysconfdir) \
 	--enable-maintainer-mode \
 	--enable-silent-rules \
 	\
-	--with-neutrino-source=$(SOURCE_DIR)/$(NI-NEUTRINO) \
+	--with-neutrino-source=$(SOURCE_DIR)/$(NI_NEUTRINO) \
 	--with-neutrino-build=$(NEUTRINO_BUILD_DIR) \
 	\
 	--with-target=cdk \
@ -57,12 +58,12 @@ NEUTRINO-PLUGINS_CONF_OPTS = \
 	--with-boxtype=$(BOXTYPE)

 ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2))
-  NEUTRINO-PLUGINS_CONF_OPTS += --with-boxmodel=$(BOXSERIES)
+  NEUTRINO_PLUGINS_CONF_OPTS += --with-boxmodel=$(BOXSERIES)
 else
-  NEUTRINO-PLUGINS_CONF_OPTS += --with-boxmodel=$(BOXMODEL)
+  NEUTRINO_PLUGINS_CONF_OPTS += --with-boxmodel=$(BOXMODEL)
 endif

-NEUTRINO-PLUGINS_CONF_OPTS += \
+NEUTRINO_PLUGINS_CONF_OPTS += \
 	--disable-logoupdater \
 	--disable-logoview \
 	--disable-mountpointmanagement \
@ -70,11 +71,11 @@ NEUTRINO-PLUGINS_CONF_OPTS += \

 ifeq ($(BOXTYPE),coolstream)
  ifeq ($(BOXSERIES),hd1)
-    NEUTRINO-PLUGINS_CONF_OPTS += \
+    NEUTRINO_PLUGINS_CONF_OPTS += \
 	--disable-spiegel_tv_doc \
 	--disable-tierwelt_tv
  endif
-  NEUTRINO-PLUGINS_CONF_OPTS += \
+  NEUTRINO_PLUGINS_CONF_OPTS += \
 	--disable-showiframe \
 	--disable-stb_startup \
 	--disable-imgbackup \
@ -84,37 +85,37 @@ endif
 # -----------------------------------------------------------------------------

 ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2))
-  NEUTRINO-PLUGINS_BOXMODEL = $(BOXSERIES)
+  NEUTRINO_PLUGINS_BOXMODEL = $(BOXSERIES)
 else
-  NEUTRINO-PLUGINS_BOXMODEL = $(BOXMODEL)
+  NEUTRINO_PLUGINS_BOXMODEL = $(BOXMODEL)
 endif

 # -----------------------------------------------------------------------------

-$(NEUTRINO-PLUGINS_BUILD_DIR)/config.status: $(NEUTRINO-PLUGINS_DEPS)
-	test -d $(NEUTRINO-PLUGINS_BUILD_DIR) || mkdir -p $(NEUTRINO-PLUGINS_BUILD_DIR)
-	$(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/autogen.sh
-	$(CD) $(NEUTRINO-PLUGINS_BUILD_DIR); \
-		$(NEUTRINO-PLUGINS_CONF_ENV) \
-		$(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/configure \
-			$(NEUTRINO-PLUGINS_CONF_OPTS)
+$(NEUTRINO_PLUGINS_BUILD_DIR)/config.status: $(NEUTRINO_PLUGINS_DEPS)
+	test -d $(NEUTRINO_PLUGINS_BUILD_DIR) || mkdir -p $(NEUTRINO_PLUGINS_BUILD_DIR)
+	$(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/autogen.sh
+	$(CD) $(NEUTRINO_PLUGINS_BUILD_DIR); \
+		$(NEUTRINO_PLUGINS_CONF_ENV) \
+		$(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/configure \
+			$(NEUTRINO_PLUGINS_CONF_OPTS)

 # -----------------------------------------------------------------------------

-NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS  =
-NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS += emmrd
-NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS += fritzcallmonitor
-NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS += openvpn
-NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS += rcu_switcher
-#NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS += stbup
-NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS += tuxcald
-NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS += tuxmaild
+NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS  =
+NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS += emmrd
+NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS += fritzcallmonitor
+NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS += openvpn
+NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS += rcu_switcher
+#NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS += stbup
+NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS += tuxcald
+NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS += tuxmaild

-NEUTRINO-PLUGINS_INIT-SCRIPTS  = $(NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS)
-NEUTRINO-PLUGINS_INIT-SCRIPTS += turnoff_power
+NEUTRINO_PLUGINS_INIT_SCRIPTS  = $(NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS)
+NEUTRINO_PLUGINS_INIT_SCRIPTS += turnoff_power

-define NEUTRINO-PLUGINS_RUNLEVEL-LINKS_INSTALL
-	for script in $(NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS); do \
+define NEUTRINO_PLUGINS_RUNLEVEL_LINKS_INSTALL
+	for script in $(NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS); do \
 		if [ -x $(TARGET_sysconfdir)/init.d/$$script ]; then \
 			$(UPDATE-RC.D) $$script defaults 80 20; \
 		fi; \
@ -124,8 +125,8 @@ define NEUTRINO-PLUGINS_RUNLEVEL-LINKS_INSTALL
 	fi
 endef

-define NEUTRINO-PLUGINS_RUNLEVEL-LINKS_UNINSTALL
-	for link in $(NEUTRINO-PLUGINS_INIT-SCRIPTS); do \
+define NEUTRINO_PLUGINS_RUNLEVEL_LINKS_UNINSTALL
+	for link in $(NEUTRINO_PLUGINS_INIT_SCRIPTS); do \
 		find $(TARGET_sysconfdir) -type l -name [SK]??$$link -print0 | \
 			xargs --no-run-if-empty -0 rm -f; \
 	done
@ -133,55 +134,55 @@ endef

 # -----------------------------------------------------------------------------

-neutrino-plugins: neutrino $(NEUTRINO-PLUGINS_BUILD_DIR)/config.status
-	$(MAKE) -C $(NEUTRINO-PLUGINS_BUILD_DIR)
-	$(MAKE) -C $(NEUTRINO-PLUGINS_BUILD_DIR) install DESTDIR=$(TARGET_DIR)
-	$(NEUTRINO-PLUGINS_RUNLEVEL-LINKS_INSTALL)
+neutrino-plugins: neutrino $(NEUTRINO_PLUGINS_BUILD_DIR)/config.status
+	$(MAKE) -C $(NEUTRINO_PLUGINS_BUILD_DIR)
+	$(MAKE) -C $(NEUTRINO_PLUGINS_BUILD_DIR) install DESTDIR=$(TARGET_DIR)
+	$(NEUTRINO_PLUGINS_RUNLEVEL_LINKS_INSTALL)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

 neutrino-plugins-uninstall:
-	-make -C $(NEUTRINO-PLUGINS_BUILD_DIR) uninstall DESTDIR=$(TARGET_DIR)
-	$(NEUTRINO-PLUGINS_RUNLEVEL-LINKS_UNINSTALL)
+	-make -C $(NEUTRINO_PLUGINS_BUILD_DIR) uninstall DESTDIR=$(TARGET_DIR)
+	$(NEUTRINO_PLUGINS_RUNLEVEL_LINKS_UNINSTALL)

 neutrino-plugins-distclean:
-	-make -C $(NEUTRINO-PLUGINS_BUILD_DIR) distclean
+	-make -C $(NEUTRINO_PLUGINS_BUILD_DIR) distclean

 neutrino-plugins-clean: neutrino-plugins-uninstall neutrino-plugins-distclean
-	rm -f $(NEUTRINO-PLUGINS_BUILD_DIR)/config.status
+	rm -f $(NEUTRINO_PLUGINS_BUILD_DIR)/config.status
 	rm -f $(DEPS_DIR)/neutrino-plugins

 neutrino-plugins-clean-all: neutrino-plugins-clean
-	rm -rf $(NEUTRINO-PLUGINS_BUILD_DIR)
+	rm -rf $(NEUTRINO_PLUGINS_BUILD_DIR)

 # -----------------------------------------------------------------------------

 # To build single plugins from neutrino-plugins repository call
 # make neutrino-plugin-<subdir>; e.g. make neutrino-plugin-tuxwetter

-neutrino-plugin-%: $(NEUTRINO-PLUGINS_BUILD_DIR)/config.status
-	$(MAKE) -C $(NEUTRINO-PLUGINS_BUILD_DIR)/$(subst neutrino-plugin-,,$(@))
-	$(MAKE) -C $(NEUTRINO-PLUGINS_BUILD_DIR)/$(subst neutrino-plugin-,,$(@)) install DESTDIR=$(TARGET_DIR)
+neutrino-plugin-%: $(NEUTRINO_PLUGINS_BUILD_DIR)/config.status
+	$(MAKE) -C $(NEUTRINO_PLUGINS_BUILD_DIR)/$(subst neutrino-plugin-,,$(@))
+	$(MAKE) -C $(NEUTRINO_PLUGINS_BUILD_DIR)/$(subst neutrino-plugin-,,$(@)) install DESTDIR=$(TARGET_DIR)

 # -----------------------------------------------------------------------------

-channellogos: $(SOURCE_DIR)/$(NI-LOGO-STUFF) $(SHARE_ICONS)
+channellogos: $(SOURCE_DIR)/$(NI_LOGO_STUFF) $(SHARE_ICONS)
 	rm -rf $(SHARE_LOGOS)
 	mkdir -p $(SHARE_LOGOS)
-	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logos/* $(SHARE_LOGOS)
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logos/* $(SHARE_LOGOS)
 	mkdir -p $(SHARE_LOGOS)/events
-	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logos-events/* $(SHARE_LOGOS)/events
-	$(CD) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-links; \
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logos-events/* $(SHARE_LOGOS)/events
+	$(CD) $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logo-links; \
 		./logo-linker.sh logo-links.db $(SHARE_LOGOS)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

-logo-addon: $(SOURCE_DIR)/$(NI-LOGO-STUFF) $(SHARE_PLUGINS)
-	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.sh $(SHARE_PLUGINS)/
-	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.cfg $(SHARE_PLUGINS)/
-	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.png $(SHARE_PLUGINS)/
+logo-addon: $(SOURCE_DIR)/$(NI_LOGO_STUFF) $(SHARE_PLUGINS)
+	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logo-addon/*.sh $(SHARE_PLUGINS)/
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logo-addon/*.cfg $(SHARE_PLUGINS)/
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logo-addon/*.png $(SHARE_PLUGINS)/
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -193,22 +194,22 @@ doscam-webif-skin:

 # -----------------------------------------------------------------------------

-NEUTRINO-MEDIATHEK_VER    = git
-NEUTRINO-MEDIATHEK_DIR    = mediathek.$(NEUTRINO-MEDIATHEK_VER)
-NEUTRINO-MEDIATHEK_SOURCE = mediathek.$(NEUTRINO-MEDIATHEK_VER)
-NEUTRINO-MEDIATHEK_SITE   = https://github.com/neutrino-mediathek
+NEUTRINO_MEDIATHEK_VER    = git
+NEUTRINO_MEDIATHEK_DIR    = mediathek.$(NEUTRINO_MEDIATHEK_VER)
+NEUTRINO_MEDIATHEK_SOURCE = mediathek.$(NEUTRINO_MEDIATHEK_VER)
+NEUTRINO_MEDIATHEK_SITE   = https://github.com/neutrino-mediathek

 neutrino-mediathek: $(SHARE_PLUGINS) | $(TARGET_DIR)
-	$(REMOVE)/$(NEUTRINO-MEDIATHEK_DIR)
-	$(GET-GIT-SOURCE) $(NEUTRINO-MEDIATHEK_SITE)/$(NEUTRINO-MEDIATHEK_SOURCE) $(DL_DIR)/$(NEUTRINO-MEDIATHEK_SOURCE)
-	$(CPDIR)/$(NEUTRINO-MEDIATHEK_SOURCE)
-	$(CHDIR)/$(NEUTRINO-MEDIATHEK_DIR); \
+	$(REMOVE)/$(PKG_DIR)
+	$(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE)
+	$(CPDIR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
 		$(INSTALL_COPY) plugins/* $(SHARE_PLUGINS)/; \
 		$(INSTALL_COPY) share/* $(TARGET_datadir)
-	$(REMOVE)/$(NEUTRINO-MEDIATHEK_DIR)
+	$(REMOVE)/$(PKG_DIR)
 	# temporarily use beta-version from our board
 	rm -rf $(SHARE_PLUGINS)/neutrino-mediathek*
-	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/plugins/mediathek/* $(SHARE_PLUGINS)/
+	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-lua/plugins/mediathek/* $(SHARE_PLUGINS)/
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -221,7 +222,7 @@ LINKS_SITE   = http://links.twibright.com/download
 $(DL_DIR)/$(LINKS_SOURCE):
 	$(DOWNLOAD) $(LINKS_SITE)/$(LINKS_SOURCE)

-LINKS_DEPS   = libpng libjpeg-turbo openssl
+LINKS_DEPS = libpng libjpeg-turbo openssl

 LINKS_PATCH  = links.patch
 LINKS_PATCH += links-ac-prog-cxx.patch
@ -235,6 +236,21 @@ else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),h7))
  LINKS_PATCH += links-input-event2.patch
 endif

+LINKS_AUTORECONF = YES
+
+LINKS_CONF_OPTS = \
+	--enable-graphics \
+	--with-fb \
+	--with-libjpeg \
+	--with-ssl=$(TARGET_DIR) \
+	--without-atheos \
+	--without-directfb \
+	--without-libtiff \
+	--without-lzma \
+	--without-pmshell \
+	--without-svgalib \
+	--without-x
+
 links: $(LINKS_DEPS) $(DL_DIR)/$(LINKS_SOURCE) $(SHARE_PLUGINS) | $(TARGET_DIR)
 	$(REMOVE)/$(LINKS_DIR)
 	$(UNTAR)/$(LINKS_SOURCE)
@ -245,22 +261,7 @@ links: $(LINKS_DEPS) $(DL_DIR)/$(LINKS_SOURCE) $(SHARE_PLUGINS) | $(TARGET_DIR)
 		./gen-intl
 	$(CHDIR)/$(LINKS_DIR); \
 		$(call apply_patches,$(LINKS_PATCH)); \
-		autoreconf -vfi; \
-		$(CONFIGURE) \
-			--prefix=$(prefix) \
-			--mandir=$(REMOVE_mandir) \
-			--enable-graphics \
-			--with-fb \
-			--with-libjpeg \
-			--with-ssl=$(TARGET_DIR) \
-			--without-atheos \
-			--without-directfb \
-			--without-libtiff \
-			--without-lzma \
-			--without-pmshell \
-			--without-svgalib \
-			--without-x \
-			; \
+		$(CONFIGURE); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	mv -f $(TARGET_bindir)/links $(SHARE_PLUGINS)/links.so
--- a/make/target-neutrino.mk
+++ b/make/target-neutrino.mk
@ -5,7 +5,7 @@

 NEUTRINO_INST_DIR ?= $(TARGET_DIR)

-NEUTRINO_OBJ       = $(NI-NEUTRINO)-obj
+NEUTRINO_OBJ       = $(NI_NEUTRINO)-obj
 NEUTRINO_BUILD_DIR = $(BUILD_DIR)/$(NEUTRINO_OBJ)

 ifeq ($(BOXTYPE),coolstream)
@ -14,8 +14,8 @@ else
  NEUTRINO_BRANCH ?= master
 endif

-LIBSTB-HAL_OBJ       = $(NI-LIBSTB-HAL)-obj
-LIBSTB-HAL_BUILD_DIR = $(BUILD_DIR)/$(LIBSTB-HAL_OBJ)
+LIBSTB_HAL_OBJ       = $(NI_LIBSTB_HAL)-obj
+LIBSTB_HAL_BUILD_DIR = $(BUILD_DIR)/$(LIBSTB_HAL_OBJ)

 # -----------------------------------------------------------------------------

@ -55,7 +55,7 @@ NEUTRINO_CFLAGS += -Wno-psabi

 # -----------------------------------------------------------------------------

-NEUTRINO_LDFLAGS  = $(CORTEX-STRINGS_LDFLAG)
+NEUTRINO_LDFLAGS  = $(CORTEX_STRINGS_LDFLAG)
 NEUTRINO_LDFLAGS += -L$(TARGET_base_libdir) -L$(TARGET_libdir)
 NEUTRINO_LDFLAGS += -Wl,-rpath,$(TARGET_libdir) -Wl,-rpath-link,$(TARGET_libdir)
 ifeq ($(DEBUG),yes)
@ -76,7 +76,7 @@ NEUTRINO_WEATHER_DEV_KEY ?=
 # -----------------------------------------------------------------------------

 NEUTRINO_CONF_ENV = \
-	$(MAKE_OPTS) \
+	$(TARGET_MAKE_OPTS) \
 	\
 	CFLAGS="$(NEUTRINO_CFLAGS)" \
 	CPPFLAGS="$(NEUTRINO_CFLAGS)" \
@ -91,8 +91,9 @@ NEUTRINO_CONF_ENV += \
 # -----------------------------------------------------------------------------

 NEUTRINO_CONF_OPTS = \
-	--host=$(TARGET) \
 	--build=$(BUILD) \
+	--host=$(TARGET) \
+	--target=$(TARGET) \
 	--prefix=$(prefix) \
 	--enable-maintainer-mode \
 	--enable-silent-rules \
@ -137,8 +138,8 @@ ifeq ($(BOXTYPE),coolstream)
 else
  NEUTRINO_DEPS += libstb-hal
  NEUTRINO_CONF_OPTS += \
-	--with-stb-hal-includes=$(SOURCE_DIR)/$(NI-LIBSTB-HAL)/include \
-	--with-stb-hal-build=$(LIBSTB-HAL_BUILD_DIR)
+	--with-stb-hal-includes=$(SOURCE_DIR)/$(NI_LIBSTB_HAL)/include \
+	--with-stb-hal-build=$(LIBSTB_HAL_BUILD_DIR)

  NEUTRINO_DEPS += graphlcd-base
  NEUTRINO_CONF_OPTS += --enable-graphlcd
@ -174,12 +175,12 @@ endif

 $(NEUTRINO_BUILD_DIR)/config.status: $(NEUTRINO_DEPS)
 	test -d $(NEUTRINO_BUILD_DIR) || mkdir -p $(NEUTRINO_BUILD_DIR)
-	$(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); \
+	$(CD) $(SOURCE_DIR)/$(NI_NEUTRINO); \
 		git checkout $(NEUTRINO_BRANCH)
-	$(SOURCE_DIR)/$(NI-NEUTRINO)/autogen.sh
+	$(SOURCE_DIR)/$(NI_NEUTRINO)/autogen.sh
 	$(CD) $(NEUTRINO_BUILD_DIR); \
 		$(NEUTRINO_CONF_ENV) \
-		$(SOURCE_DIR)/$(NI-NEUTRINO)/configure \
+		$(SOURCE_DIR)/$(NI_NEUTRINO)/configure \
 			$(NEUTRINO_CONF_OPTS)

 # -----------------------------------------------------------------------------
@ -197,20 +198,21 @@ $(TARGET_sysconfdir)/init.d/start_neutrino:

 # -----------------------------------------------------------------------------

-LIBSTB-HAL_DEPS  =
-LIBSTB-HAL_DEPS += ffmpeg
-LIBSTB-HAL_DEPS += openthreads
+LIBSTB_HAL_DEPS  =
+LIBSTB_HAL_DEPS += ffmpeg
+LIBSTB_HAL_DEPS += openthreads

 # -----------------------------------------------------------------------------

-LIBSTB-HAL_CONF_ENV = \
+LIBSTB_HAL_CONF_ENV = \
 	$(NEUTRINO_CONF_ENV)

 # -----------------------------------------------------------------------------

-LIBSTB-HAL_CONF_OPTS = \
-	--host=$(TARGET) \
+LIBSTB_HAL_CONF_OPTS = \
 	--build=$(BUILD) \
+	--host=$(TARGET) \
+	--target=$(TARGET) \
 	--prefix=$(prefix) \
 	--enable-maintainer-mode \
 	--enable-silent-rules \
@ -221,27 +223,27 @@ LIBSTB-HAL_CONF_OPTS = \
 	--with-boxtype=$(BOXTYPE)

 ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2))
-  LIBSTB-HAL_CONF_OPTS += --with-boxmodel=$(BOXSERIES)
+  LIBSTB_HAL_CONF_OPTS += --with-boxmodel=$(BOXSERIES)
 else
-  LIBSTB-HAL_CONF_OPTS += --with-boxmodel=$(BOXMODEL)
+  LIBSTB_HAL_CONF_OPTS += --with-boxmodel=$(BOXMODEL)
 endif

 # -----------------------------------------------------------------------------

-$(LIBSTB-HAL_BUILD_DIR)/config.status: $(LIBSTB-HAL_DEPS)
-	test -d $(LIBSTB-HAL_BUILD_DIR) || mkdir -p $(LIBSTB-HAL_BUILD_DIR)
-	$(SOURCE_DIR)/$(NI-LIBSTB-HAL)/autogen.sh
-	$(CD) $(LIBSTB-HAL_BUILD_DIR); \
-		$(LIBSTB-HAL_CONF_ENV) \
-		$(SOURCE_DIR)/$(NI-LIBSTB-HAL)/configure \
-			$(LIBSTB-HAL_CONF_OPTS)
+$(LIBSTB_HAL_BUILD_DIR)/config.status: $(LIBSTB_HAL_DEPS)
+	test -d $(LIBSTB_HAL_BUILD_DIR) || mkdir -p $(LIBSTB_HAL_BUILD_DIR)
+	$(SOURCE_DIR)/$(NI_LIBSTB_HAL)/autogen.sh
+	$(CD) $(LIBSTB_HAL_BUILD_DIR); \
+		$(LIBSTB_HAL_CONF_ENV) \
+		$(SOURCE_DIR)/$(NI_LIBSTB_HAL)/configure \
+			$(LIBSTB_HAL_CONF_OPTS)

 # -----------------------------------------------------------------------------

-libstb-hal: $(LIBSTB-HAL_BUILD_DIR)/config.status
-	$(MAKE) -C $(LIBSTB-HAL_BUILD_DIR)
-	$(MAKE) -C $(LIBSTB-HAL_BUILD_DIR) install DESTDIR=$(NEUTRINO_INST_DIR)
-	$(REWRITE_LIBTOOL_LA)
+libstb-hal: $(LIBSTB_HAL_BUILD_DIR)/config.status
+	$(MAKE) -C $(LIBSTB_HAL_BUILD_DIR)
+	$(MAKE) -C $(LIBSTB_HAL_BUILD_DIR) install DESTDIR=$(NEUTRINO_INST_DIR)
+	$(REWRITE_LIBTOOL)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -277,17 +279,17 @@ neutrino-clean-all: neutrino-clean
 # -----------------------------------------------------------------------------

 libstb-hal-uninstall:
-	-make -C $(LIBSTB-HAL_BUILD_DIR) uninstall DESTDIR=$(TARGET_DIR)
+	-make -C $(LIBSTB_HAL_BUILD_DIR) uninstall DESTDIR=$(TARGET_DIR)

 libstb-hal-distclean:
-	-make -C $(LIBSTB-HAL_BUILD_DIR) distclean
+	-make -C $(LIBSTB_HAL_BUILD_DIR) distclean

 libstb-hal-clean: libstb-hal-uninstall libstb-hal-distclean
-	rm -f $(LIBSTB-HAL_BUILD_DIR)/config.status
+	rm -f $(LIBSTB_HAL_BUILD_DIR)/config.status
 	rm -f $(DEPS_DIR)/libstb-hal

 libstb-hal-clean-all: libstb-hal-clean
-	rm -rf $(LIBSTB-HAL_BUILD_DIR)
+	rm -rf $(LIBSTB_HAL_BUILD_DIR)

 # -----------------------------------------------------------------------------

--- a/make/target-rootfs.mk
+++ b/make/target-rootfs.mk
@ -20,7 +20,7 @@ $(TARGET_DIR)/.version: | $(TARGET_DIR)
 	echo "describe=$$(git describe --always --long --tags | sed 's/-/./2')"	>> $(@)
 	echo "builddate=$$(date)"						>> $(@)
 	echo "box_model=$(BOXMODEL)"						>> $(@)
-	echo "creator=$(MAINTAINER)"						>> $(@)
+	echo "creator=$(TARGET_VENDOR), $(MAINTAINER)"				>> $(@)
 	echo "homepage=www.neutrino-images.de"					>> $(@)
 ifeq ($(BOXTYPE),$(filter $(BOXTYPE),armbox mipsbox))
 	echo "imagedir=$(IMAGE_SUBDIR)"						>> $(@)
@ -30,7 +30,7 @@ endif

 update.urls: $(TARGET_localstatedir)/etc/update.urls
 $(TARGET_localstatedir)/etc/update.urls: | $(TARGET_DIR)
-	echo "$(NI-SERVER)/update.php"				 > $(@)
+	echo "$(NI_SERVER)/update.php"				 > $(@)
 	echo "$(CHANNELLISTS_SITE)/$(CHANNELLISTS_MD5FILE)"	>> $(@)

 # -----------------------------------------------------------------------------
@ -122,14 +122,14 @@ rootfs-cleanup: $(ROOTFS)

 # -----------------------------------------------------------------------------

-ROOTFS-STRIP_BINS  = $(base_bindir)
-ROOTFS-STRIP_BINS += $(base_sbindir)
-ROOTFS-STRIP_BINS += $(bindir)
-ROOTFS-STRIP_BINS += $(sbindir)
-ROOTFS-STRIP_BINS += /usr/share/tuxbox/neutrino/plugins
+ROOTFS_STRIP_BINS  = $(base_bindir)
+ROOTFS_STRIP_BINS += $(base_sbindir)
+ROOTFS_STRIP_BINS += $(bindir)
+ROOTFS_STRIP_BINS += $(sbindir)
+ROOTFS_STRIP_BINS += /usr/share/tuxbox/neutrino/plugins

-ROOTFS-STRIP_LIBS  = $(base_libdir)
-ROOTFS-STRIP_LIBS += $(libdir)
+ROOTFS_STRIP_LIBS  = $(base_libdir)
+ROOTFS_STRIP_LIBS += $(libdir)

 # strip bins and libs in root filesystem
 rootfs-strip: $(ROOTFS)
@ -137,10 +137,10 @@ ifneq ($(DEBUG),yes)
 	$(call draw_line);
 	@echo "The following warnings from strip are harmless!"
 	$(call draw_line);
-	for dir in $(ROOTFS-STRIP_BINS); do \
+	for dir in $(ROOTFS_STRIP_BINS); do \
 		find $(ROOTFS)$${dir} -type f -print0 | xargs -0 $(TARGET_STRIP) || true; \
 	done
-	for dir in $(ROOTFS-STRIP_LIBS); do \
+	for dir in $(ROOTFS_STRIP_LIBS); do \
 		find $(ROOTFS)$${dir} \( \
 				-path $(ROOTFS)/lib/libnexus.so -o \
 				-path $(ROOTFS)/lib/libnxpl.so -o \
@ -168,7 +168,7 @@ get-update-info-hd2:
 	$(call draw_line);
 	@echo "Get update info for boxmodel $(BOXMODEL)"
 	@echo
-	@$(CD) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR); \
+	@$(CD) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR); \
 	if [ -e vmlinux.ub.gz ]; then \
 		dd status=none if=vmlinux.ub.gz bs=1 skip=$$(LC_ALL=C grep -a -b -o $$'\x1f\x8b\x08\x00\x00\x00\x00\x00' vmlinux.ub.gz \
 		| cut -d ':' -f 1) | zcat -q | grep -a "Linux version"; \
@ -185,7 +185,7 @@ get-update-info-hd1:
 	$(call draw_line);
 	@echo "Get update info for boxmodel $(BOXMODEL)"
 	@echo
-	@$(CD) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR); \
+	@$(CD) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR); \
 	if [ -e zImage ]; then \
 		dd if=zImage bs=1 skip=$$(LC_ALL=C grep -a -b -o $$'\x1f\x8b\x08\x00\x00\x00\x00\x00' zImage \
 		| cut -d ':' -f 1) | zcat -q | grep -a "Linux version"; \
--- a/make/target-tools-unused.mk
+++ b/make/target-tools-unused.mk
@ -12,29 +12,22 @@ USBUTILS_SITE   = $(KERNEL_MIRROR)/linux/utils/usb/usbutils
 $(DL_DIR)/$(USBUTILS_SOURCE):
 	$(DOWNLOAD) $(USBUTILS_SITE)/$(USBUTILS_SOURCE)

-USBUTILS_PATCH  = usbutils-avoid-dependency-on-bash.patch
-USBUTILS_PATCH += usbutils-fix-null-pointer-crash.patch
-
-USBUTILS_DEPS   = libusb-compat
+USBUTILS_DEPS = libusb-compat

 usbutils: $(USBUTILS_DEPS) $(DL_DIR)/$(USBUTILS_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(USBUTILS_DIR)
-	$(UNTAR)/$(USBUTILS_SOURCE)
-	$(CHDIR)/$(USBUTILS_DIR); \
-		$(call apply_patches,$(USBUTILS_PATCH)); \
-		$(CONFIGURE) \
-			--prefix=$(prefix) \
-			--mandir=$(REMOVE_mandir) \
-			--infodir=$(REMOVE_infodir) \
-			; \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
+		$(APPLY_PATCHES); \
+		$(CONFIGURE); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	rm -rf $(TARGET_bindir)/lsusb.py
 	rm -rf $(TARGET_bindir)/usbhid-dump
-	rm -rf $(TARGET_DIR)/sbin/update-usbids.sh
+	rm -rf $(TARGET_sbindir)/update-usbids.sh
 	rm -rf $(TARGET_datadir)/pkgconfig
 	rm -rf $(TARGET_datadir)/usb.ids.gz
-	$(REMOVE)/$(USBUTILS_DIR)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -47,51 +40,49 @@ BINUTILS_SITE   = $(GNU_MIRROR)/binutils
 $(DL_DIR)/$(BINUTILS_SOURCE):
 	$(DOWNLOAD) $(BINUTILS_SITE)/$(BINUTILS_SOURCE)

-BINUTILS_BIN    = objdump objcopy
+BINUTILS_CONF_OPTS = \
+	--disable-multilib \
+	--disable-werror \
+	--disable-plugins \
+	--enable-build-warnings=no \
+	--disable-sim \
+	--disable-gdb 
+
+BINUTILS_BINARIES = objdump objcopy

 binutils: $(DL_DIR)/$(BINUTILS_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(BINUTILS_DIR)
-	$(UNTAR)/$(BINUTILS_SOURCE)
-	$(CHDIR)/$(BINUTILS_DIR); \
-		$(CONFIGURE) \
-			--prefix=$(prefix) \
-			--disable-multilib \
-			--disable-werror \
-			--disable-plugins \
-			--enable-build-warnings=no \
-			--disable-sim \
-			--disable-gdb \
-			; \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
+		$(CONFIGURE); \
 		$(MAKE); \
-	for bin in $(BINUTILS_BIN); do \
-		$(INSTALL_EXEC) $(BUILD_DIR)/$(BINUTILS_DIR)/binutils/$$bin $(TARGET_bindir)/; \
+	for bin in $($(PKG)_BINARIES); do \
+		$(INSTALL_EXEC) $(BUILD_DIR)/$(PKG_DIR)/binutils/$$bin $(TARGET_bindir)/; \
 	done
-	$(REMOVE)/$(BINUTILS_DIR)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

-BASE-PASSWD_VER    = 3.5.29
-BASE-PASSWD_DIR    = base-passwd-$(BASE-PASSWD_VER)
-BASE-PASSWD_SOURCE = base-passwd_$(BASE-PASSWD_VER).tar.gz
-BASE-PASSWD_SITE   = https://launchpad.net/debian/+archive/primary/+files
+BASE_PASSWD_VER    = 3.5.29
+BASE_PASSWD_DIR    = base-passwd-$(BASE_PASSWD_VER)
+BASE_PASSWD_SOURCE = base-passwd_$(BASE_PASSWD_VER).tar.gz
+BASE_PASSWD_SITE   = https://launchpad.net/debian/+archive/primary/+files

-$(DL_DIR)/$(BASE-PASSWD_SOURCE):
-	$(DOWNLOAD) $(BASE-PASSWD_SITE)/$(BASE-PASSWD_SOURCE)
+$(DL_DIR)/$(BASE_PASSWD_SOURCE):
+	$(DOWNLOAD) $(BASE_PASSWD_SITE)/$(BASE_PASSWD_SOURCE)

-base-passwd: $(DL_DIR)/$(BASE-PASSWD_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(BASE-PASSWD_DIR)
-	$(UNTAR)/$(BASE-PASSWD_SOURCE)
-	$(CHDIR)/$(BASE-PASSWD_DIR); \
+base-passwd: $(DL_DIR)/$(BASE_PASSWD_SOURCE) | $(TARGET_DIR)
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
 		$(APPLY_PATCHES); \
-		$(CONFIGURE) \
-			--prefix=$(prefix) \
-			; \
+		$(CONFIGURE); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(INSTALL_DATA) -D $(PKG_BUILD_DIR)/group.master $(TARGET_datadir)/base-passwd/group.master
 	$(INSTALL_DATA) -D $(PKG_BUILD_DIR)/passwd.master $(TARGET_datadir)/base-passwd/passwd.master
-	$(REMOVE)/$(BASE-PASSWD_DIR)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -104,44 +95,69 @@ SHADOW_SITE   = https://github.com/shadow-maint/shadow/releases/download/$(SHADO
 $(DL_DIR)/$(SHADOW_SOURCE):
 	$(DOWNLOAD) $(SHADOW_SITE)/$(SHADOW_SOURCE)

+SHADOW_CONF_OPTS = \
+	--prefix=$(base_prefix) \
+	--datarootdir=$(REMOVE_base_datarootdir)
+
 shadow: $(DL_DIR)/$(SHADOW_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(SHADOW_DIR)
-	$(UNTAR)/$(SHADOW_SOURCE)
-	$(CHDIR)/$(SHADOW_DIR); \
-		$(CONFIGURE) \
-			--prefix=$(base_prefix) \
-			--datarootdir=$(REMOVE_base_datarootdir) \
-			; \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
+		$(CONFIGURE); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(SED) 's|SHELL=.*|SHELL=/bin/sh|' $(TARGET_sysconfdir)/default/useradd
 	mkdir -p $(TARGET_sysconfdir)/skel
-	$(REMOVE)/$(SHADOW_DIR)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

-ASTRA-SM_VER    = git
-ASTRA-SM_DIR    = astra-sm.$(ASTRA-SM_VER)
-ASTRA-SM_SOURCE = astra-sm.$(ASTRA-SM_VER)
-ASTRA-SM_SITE   = https://gitlab.com/crazycat69
+BZIP2_VER    = 1.0.8
+BZIP2_DIR    = bzip2-$(BZIP2_VER)
+BZIP2_SOURCE = bzip2-$(BZIP2_VER).tar.gz
+BZIP2_SITE   = https://sourceware.org/pub/bzip2
+
+$(DL_DIR)/$(BZIP2_SOURCE):
+	$(DOWNLOAD) $(BZIP2_SITE)/$(BZIP2_SOURCE)

-ASTRA-SM_DEPS   = openssl
+bzip2: $(DL_DIR)/$(BZIP2_SOURCE) | $(TARGET_DIR)
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
+		$(APPLY_PATCHES); \
+		mv Makefile-libbz2_so Makefile; \
+		$(TARGET_CONFIGURE_ENV) \
+		$(MAKE); \
+		$(MAKE) install PREFIX=$(TARGET_prefix)
+	rm -f $(TARGET_bindir)/bzip2
+	$(REMOVE)/$(PKG_DIR)
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

-astra-sm: $(ASTRA-SM_DEPS) | $(TARGET_DIR)
-	$(REMOVE)/$(ASTRA-SM_DIR)
-	$(GET-GIT-SOURCE) $(ASTRA-SM_SITE)/$(ASTRA-SM_SOURCE) $(DL_DIR)/$(ASTRA-SM_SOURCE)
-	$(CPDIR)/$(ASTRA-SM_SOURCE)
-	$(CHDIR)/$(ASTRA-SM_DIR); \
-		autoreconf -fi; \
+ASTRA_SM_VER    = git
+ASTRA_SM_DIR    = astra-sm.$(ASTRA_SM_VER)
+ASTRA_SM_SOURCE = astra-sm.$(ASTRA_SM_VER)
+ASTRA_SM_SITE   = https://gitlab.com/crazycat69
+
+ASTRA_SM_DEPS = openssl
+
+ASTRA_SM_AUTORECONF = YES
+
+ASTRA_SM_CONF_OPTS = \
+	--without-lua
+
+astra-sm: $(ASTRA_SM_DEPS) | $(TARGET_DIR)
+	$(REMOVE)/$(ASTRA_SM_DIR)
+	$(GET-GIT-SOURCE) $(ASTRA_SM_SITE)/$(ASTRA_SM_SOURCE) $(DL_DIR)/$(ASTRA_SM_SOURCE)
+	$(CPDIR)/$(ASTRA_SM_SOURCE)
+	$(CHDIR)/$(ASTRA_SM_DIR); \
 		sed -i 's:(CFLAGS):(CFLAGS_FOR_BUILD):' tools/Makefile.am; \
-		$(CONFIGURE) \
-			--prefix=$(prefix) \
-			--sysconfdir=$(sysconfdir) \
-			--without-lua \
-			; \
+		$(CONFIGURE); \
+		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REMOVE)/$(ASTRA-SM_DIR)
+	$(REMOVE)/$(ASTRA_SM_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -155,15 +171,15 @@ $(DL_DIR)/$(IOZONE_SOURCE):
 	$(DOWNLOAD) $(IOZONE_SITE)/$(IOZONE_SOURCE)

 iozone: $(DL_DIR)/$(IOZONE_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(IOZONE_DIR)
-	$(UNTAR)/$(IOZONE_SOURCE)
-	$(CHDIR)/$(IOZONE_DIR)/src/current; \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR)/src/current; \
 		$(SED) "s/= gcc/= $(TARGET_CC)/" makefile; \
 		$(SED) "s/= cc/= $(TARGET_CC)/" makefile; \
-		$(MAKE_ENV) \
+		$(TARGET_CONFIGURE_ENV) \
 		$(MAKE) linux-arm; \
-		$(INSTALL_EXEC) iozone $(TARGET_bindir)/
-	$(REMOVE)/$(IOZONE_DIR)
+		$(INSTALL_EXEC) -D iozone $(TARGET_bindir)/iozone
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -176,92 +192,89 @@ READLINE_SITE   = $(GNU_MIRROR)/readline
 $(DL_DIR)/$(READLINE_SOURCE):
 	$(DOWNLOAD) $(READLINE_SITE)/$(READLINE_SOURCE)

+READLINE_CONF_OPTS = \
+	--datarootdir=$(REMOVE_datarootdir)
+
 readline: $(DL_DIR)/$(READLINE_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(READLINE_DIR)
-	$(UNTAR)/$(READLINE_SOURCE)
-	$(CHDIR)/$(READLINE_DIR); \
-		$(CONFIGURE) \
-			--prefix=$(prefix) \
-			--datarootdir=$(REMOVE_datarootdir) \
-			; \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR); \
+		$(CONFIGURE); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REMOVE)/$(READLINE_DIR)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

 LIBZEN_VER    = 0.4.38
-LIBZEN_TMP    = ZenLib
+LIBZEN_DIR    = ZenLib
 LIBZEN_SOURCE = libzen_$(LIBZEN_VER).tar.bz2
 LIBZEN_SITE   = https://mediaarea.net/download/source/libzen/$(LIBZEN_VER)

 $(DL_DIR)/$(LIBZEN_SOURCE):
 	$(DOWNLOAD) $(LIBZEN_SITE)/$(LIBZEN_SOURCE)

-LIBZEN_DEPS   = zlib
+LIBZEN_DEPS = zlib
+
+LIBZEN_AUTORECONF = YES

 libzen: $(LIBZEN_DEPS) $(DL_DIR)/$(LIBZEN_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(LIBZEN_TMP)
-	$(UNTAR)/$(LIBZEN_SOURCE)
-	$(CHDIR)/$(LIBZEN_TMP)/Project/GNU/Library; \
-		autoreconf -fi; \
-		$(CONFIGURE) \
-			--prefix=$(prefix) \
-			; \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR)/Project/GNU/Library; \
+		$(CONFIGURE); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_LIBTOOL_LA)
-	$(REMOVE)/$(LIBZEN_TMP)
+	$(REWRITE_LIBTOOL)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

 LIBMEDIAINFO_VER    = 20.08
-LIBMEDIAINFO_TMP    = MediaInfoLib
+LIBMEDIAINFO_DIR    = MediaInfoLib
 LIBMEDIAINFO_SOURCE = libmediainfo_$(LIBMEDIAINFO_VER).tar.bz2
 LIBMEDIAINFO_SITE   = https://mediaarea.net/download/source/libmediainfo/$(LIBMEDIAINFO_VER)

 $(DL_DIR)/$(LIBMEDIAINFO_SOURCE):
 	$(DOWNLOAD) $(LIBMEDIAINFO_SITE)/$(LIBMEDIAINFO_SOURCE)

-LIBMEDIAINFO_DEPS   = libzen
+LIBMEDIAINFO_DEPS = libzen
+
+LIBMEDIAINFO_AUTORECONF = YES

 libmediainfo: $(LIBMEDIAINFO_DEPS) $(DL_DIR)/$(LIBMEDIAINFO_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(LIBMEDIAINFO_TMP)
-	$(UNTAR)/$(LIBMEDIAINFO_SOURCE)
-	$(CHDIR)/$(LIBMEDIAINFO_TMP)/Project/GNU/Library; \
-		autoreconf -fi; \
-		$(CONFIGURE) \
-			--prefix=$(prefix) \
-			; \
+	$(REMOVE)/$(PKG_DIR)
+	$(UNTAR)/$(PKG_SOURCE)
+	$(CHDIR)/$(PKG_DIR)/Project/GNU/Library; \
+		$(CONFIGURE); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_LIBTOOL_LA)
-	$(REMOVE)/$(LIBMEDIAINFO_TMP)
+	$(REWRITE_LIBTOOL)
+	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

 MEDIAINFO_VER    = 20.08
-MEDIAINFO_TMP    = MediaInfo
+MEDIAINFO_DIR    = MediaInfo
 MEDIAINFO_SOURCE = mediainfo_$(MEDIAINFO_VER).tar.bz2
 MEDIAINFO_SITE   = https://mediaarea.net/download/source/mediainfo/$(MEDIAINFO_VER)

 $(DL_DIR)/$(MEDIAINFO_SOURCE):
 	$(DOWNLOAD) $(MEDIAINFO_SITE)/$(MEDIAINFO_SOURCE)

-MEDIAINFO_DEPS   = libmediainfo
+MEDIAINFO_DEPS = libmediainfo
+
+MEDIAINFO_AUTORECONF = YES

 mediainfo: $(MEDIAINFO_DEPS) $(DL_DIR)/$(MEDIAINFO_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(MEDIAINFO_TMP)
+	$(REMOVE)/$(MEDIAINFO_DIR)
 	$(UNTAR)/$(MEDIAINFO_SOURCE)
-	$(CHDIR)/$(MEDIAINFO_TMP)/Project/GNU/CLI; \
-		autoreconf -fi; \
-		$(CONFIGURE) \
-			--prefix=$(prefix) \
-			; \
+	$(CHDIR)/$(MEDIAINFO_DIR)/Project/GNU/CLI; \
+		$(CONFIGURE); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REMOVE)/$(MEDIAINFO_TMP)
+	$(REMOVE)/$(MEDIAINFO_DIR)
 	$(TOUCH)
--- a/make/target-tools.mk
+++ b/make/target-tools.mk
--- a/package/alsa-lib/patches/0000-alsa_pc_in.patch
+++ b/package/alsa-lib/patches/0000-alsa_pc_in.patch
--- a/package/alsa-lib/patches/0001-Don-t-use-fork-on-noMMU-platforms.patch
+++ b/package/alsa-lib/patches/0001-Don-t-use-fork-on-noMMU-platforms.patch
--- a/package/autofs/patches/0000-force-STRIP-to-emtpy.patch
+++ b/package/autofs/patches/0000-force-STRIP-to-emtpy.patch
--- a/package/base-passwd/patches/0000-align-root.patch
+++ b/package/base-passwd/patches/0000-align-root.patch
--- a/package/base-passwd/patches/0005-disable-docs.patch
+++ b/package/base-passwd/patches/0005-disable-docs.patch
--- a/package/bash/patches/bash50-001
+++ b/package/bash/patches/bash50-001
--- a/package/bash/patches/bash50-002
+++ b/package/bash/patches/bash50-002
--- a/package/bash/patches/bash50-003
+++ b/package/bash/patches/bash50-003
--- a/package/bash/patches/bash50-004
+++ b/package/bash/patches/bash50-004
--- a/package/bash/patches/bash50-005
+++ b/package/bash/patches/bash50-005
--- a/package/bash/patches/bash50-006
+++ b/package/bash/patches/bash50-006
--- a/package/bash/patches/bash50-007
+++ b/package/bash/patches/bash50-007
--- a/package/bash/patches/bash50-008
+++ b/package/bash/patches/bash50-008
--- a/package/bash/patches/bash50-009
+++ b/package/bash/patches/bash50-009
--- a/package/bash/patches/bash50-010
+++ b/package/bash/patches/bash50-010
--- a/package/bash/patches/bash50-011
+++ b/package/bash/patches/bash50-011
--- a/package/bash/patches/bash50-012
+++ b/package/bash/patches/bash50-012
--- a/package/bash/patches/bash50-013
+++ b/package/bash/patches/bash50-013
--- a/package/bash/patches/bash50-014
+++ b/package/bash/patches/bash50-014
--- a/package/bash/patches/bash50-015
+++ b/package/bash/patches/bash50-015
--- a/package/bash/patches/bash50-016
+++ b/package/bash/patches/bash50-016
--- a/package/bash/patches/bash50-017
+++ b/package/bash/patches/bash50-017
--- a/package/busybox/files/busybox-minimal.config
+++ b/package/busybox/files/busybox-minimal.config
--- a/package/busybox/patches/busybox-fix-config-header.diff
+++ b/package/busybox/patches/busybox-fix-config-header.diff
--- a/package/busybox/patches/busybox-fix-partition-size.patch
+++ b/package/busybox/patches/busybox-fix-partition-size.patch
--- a/package/busybox/patches/busybox-insmod-hack.patch
+++ b/package/busybox/patches/busybox-insmod-hack.patch
--- a/package/busybox/patches/busybox-mount_single_uuid.patch
+++ b/package/busybox/patches/busybox-mount_single_uuid.patch
--- a/package/bzip2/patches/bzip2.patch
+++ b/package/bzip2/patches/bzip2.patch
--- a/package/cairo/patches/cairo-get_bitmap_surface.diff
+++ b/package/cairo/patches/cairo-get_bitmap_surface.diff
--- a/package/coreutils/patches/coreutils-fix-build.patch
+++ b/package/coreutils/patches/coreutils-fix-build.patch
--- a/package/crosstool-ng/files/ct-ng-armbox.config
+++ b/package/crosstool-ng/files/ct-ng-armbox.config
--- a/package/crosstool-ng/files/ct-ng-coolstream-hd1.config
+++ b/package/crosstool-ng/files/ct-ng-coolstream-hd1.config
--- a/package/crosstool-ng/files/ct-ng-coolstream-hd2.config
+++ b/package/crosstool-ng/files/ct-ng-coolstream-hd2.config
--- a/package/crosstool-ng/files/ct-ng-mipsbox.config
+++ b/package/crosstool-ng/files/ct-ng-mipsbox.config
--- a/package/crosstool-ng/files/ct-ng-uClibc-1.0.24.config
+++ b/package/crosstool-ng/files/ct-ng-uClibc-1.0.24.config
--- a/package/crosstool-ng/patches/crosstool-ng-bash-version.patch
+++ b/package/crosstool-ng/patches/crosstool-ng-bash-version.patch
--- a/package/crosstool-ng/patches/gcc/999-gcc-6.3-backport-fix-of-check-for-empty-string-in-ubsan.c.patch
+++ b/package/crosstool-ng/patches/gcc/999-gcc-6.3-backport-fix-of-check-for-empty-string-in-ubsan.c.patch
--- a/package/djmount/patches/djmount-fix-hang-with-asset-upnp.patch
+++ b/package/djmount/patches/djmount-fix-hang-with-asset-upnp.patch
--- a/package/djmount/patches/djmount-fix-incorrect-range-when-retrieving-content-via-HTTP.patch
+++ b/package/djmount/patches/djmount-fix-incorrect-range-when-retrieving-content-via-HTTP.patch
--- a/package/djmount/patches/djmount-fix-new-autotools.diff
+++ b/package/djmount/patches/djmount-fix-new-autotools.diff
--- a/package/djmount/patches/djmount-fix-newer-gcc.patch
+++ b/package/djmount/patches/djmount-fix-newer-gcc.patch
--- a/package/djmount/patches/djmount-fixed-crash-when-using-UTF-8-charset.patch
+++ b/package/djmount/patches/djmount-fixed-crash-when-using-UTF-8-charset.patch
--- a/package/djmount/patches/djmount-fixed-crash.patch
+++ b/package/djmount/patches/djmount-fixed-crash.patch
--- a/package/djmount/patches/djmount-support-fstab-mounting.diff
+++ b/package/djmount/patches/djmount-support-fstab-mounting.diff
--- a/package/djmount/patches/djmount-support-seeking-in-large-2gb-files.patch
+++ b/package/djmount/patches/djmount-support-seeking-in-large-2gb-files.patch
--- a/package/dosfstools/patches/switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch
+++ b/package/dosfstools/patches/switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch
--- a/package/dvb-apps/patches/0001-Fix-generate-keynames.patch
+++ b/package/dvb-apps/patches/0001-Fix-generate-keynames.patch
--- a/package/dvb-apps/patches/0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch
+++ b/package/dvb-apps/patches/0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch
--- a/package/dvb-apps/patches/0003-handle-static-shared-only-build.patch
+++ b/package/dvb-apps/patches/0003-handle-static-shared-only-build.patch
--- a/package/dvb-apps/patches/0004-Makefile-remove-test.patch
+++ b/package/dvb-apps/patches/0004-Makefile-remove-test.patch
--- a/package/dvb-apps/patches/0005-libucsi-optimization-removal.patch
+++ b/package/dvb-apps/patches/0005-libucsi-optimization-removal.patch
--- a/package/dvb-apps/patches/0006-CA_SET_PID.patch
+++ b/package/dvb-apps/patches/0006-CA_SET_PID.patch
--- a/package/expat/patches/expat-libtool-tag.patch
+++ b/package/expat/patches/expat-libtool-tag.patch
--- a/package/ext4_utils/patches/ext4_utils.mk
+++ b/package/ext4_utils/patches/ext4_utils.mk
--- a/package/fbshot/patches/fbshot-32bit_cs_fb.diff
+++ b/package/fbshot/patches/fbshot-32bit_cs_fb.diff
--- a/package/fbshot/patches/fbshot_cs_hd2.diff
+++ b/package/fbshot/patches/fbshot_cs_hd2.diff
--- a/package/ffmpeg/patches/4_02_fix_mpegts.patch
+++ b/package/ffmpeg/patches/4_02_fix_mpegts.patch
--- a/package/ffmpeg/patches/4_03_allow_to_choose_rtmp_impl_at_runtime.patch
+++ b/package/ffmpeg/patches/4_03_allow_to_choose_rtmp_impl_at_runtime.patch
--- a/package/ffmpeg/patches/4_04_hls_replace_key_uri.patch
+++ b/package/ffmpeg/patches/4_04_hls_replace_key_uri.patch
--- a/package/ffmpeg/patches/4_06_optimize_aac.patch
+++ b/package/ffmpeg/patches/4_06_optimize_aac.patch
--- a/package/ffmpeg/patches/4_07_increase_buffer_size.patch
+++ b/package/ffmpeg/patches/4_07_increase_buffer_size.patch
--- a/package/ffmpeg/patches/4_08_recheck_discard_flags.patch
+++ b/package/ffmpeg/patches/4_08_recheck_discard_flags.patch
--- a/package/ffmpeg/patches/4_09_ffmpeg_fix_edit_list_parsing.patch
+++ b/package/ffmpeg/patches/4_09_ffmpeg_fix_edit_list_parsing.patch
--- a/package/ffmpeg/patches/4_10_rtsp_patch
+++ b/package/ffmpeg/patches/4_10_rtsp_patch
--- a/package/ffmpeg/patches/4_11_dxva2_patch
+++ b/package/ffmpeg/patches/4_11_dxva2_patch
--- a/package/ffmpeg/patches/4_A02-corrupt-h264-frames.patch
+++ b/package/ffmpeg/patches/4_A02-corrupt-h264-frames.patch
--- a/package/ffmpeg/patches/4_A11-FFmpeg-devel-amfenc-Add-support-for-pict_type-field.patch
+++ b/package/ffmpeg/patches/4_A11-FFmpeg-devel-amfenc-Add-support-for-pict_type-field.patch
--- a/package/ffmpeg/patches/4_mips64_cpu_detection.patch
+++ b/package/ffmpeg/patches/4_mips64_cpu_detection.patch