- remove $(FLAVOUR) and $(N_HD_SOURCE) variables

make/environment.mk

@@ -130,7 +130,6 @@ endif
 MAKEFLAGS += --no-print-directory
 
 MAINTAINER   ?= NI-Team
-FLAVOUR      ?= ni-neutrino-hd
 WHOAMI       := $(shell id -un)
 ARCHIVE       = $(BASE_DIR)/download
 BUILD_TMP     = $(BASE_DIR)/build_tmp
@@ -161,7 +160,7 @@ STATIC_LIB_DIR = $(STATIC_DIR)/lib
 TARGET_LIB_DIR = $(TARGET_DIR)/lib
 TARGET_INCLUDE_DIR = $(TARGET_DIR)/include
 
-# certificates
+# ca-certificates
 CA_BUNDLE	= ca-certificates.crt
 CA_BUNDLE_DIR	= /etc/ssl/certs
 
@@ -241,7 +240,6 @@ TERM_YELLOW	= \033[40;0;33m
 TERM_YELLOW_BOLD= \033[40;1;33m
 TERM_NORMAL	= \033[0m
 
-N_HD_SOURCE ?= $(SOURCE_DIR)/$(FLAVOUR)
 USE_LIBSTB-HAL = no
 ifneq ($(BOXTYPE), coolstream)
   USE_LIBSTB-HAL = yes

make/image-update.mk

@@ -195,11 +195,11 @@ pathauf_HD-19:
 	done
 	# sync sat-names with current satellites.xml
 	# Astra 19.2
-	A192=`grep 'position=\"192\"' $(N_HD_SOURCE)/data/satellites.xml`; \
+	A192=`grep 'position=\"192\"' $(SOURCE_DIR)/$(NI_NEUTRINO)/data/satellites.xml`; \
 	A192=`echo $$A192`; \
 	sed -i "/position=\"192\"/c\	$$A192" $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/services.xml
 	# Hotbird 13.0
-	H130=`grep 'position=\"130\"' $(N_HD_SOURCE)/data/satellites.xml`; \
+	H130=`grep 'position=\"130\"' $(SOURCE_DIR)/$(NI_NEUTRINO)/data/satellites.xml`; \
 	H130=`echo $$H130`; \
 	sed -i "/position=\"130\"/c\	$$H130" $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/services.xml
 	#

make/neutrino.mk

@@ -97,21 +97,22 @@ N_BUILDENV = \
 	CXXFLAGS="$(N_CFLAGS)" \
 	LDFLAGS="$(N_LDFLAGS)"
 
-# finally we can build outside of the source directory
-N_OBJDIR = $(BUILD_TMP)/$(FLAVOUR)
+# -----------------------------------------------------------------------------
+
+N_OBJDIR = $(BUILD_TMP)/$(NI_NEUTRINO)
 LH_OBJDIR = $(BUILD_TMP)/$(NI_LIBSTB-HAL-NEXT)
 
 $(N_OBJDIR)/config.status: $(N_DEPS) $(MAKE_DIR)/neutrino.mk
 	test -d $(N_OBJDIR) || mkdir -p $(N_OBJDIR)
-	cd $(N_HD_SOURCE) && \
+	cd $(SOURCE_DIR)/$(NI_NEUTRINO) && \
 		git checkout $(NI_NEUTRINO_BRANCH)
-	$(N_HD_SOURCE)/autogen.sh
+	$(SOURCE_DIR)/$(NI_NEUTRINO)/autogen.sh
 	pushd $(N_OBJDIR) && \
 		test -e version.h || touch version.h && \
 		export PKG_CONFIG=$(PKG_CONFIG) && \
 		export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) && \
 		$(N_BUILDENV) \
-		$(N_HD_SOURCE)/configure \
+		$(SOURCE_DIR)/$(NI_NEUTRINO)/configure \
 			--host=$(TARGET) \
 			--build=$(BUILD) \
 			--prefix= \
@@ -171,6 +172,8 @@ $(LH_OBJDIR)/config.status: $(LH_DEPS)
 			--with-target=cdk \
 			--with-boxtype=$(BOXMODEL)
 
+# -----------------------------------------------------------------------------
+
 NEUTRINO_INST_DIR ?= $(TARGET_DIR)
 $(D)/neutrino: $(N_OBJDIR)/config.status
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
@@ -186,6 +189,8 @@ $(D)/libstb-hal: $(LH_OBJDIR)/config.status
 	$(REWRITE_LIBTOOL)/libstb-hal.la
 	$(TOUCH)
 
+# -----------------------------------------------------------------------------
+
 neutrino-bin:
 ifeq ($(CLEAN), yes)
 	$(MAKE) neutrino-clean
@@ -199,6 +204,8 @@ ifneq ($(DEBUG), yes)
 endif
 	make done
 
+# -----------------------------------------------------------------------------
+
 neutrino-clean:
 	-make -C $(N_OBJDIR) uninstall
 	-make -C $(N_OBJDIR) distclean

make/plugins-extra.mk

@@ -62,7 +62,7 @@ $(BIN)/convert:
 logoview: $(SOURCE_DIR)/$(TUXBOX_PLUGINS) $(D)/neutrino $(BIN)/logoview
 $(BIN)/logoview: $(BIN)
 	pushd $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/logoview && \
-	$(MAKE) logoview CROSS_CDK=$(CROSS_DIR) BUILDSYSTEM=$(BASE_DIR) N_HD_SOURCE=$(N_HD_SOURCE) TARGET=$(TARGET) && \
+	$(MAKE) logoview CROSS_CDK=$(CROSS_DIR) BUILDSYSTEM=$(BASE_DIR) N_HD_SOURCE=$(SOURCE_DIR)/$(NI_NEUTRINO) TARGET=$(TARGET) && \
 	install -m755 logoview $@ && \
 	$(MAKE) clean
 

make/prerequisites.mk

@@ -6,7 +6,7 @@ TOOLCHECK += find-yacc find-flex find-tic find-pkg-config find-help2man
 TOOLCHECK += find-cmake find-ccache find-autopoint find-python find-curl
 TOOLCHECK += find-lzma find-gperf find-gettext find-bc
 
-preqs: download neutrino-hd-source ni-git
+preqs: download ni-git
 
 $(CCACHE):
 	@echo
@@ -25,14 +25,14 @@ download:
 	@echo
 	@false
 
-$(N_HD_SOURCE):
+$(SOURCE_DIR)/$(NI_NEUTRINO):
 	@echo ' ============================================================================== '
 	@echo "                          Cloning ni-neutrino-hd git repo"
 	@echo "                 	and creating remote repo '$(TUXBOX_REMOTE_REPO)'"
 	@echo ' ============================================================================== '
 	mkdir -p $(SOURCE_DIR)
 	cd $(SOURCE_DIR) && \
-		git clone $(NI_GIT)/$(NI_NEUTRINO).git $(FLAVOUR)
+		git clone $(NI_GIT)/$(notdir $@).git
 	pushd $@ && \
 		git remote add $(TUXBOX_REMOTE_REPO) $(TUXBOX_GIT)/$(TUXBOX_NEUTRINO).git && \
 		git fetch $(TUXBOX_REMOTE_REPO)
@@ -181,17 +181,16 @@ find-%:
 toolcheck: $(TOOLCHECK)
 	@echo "All required tools seem to be installed."
 
-neutrino-hd-source: $(N_HD_SOURCE)
-
 ni-git: \
 	$(BUILD-GENERIC-PC) \
 	$(SOURCE_DIR)/$(NI_DRIVERS-BIN) \
 	$(SOURCE_DIR)/$(NI_FFMPEG) \
 	$(SOURCE_DIR)/$(NI_LIBCOOLSTREAM) \
-	$(SOURCE_DIR)/$(NI_LIBSTB-HAL) \
 	$(SOURCE_DIR)/$(NI_LIBSTB-HAL-NEXT) \
+	$(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) \

make/rootfs.mk

@@ -7,15 +7,15 @@ rootfs: .version update.urls $(BOX) cleanup strip softlinks
 $(TARGET_DIR)/.version:
 	echo "version="$(IMAGE_TYPE)$(IMAGE_VERSION)$(IMAGE_DATE) > $@
 	# determinate last NI-release-tag an use this to git describe
-	GITTAG=`cd $(N_HD_SOURCE); git tag -l "NI-*" | tail -n1`; \
-	GITDESCRIBE=`cd $(N_HD_SOURCE); git describe --always --dirty --tags --match $$GITTAG`; \
+	GITTAG=`cd $(SOURCE_DIR)/$(NI_NEUTRINO); git tag -l "NI-*" | tail -n1`; \
+	GITDESCRIBE=`cd $(SOURCE_DIR)/$(NI_NEUTRINO); git describe --always --dirty --tags --match $$GITTAG`; \
 	GITDESCRIBE=$${GITDESCRIBE%-dirty}; \
 	echo "describe="$$GITDESCRIBE				>> $@
 	# determinate current branch in origin repo
-	BRANCH=`cd $(N_HD_SOURCE); git branch --no-color 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'`; \
+	BRANCH=`cd $(SOURCE_DIR)/$(NI_NEUTRINO); git branch --no-color 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'`; \
 	echo "branch="$$BRANCH					>> $@
 	# determinate last commit in origin repo
-	COMMIT=`cd $(N_HD_SOURCE); git fetch origin; git show origin/$(NI_NEUTRINO_BRANCH) --stat | grep ^commit | cut -d' ' -f2 | cut -c1-7`; \
+	COMMIT=`cd $(SOURCE_DIR)/$(NI_NEUTRINO); git fetch origin; git show origin/$(NI_NEUTRINO_BRANCH) --stat | grep ^commit | cut -d' ' -f2 | cut -c1-7`; \
 	echo "commit="$$COMMIT					>> $@
 	echo "builddate="`date`					>> $@
 	echo "creator=$(MAINTAINER)"				>> $@

make/update.mk

@@ -9,7 +9,7 @@ endif
 
 update-neutrino:
 	export GIT_MERGE_AUTOEDIT=no && \
-	cd $(N_HD_SOURCE) && \
+	cd $(SOURCE_DIR)/$(NI_NEUTRINO) && \
 		git checkout $(NI_NEUTRINO_BRANCH) && \
 		git pull origin $(NI_NEUTRINO_BRANCH) && \
 		git fetch
@@ -17,7 +17,7 @@ update-neutrino:
 update-remotes:
 ifeq ($(NI_ADMIN), true)
 	export GIT_MERGE_AUTOEDIT=no && \
-	cd $(N_HD_SOURCE) && \
+	cd $(SOURCE_DIR)/$(NI_NEUTRINO) && \
 		git checkout $(NI_NEUTRINO_BRANCH) && \
 		#git pull $(TUXBOX_REMOTE_REPO) $(TUXBOX_NEUTRINO_BRANCH) && \
 		git fetch $(TUXBOX_REMOTE_REPO)
@@ -74,7 +74,7 @@ push:
 ifeq ($(HAS_INTERNALS), yes)
 	cd $(BASE_DIR)/$(NI_INTERNALS) && git push
 endif
-	cd $(N_HD_SOURCE) && git push
+	cd $(SOURCE_DIR)/$(NI_NEUTRINO) && git push
 	cd $(BUILD-GENERIC-PC) && git push
 	cd $(SOURCE_DIR)/$(NI_DRIVERS-BIN) && git push
 	cd $(SOURCE_DIR)/$(NI_FFMPEG) && git push