From 280acb09974e54d56315d888ca0302792fdce77b Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 14 Jul 2019 23:36:55 +0200 Subject: [PATCH] - rename NI variables --- make/bootstrap.mk | 20 ++++----- make/crosstool.mk | 2 +- make/environment-build.mk | 38 ++++++++--------- make/image-updates.mk | 28 ++++++------- make/linux-kernel.mk | 12 +++--- make/neutrino-plugins.mk | 24 +++++------ make/neutrino.mk | 18 ++++---- make/ni.mk | 4 +- make/prerequisites.mk | 66 +++++++++++++++--------------- make/target-ffmpeg-coolstream.mk | 14 +++---- make/target-libs.mk | 20 ++++----- make/target-rootfs.mk | 2 +- make/target-tools.mk | 32 +++++++-------- make/update.mk | 70 ++++++++++++++++---------------- 14 files changed, 175 insertions(+), 175 deletions(-) diff --git a/make/bootstrap.mk b/make/bootstrap.mk index 35e244cc..8bd4e689 100644 --- a/make/bootstrap.mk +++ b/make/bootstrap.mk @@ -84,14 +84,14 @@ $(TARGET_BIN_DIR): | $(TARGET_DIR) $(TARGET_INCLUDE_DIR): | $(TARGET_DIR) mkdir -p $@ ifeq ($(BOXTYPE), armbox) - cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/include/. $@ + cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/include/. $@ endif $(TARGET_LIB_DIR): | $(TARGET_DIR) mkdir -p $@ - cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib/. $@ + cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib/. $@ ifeq ($(BOXTYPE), coolstream) - cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/libcoolstream/$(shell echo -n $(NI_FFMPEG_BRANCH) | sed 's,/,-,g')/. $@ + cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/libcoolstream/$(shell echo -n $(NI-FFMPEG_BRANCH) | sed 's,/,-,g')/. $@ ifeq ($(BOXSERIES), hd1) ln -sf libnxp.so $@/libconexant.so endif @@ -99,13 +99,13 @@ endif $(TARGET_LIB_DIR)/firmware: | $(TARGET_DIR) mkdir -p $@ - cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib-firmware/. $@ - cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib-firmware-dvb/. $@ - cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib-firmware-rt/. $@ + cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib-firmware/. $@ + cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib-firmware-dvb/. $@ + cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib-firmware-rt/. $@ $(TARGET_LIB_DIR)/modules: | $(TARGET_DIR) mkdir -p $@ - cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib-modules/$(KERNEL_VERSION) $@ + cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib-modules/$(KERNEL_VERSION) $@ ifeq ($(BOXMODEL), nevis) ln -sf $(KERNEL_VERSION) $@/$(KERNEL_VERSION)-$(BOXMODEL) endif @@ -119,11 +119,11 @@ $(STATIC_LIB_DIR): | $(TARGET_DIR) $(TARGET_DIR)/var/update: | $(TARGET_DIR) mkdir -p $@ ifeq ($(BOXTYPE), coolstream) - cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/uldr.bin $@ + cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/uldr.bin $@ ifeq ($(BOXMODEL), kronos_v2) - cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/u-boot.bin.kronos_v2 $@/u-boot.bin + cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/u-boot.bin.kronos_v2 $@/u-boot.bin else - cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/u-boot.bin $@ + cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/u-boot.bin $@ endif endif diff --git a/make/crosstool.mk b/make/crosstool.mk index 11fcadb3..53af0935 100644 --- a/make/crosstool.mk +++ b/make/crosstool.mk @@ -49,7 +49,7 @@ kernel-tarball: $(BUILD_TMP)/linux-$(KERNEL_VERSION).tar # create kernel-tarball $(BUILD_TMP)/linux-$(KERNEL_VERSION).tar: | $(BUILD_TMP) make kernel.do_checkout - tar cf $@ --exclude-vcs -C $(SOURCE_DIR)/$(NI_LINUX-KERNEL) . + tar cf $@ --exclude-vcs -C $(SOURCE_DIR)/$(NI-LINUX-KERNEL) . # ----------------------------------------------------------------------------- diff --git a/make/environment-build.mk b/make/environment-build.mk index 016fc75f..17f3f782 100644 --- a/make/environment-build.mk +++ b/make/environment-build.mk @@ -348,27 +348,27 @@ GITHUB = https://github.com BITBUCKET = https://bitbucket.org BITBUCKET_SSH = git@bitbucket.org -NI_GIT = $(BITBUCKET_SSH):neutrino-images -NI_NEUTRINO = ni-neutrino -NI_NEUTRINO_BRANCH ?= master -NI_NEUTRINO-PLUGINS = ni-neutrino-plugins +NI-GIT = $(BITBUCKET_SSH):neutrino-images +NI-NEUTRINO = ni-neutrino +NI-NEUTRINO_BRANCH ?= master +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_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 - -# Note: NI_FFMPEG-variables are only used for Coolstream-builds +NI-BUILD-GENERIC-PC = ni-build-generic-pc +NI-DRIVERS-BIN = ni-drivers-bin +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 + +# Note: NI-FFMPEG-variables are only used for Coolstream-builds # # ffmpeg/master is currently not mature enough for daily use # if you want to help testing you can enable it here -NI_FFMPEG = ni-ffmpeg -NI_FFMPEG_BRANCH ?= ni/ffmpeg/2.8 -#NI_FFMPEG_BRANCH ?= ni/ffmpeg/master -#NI_FFMPEG_BRANCH ?= ffmpeg/master +NI-FFMPEG = ni-ffmpeg +NI-FFMPEG_BRANCH ?= ni/ffmpeg/2.8 +#NI-FFMPEG_BRANCH ?= ni/ffmpeg/master +#NI-FFMPEG_BRANCH ?= ffmpeg/master diff --git a/make/image-updates.mk b/make/image-updates.mk index 6fbcc3df..eec1b294 100644 --- a/make/image-updates.mk +++ b/make/image-updates.mk @@ -80,20 +80,20 @@ u-update.urls: update.urls u-pr-auto-timer: $(MAKE) u-init - install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/preinstall.sh $(PREINSTALL_SH) - install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/postinstall.sh $(POSTINSTALL_SH) + install -m 0755 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/preinstall.sh $(PREINSTALL_SH) + install -m 0755 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/postinstall.sh $(POSTINSTALL_SH) install -d $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins - install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.sh $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/ - install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.cfg $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/ - install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/ - install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer_hint.png $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/ - install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/ + install -m 0755 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.sh $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/ + install -m 0644 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.cfg $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/ + install -m 0755 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/ + install -m 0755 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer_hint.png $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/ + install -m 0755 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/ install -d $(UPDATE_INST_DIR)/var/tuxbox/config - install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/ - install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.rules.template $(UPDATE_INST_DIR)/var/tuxbox/config/ - install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/ - install -m 0644 $(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 -m 0644 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/ + install -m 0644 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.rules.template $(UPDATE_INST_DIR)/var/tuxbox/config/ + install -m 0644 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/ + install -m 0644 $(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_URL=$(NI-SERVER)/plugins/pr-auto-timer \ @@ -126,11 +126,11 @@ pathauf-192: done # sync sat-names with current satellites.xml # Astra 19.2 - A192=`grep 'position=\"192\"' $(SOURCE_DIR)/$(NI_NEUTRINO)/data/config/satellites.xml`; \ + A192=`grep 'position=\"192\"' $(SOURCE_DIR)/$(NI-NEUTRINO)/data/config/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\"' $(SOURCE_DIR)/$(NI_NEUTRINO)/data/config/satellites.xml`; \ + H130=`grep 'position=\"130\"' $(SOURCE_DIR)/$(NI-NEUTRINO)/data/config/satellites.xml`; \ H130=`echo $$H130`; \ sed -i "/position=\"130\"/c\ $$H130" $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/services.xml # diff --git a/make/linux-kernel.mk b/make/linux-kernel.mk index 55c0c09b..09e8ad68 100644 --- a/make/linux-kernel.mk +++ b/make/linux-kernel.mk @@ -21,9 +21,9 @@ KERNEL_ZIMAGE_DTB = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/zImage_dtb KERNEL_DTB = $(EMPTY) ifeq ($(BOXSERIES)-$(BOXFAMILY), hd2-apollo) - KERNEL_DTB = $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/kernel-dtb/hd849x.dtb + KERNEL_DTB = $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/kernel-dtb/hd849x.dtb else ifeq ($(BOXSERIES)-$(BOXFAMILY), hd2-kronos) - KERNEL_DTB = $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/kernel-dtb/en75x1.dtb + KERNEL_DTB = $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/kernel-dtb/en75x1.dtb else ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k)) KERNEL_DTB = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/dts/bcm7445-bcm97445svmb.dtb endif @@ -51,8 +51,8 @@ endif # ----------------------------------------------------------------------------- -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) $(D)/kernel.do_prepare: @@ -61,9 +61,9 @@ $(D)/kernel.do_prepare: $(REMOVE)/$(KERNEL_SRC) $(REMOVE)/$(KERNEL_OBJ) $(REMOVE)/$(KERNEL_MODULES) - tar -C $(SOURCE_DIR) -cp $(NI_LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_TMP) -x + tar -C $(SOURCE_DIR) -cp $(NI-LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_TMP) -x $(CD) $(BUILD_TMP); \ - mv $(NI_LINUX-KERNEL) $(KERNEL_SRC) + mv $(NI-LINUX-KERNEL) $(KERNEL_SRC) $(MKDIR)/$(KERNEL_OBJ) $(MKDIR)/$(KERNEL_MODULES) install -m 644 $(KERNEL_CONFIG) $(BUILD_TMP)/$(KERNEL_OBJ)/.config diff --git a/make/neutrino-plugins.mk b/make/neutrino-plugins.mk index 2231c1a8..1b906720 100644 --- a/make/neutrino-plugins.mk +++ b/make/neutrino-plugins.mk @@ -23,7 +23,7 @@ endif # ----------------------------------------------------------------------------- -NP_OBJ_DIR = $(BUILD_TMP)/$(NI_NEUTRINO-PLUGINS) +NP_OBJ_DIR = $(BUILD_TMP)/$(NI-NEUTRINO-PLUGINS) NP_DEPS = $(D)/ffmpeg NP_DEPS += $(D)/libcurl @@ -52,17 +52,17 @@ endif $(NP_OBJ_DIR)/config.status: $(NP_DEPS) test -d $(NP_OBJ_DIR) || mkdir -p $(NP_OBJ_DIR) - $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/autogen.sh + $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/autogen.sh $(CD) $(NP_OBJ_DIR); \ $(BUILDENV) \ - $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/configure \ + $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/configure \ --host=$(TARGET) \ --build=$(BUILD) \ --prefix= \ --enable-maintainer-mode \ --enable-silent-rules \ \ - --with-neutrino-source=$(SOURCE_DIR)/$(NI_NEUTRINO) \ + --with-neutrino-source=$(SOURCE_DIR)/$(NI-NEUTRINO) \ --with-neutrino-build=$(N_OBJ_DIR) \ \ $(NP_CONFIGURE_ADDITIONS) \ @@ -106,22 +106,22 @@ neutrino-plugin-%: $(NP_OBJ_DIR)/config.status # ----------------------------------------------------------------------------- -$(D)/channellogos: $(SOURCE_DIR)/$(NI_LOGO-STUFF) $(SHAREICONS) +$(D)/channellogos: $(SOURCE_DIR)/$(NI-LOGO-STUFF) $(SHAREICONS) rm -rf $(SHAREICONS)/logo mkdir -p $(SHAREICONS)/logo - install -m 0644 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logos/* $(SHAREICONS)/logo + install -m 0644 $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logos/* $(SHAREICONS)/logo mkdir -p $(SHAREICONS)/logo/events - install -m 0644 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logos-events/* $(SHAREICONS)/logo/events - $(CD) $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logo-links; \ + install -m 0644 $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logos-events/* $(SHAREICONS)/logo/events + $(CD) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-links; \ ./logo-linker.sh logo-links.db $(SHAREICONS)/logo $(TOUCH) # ----------------------------------------------------------------------------- -$(D)/logo-addon: $(SOURCE_DIR)/$(NI_LOGO-STUFF) $(SHAREPLUGINS) - install -m 0755 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logo-addon/*.sh $(SHAREPLUGINS)/ - install -m 0644 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logo-addon/*.cfg $(SHAREPLUGINS)/ - install -m 0644 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logo-addon/*.png $(SHAREPLUGINS)/ +$(D)/logo-addon: $(SOURCE_DIR)/$(NI-LOGO-STUFF) $(SHAREPLUGINS) + install -m 0755 $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.sh $(SHAREPLUGINS)/ + install -m 0644 $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.cfg $(SHAREPLUGINS)/ + install -m 0644 $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.png $(SHAREPLUGINS)/ $(TOUCH) # ----------------------------------------------------------------------------- diff --git a/make/neutrino.mk b/make/neutrino.mk index b63f9a37..85cf8cd6 100644 --- a/make/neutrino.mk +++ b/make/neutrino.mk @@ -4,7 +4,7 @@ # ----------------------------------------------------------------------------- N_INST_DIR ?= $(TARGET_DIR) -N_OBJ_DIR = $(BUILD_TMP)/$(NI_NEUTRINO) +N_OBJ_DIR = $(BUILD_TMP)/$(NI-NEUTRINO) # ----------------------------------------------------------------------------- @@ -88,7 +88,7 @@ endif N_CONFIGURE_LIBSTB-HAL = ifeq ($(USE_LIBSTB-HAL), yes) N_CONFIGURE_LIBSTB-HAL += \ - --with-stb-hal-includes=$(SOURCE_DIR)/$(NI_LIBSTB-HAL)/include \ + --with-stb-hal-includes=$(SOURCE_DIR)/$(NI-LIBSTB-HAL)/include \ --with-stb-hal-build=$(LH_OBJ_DIR) endif @@ -134,12 +134,12 @@ N_BUILDENV = \ $(N_OBJ_DIR)/config.status: $(N_DEPS) test -d $(N_OBJ_DIR) || mkdir -p $(N_OBJ_DIR) - $(CD) $(SOURCE_DIR)/$(NI_NEUTRINO); \ - git checkout $(NI_NEUTRINO_BRANCH) - $(SOURCE_DIR)/$(NI_NEUTRINO)/autogen.sh + $(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); \ + git checkout $(NI-NEUTRINO_BRANCH) + $(SOURCE_DIR)/$(NI-NEUTRINO)/autogen.sh $(CD) $(N_OBJ_DIR); \ $(N_BUILDENV) \ - $(SOURCE_DIR)/$(NI_NEUTRINO)/configure \ + $(SOURCE_DIR)/$(NI-NEUTRINO)/configure \ --host=$(TARGET) \ --build=$(BUILD) \ --prefix= \ @@ -180,7 +180,7 @@ $(D)/neutrino: $(N_OBJ_DIR)/config.status # ----------------------------------------------------------------------------- -LH_OBJ_DIR = $(BUILD_TMP)/$(NI_LIBSTB-HAL) +LH_OBJ_DIR = $(BUILD_TMP)/$(NI-LIBSTB-HAL) # ----------------------------------------------------------------------------- @@ -209,10 +209,10 @@ endif $(LH_OBJ_DIR)/config.status: $(LH_DEPS) test -d $(LH_OBJ_DIR) || mkdir -p $(LH_OBJ_DIR) - $(SOURCE_DIR)/$(NI_LIBSTB-HAL)/autogen.sh + $(SOURCE_DIR)/$(NI-LIBSTB-HAL)/autogen.sh $(CD) $(LH_OBJ_DIR); \ $(N_BUILDENV) \ - $(SOURCE_DIR)/$(NI_LIBSTB-HAL)/configure \ + $(SOURCE_DIR)/$(NI-LIBSTB-HAL)/configure \ --host=$(TARGET) \ --build=$(BUILD) \ --prefix= \ diff --git a/make/ni.mk b/make/ni.mk index e021e0e9..821f6c3f 100644 --- a/make/ni.mk +++ b/make/ni.mk @@ -99,9 +99,9 @@ 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 # ----------------------------------------------------------------------------- diff --git a/make/prerequisites.mk b/make/prerequisites.mk index c5b964e5..531035f9 100644 --- a/make/prerequisites.mk +++ b/make/prerequisites.mk @@ -71,11 +71,11 @@ $(SOURCE_DIR): mkdir -p $@ $(BUILD-GENERIC-PC): - git clone $(NI_GIT)/$(NI_BUILD-GENERIC-PC).git $(BUILD-GENERIC-PC) + git clone $(NI-GIT)/$(NI-BUILD-GENERIC-PC).git $(BUILD-GENERIC-PC) -$(SOURCE_DIR)/$(NI_NEUTRINO): +$(SOURCE_DIR)/$(NI-NEUTRINO): $(CD) $(SOURCE_DIR); \ - git clone $(NI_GIT)/$(notdir $@).git + git clone $(NI-GIT)/$(notdir $@).git $(CD) $@; \ git remote add tuxbox $(GITHUB)/tuxbox-neutrino/gui-neutrino.git; \ git remote add seife $(GITHUB)/neutrino-mp/neutrino-mp.git; \ @@ -84,9 +84,9 @@ $(SOURCE_DIR)/$(NI_NEUTRINO): git remote add max_10 $(BITBUCKET)/max_10/neutrino-mp-max.git; \ git fetch --all -$(SOURCE_DIR)/$(NI_LIBSTB-HAL): +$(SOURCE_DIR)/$(NI-LIBSTB-HAL): $(CD) $(SOURCE_DIR); \ - git clone $(NI_GIT)/$(notdir $@).git + git clone $(NI-GIT)/$(notdir $@).git $(CD) $@; \ git remote add tuxbox $(GITHUB)/tuxbox-neutrino/library-stb-hal.git; \ git remote add seife $(GITHUB)/neutrino-mp/libstb-hal.git; \ @@ -95,63 +95,63 @@ $(SOURCE_DIR)/$(NI_LIBSTB-HAL): git remote add max_10 $(BITBUCKET)/max_10/libstb-hal-max.git; \ git fetch --all -$(SOURCE_DIR)/$(NI_LIBCOOLSTREAM): +$(SOURCE_DIR)/$(NI-LIBCOOLSTREAM): ifeq ($(HAS_LIBCS), yes) $(CD) $(SOURCE_DIR); \ - git clone $(NI_GIT)/$(notdir $@).git + git clone $(NI-GIT)/$(notdir $@).git $(CD) $@; \ - git checkout $(NI_LIBCOOLSTREAM_BRANCH) + git checkout $(NI-LIBCOOLSTREAM_BRANCH) endif # upstream for rebase -$(SOURCE_DIR)/$(NI_FFMPEG): +$(SOURCE_DIR)/$(NI-FFMPEG): $(CD) $(SOURCE_DIR); \ - git clone $(NI_GIT)/$(notdir $@).git + git clone $(NI-GIT)/$(notdir $@).git $(CD) $@; \ git remote add upstream https://git.ffmpeg.org/ffmpeg.git; \ git fetch --all # upstream for rebase # torvalds for cherry-picking -$(SOURCE_DIR)/$(NI_LINUX-KERNEL): +$(SOURCE_DIR)/$(NI-LINUX-KERNEL): $(CD) $(SOURCE_DIR); \ - git clone $(NI_GIT)/$(notdir $@).git + git clone $(NI-GIT)/$(notdir $@).git $(CD) $@; \ git remote add upstream https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git; \ git remote add torvalds https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git; \ git fetch --all # upstream for rebase -$(SOURCE_DIR)/$(NI_OFGWRITE): +$(SOURCE_DIR)/$(NI-OFGWRITE): $(CD) $(SOURCE_DIR); \ - git clone $(NI_GIT)/$(notdir $@).git + git clone $(NI-GIT)/$(notdir $@).git $(CD) $@ && \ git remote add upstream $(GITHUB)/oe-alliance/ofgwrite.git; \ git fetch --all -$(SOURCE_DIR)/$(NI_DRIVERS-BIN) \ -$(SOURCE_DIR)/$(NI_LOGO-STUFF) \ -$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) \ -$(SOURCE_DIR)/$(NI_OPENTHREADS) \ -$(SOURCE_DIR)/$(NI_RTMPDUMP) \ -$(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-RTMPDUMP) \ +$(SOURCE_DIR)/$(NI-STREAMRIPPER): $(CD) $(SOURCE_DIR); \ - git clone $(NI_GIT)/$(notdir $@).git + git clone $(NI-GIT)/$(notdir $@).git ni-sources: $(SOURCE_DIR) \ $(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-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) # ----------------------------------------------------------------------------- diff --git a/make/target-ffmpeg-coolstream.mk b/make/target-ffmpeg-coolstream.mk index df47b5ac..348d388e 100644 --- a/make/target-ffmpeg-coolstream.mk +++ b/make/target-ffmpeg-coolstream.mk @@ -7,7 +7,7 @@ FFMPEG_DEPS = $(D)/openssl $(D)/librtmp $(D)/libbluray $(D)/libass # ----------------------------------------------------------------------------- -ifeq ($(NI_FFMPEG_BRANCH), ni/ffmpeg/2.8) +ifeq ($(NI-FFMPEG_BRANCH), ni/ffmpeg/2.8) FFMPEG_DEPS += $(D)/libroxml FFMPEG_CONFIGURE_BRANCH = else @@ -173,11 +173,11 @@ endif # ----------------------------------------------------------------------------- $(D)/ffmpeg: $(FFMPEG_DEPS) | $(TARGET_DIR) - $(REMOVE)/$(NI_FFMPEG) - $(CD) $(SOURCE_DIR)/$(NI_FFMPEG); \ - git checkout $(NI_FFMPEG_BRANCH) - tar -C $(SOURCE_DIR) -cp $(NI_FFMPEG) --exclude-vcs | tar -C $(BUILD_TMP) -x - $(CHDIR)/$(NI_FFMPEG); \ + $(REMOVE)/$(NI-FFMPEG) + $(CD) $(SOURCE_DIR)/$(NI-FFMPEG); \ + git checkout $(NI-FFMPEG_BRANCH) + tar -C $(SOURCE_DIR) -cp $(NI-FFMPEG) --exclude-vcs | tar -C $(BUILD_TMP) -x + $(CHDIR)/$(NI-FFMPEG); \ ./configure \ $(FFMPEG_CONFIGURE_GENERIC) \ $(FFMPEG_CONFIGURE_PLATFORM) \ @@ -191,5 +191,5 @@ $(D)/ffmpeg: $(FFMPEG_DEPS) | $(TARGET_DIR) $(REWRITE_PKGCONF)/libavformat.pc $(REWRITE_PKGCONF)/libavutil.pc $(REWRITE_PKGCONF)/libswresample.pc - $(REMOVE)/$(NI_FFMPEG) + $(REMOVE)/$(NI-FFMPEG) $(TOUCH) diff --git a/make/target-libs.mk b/make/target-libs.mk index 81d52fcb..9cdd490a 100644 --- a/make/target-libs.mk +++ b/make/target-libs.mk @@ -438,10 +438,10 @@ $(D)/libncurses: $(ARCHIVE)/ncurses-$(LIBNCURSES_VER).tar.gz | $(TARGET_DIR) # ----------------------------------------------------------------------------- -$(D)/openthreads: $(SOURCE_DIR)/$(NI_OPENTHREADS) | $(TARGET_DIR) - $(REMOVE)/$(NI_OPENTHREADS) - tar -C $(SOURCE_DIR) -cp $(NI_OPENTHREADS) --exclude-vcs | tar -C $(BUILD_TMP) -x - $(CHDIR)/$(NI_OPENTHREADS)/; \ +$(D)/openthreads: $(SOURCE_DIR)/$(NI-OPENTHREADS) | $(TARGET_DIR) + $(REMOVE)/$(NI-OPENTHREADS) + tar -C $(SOURCE_DIR) -cp $(NI-OPENTHREADS) --exclude-vcs | tar -C $(BUILD_TMP) -x + $(CHDIR)/$(NI-OPENTHREADS)/; \ $(CMAKE) \ -DCMAKE_SUPPRESS_DEVELOPER_WARNINGS="1" \ -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE="0" \ @@ -449,7 +449,7 @@ $(D)/openthreads: $(SOURCE_DIR)/$(NI_OPENTHREADS) | $(TARGET_DIR) $(MAKE); \ make install DESTDIR=$(TARGET_DIR) rm -f $(TARGET_LIB_DIR)/cmake - $(REMOVE)/$(NI_OPENTHREADS) + $(REMOVE)/$(NI-OPENTHREADS) $(REWRITE_PKGCONF)/openthreads.pc $(TOUCH) @@ -886,17 +886,17 @@ $(D)/pugixml: $(ARCHIVE)/pugixml-$(PUGIXML_VER).tar.gz | $(TARGET_DIR) # ----------------------------------------------------------------------------- -$(D)/librtmp: $(D)/zlib $(D)/openssl $(SOURCE_DIR)/$(NI_RTMPDUMP) | $(TARGET_DIR) - $(REMOVE)/$(NI_RTMPDUMP) - tar -C $(SOURCE_DIR) -cp $(NI_RTMPDUMP) --exclude-vcs | tar -C $(BUILD_TMP) -x - $(CHDIR)/$(NI_RTMPDUMP); \ +$(D)/librtmp: $(D)/zlib $(D)/openssl $(SOURCE_DIR)/$(NI-RTMPDUMP) | $(TARGET_DIR) + $(REMOVE)/$(NI-RTMPDUMP) + tar -C $(SOURCE_DIR) -cp $(NI-RTMPDUMP) --exclude-vcs | tar -C $(BUILD_TMP) -x + $(CHDIR)/$(NI-RTMPDUMP); \ make CROSS_COMPILE=$(TARGET)- XCFLAGS="-I$(TARGET_INCLUDE_DIR) -L$(TARGET_LIB_DIR)" LDFLAGS="-L$(TARGET_LIB_DIR)" prefix=$(TARGET_DIR);\ make install DESTDIR=$(TARGET_DIR) prefix="" mandir=/.remove rm -rf $(TARGET_DIR)/sbin/rtmpgw rm -rf $(TARGET_DIR)/sbin/rtmpsrv rm -rf $(TARGET_DIR)/sbin/rtmpsuck $(REWRITE_PKGCONF)/librtmp.pc - $(REMOVE)/$(NI_RTMPDUMP) + $(REMOVE)/$(NI-RTMPDUMP) $(TOUCH) # ----------------------------------------------------------------------------- diff --git a/make/target-rootfs.mk b/make/target-rootfs.mk index 99610529..5462982f 100644 --- a/make/target-rootfs.mk +++ b/make/target-rootfs.mk @@ -158,7 +158,7 @@ get-update-info-hd2: $(call draw_line); @echo "Get update info for model $(shell echo $(BOXMODEL) | sed 's/.*/\u&/')" @echo - @$(CD) $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR); \ + @$(CD) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR); \ test -e ./u-boot.bin && ( \ strings u-boot.bin | grep -m1 "U-Boot "; \ ); \ diff --git a/make/target-tools.mk b/make/target-tools.mk index d52dc9c9..8b241a0d 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -1103,10 +1103,10 @@ $(D)/xupnpd: $(D)/lua $(D)/openssl | $(TARGET_DIR) cp -a $$object $(TARGET_SHARE_DIR)/xupnpd/; \ done; rm $(TARGET_SHARE_DIR)/xupnpd/plugins/staff/xupnpd_18plus.lua - install -D -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_18plus.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/ - install -D -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_youtube.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/ - install -D -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_coolstream.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/ - install -D -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_cczwei.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/ + install -D -m 0644 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_18plus.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/ + install -D -m 0644 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_youtube.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/ + install -D -m 0644 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_coolstream.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/ + install -D -m 0644 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_cczwei.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/ mkdir -p $(TARGET_DIR)/etc/init.d/ install -D -m 0755 $(IMAGEFILES)/scripts/xupnpd.init $(TARGET_DIR)/etc/init.d/xupnpd ln -sf xupnpd $(TARGET_DIR)/etc/init.d/S99xupnpd @@ -1279,9 +1279,9 @@ $(D)/exfat-utils: $(ARCHIVE)/exfat-utils-$(EXFAT-UTILS_VER).tar.gz $(D)/fuse-exf # ----------------------------------------------------------------------------- $(D)/streamripper: $(D)/libvorbisidec $(D)/libmad $(D)/glib2 | $(TARGET_DIR) - $(REMOVE)/$(NI_STREAMRIPPER) - tar -C $(SOURCE_DIR) -cp $(NI_STREAMRIPPER) --exclude-vcs | tar -C $(BUILD_TMP) -x - $(CHDIR)/$(NI_STREAMRIPPER); \ + $(REMOVE)/$(NI-STREAMRIPPER) + tar -C $(SOURCE_DIR) -cp $(NI-STREAMRIPPER) --exclude-vcs | tar -C $(BUILD_TMP) -x + $(CHDIR)/$(NI-STREAMRIPPER); \ autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ @@ -1293,7 +1293,7 @@ $(D)/streamripper: $(D)/libvorbisidec $(D)/libmad $(D)/glib2 | $(TARGET_DIR) $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) install -m 0755 $(IMAGEFILES)/scripts/streamripper.sh $(TARGET_DIR)/bin/ - $(REMOVE)/$(NI_STREAMRIPPER) + $(REMOVE)/$(NI-STREAMRIPPER) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1431,16 +1431,16 @@ $(D)/iconv: $(ARCHIVE)/libiconv-$(LIBICONV_VER).tar.gz | $(TARGET_DIR) # ----------------------------------------------------------------------------- -$(D)/ofgwrite: $(SOURCE_DIR)/$(NI_OFGWRITE) | $(TARGET_DIR) - $(REMOVE)/$(NI_OFGWRITE) - tar -C $(SOURCE_DIR) -cp $(NI_OFGWRITE) --exclude-vcs | tar -C $(BUILD_TMP) -x - $(CHDIR)/$(NI_OFGWRITE); \ +$(D)/ofgwrite: $(SOURCE_DIR)/$(NI-OFGWRITE) | $(TARGET_DIR) + $(REMOVE)/$(NI-OFGWRITE) + tar -C $(SOURCE_DIR) -cp $(NI-OFGWRITE) --exclude-vcs | tar -C $(BUILD_TMP) -x + $(CHDIR)/$(NI-OFGWRITE); \ $(BUILDENV) \ $(MAKE) - install -m 0755 $(BUILD_TMP)/$(NI_OFGWRITE)/ofgwrite_bin $(TARGET_DIR)/bin - install -m 0755 $(BUILD_TMP)/$(NI_OFGWRITE)/ofgwrite_caller $(TARGET_DIR)/bin - install -m 0755 $(BUILD_TMP)/$(NI_OFGWRITE)/ofgwrite $(TARGET_DIR)/bin - $(REMOVE)/$(NI_OFGWRITE) + install -m 0755 $(BUILD_TMP)/$(NI-OFGWRITE)/ofgwrite_bin $(TARGET_DIR)/bin + install -m 0755 $(BUILD_TMP)/$(NI-OFGWRITE)/ofgwrite_caller $(TARGET_DIR)/bin + install -m 0755 $(BUILD_TMP)/$(NI-OFGWRITE)/ofgwrite $(TARGET_DIR)/bin + $(REMOVE)/$(NI-OFGWRITE) $(TOUCH) # ----------------------------------------------------------------------------- diff --git a/make/update.mk b/make/update.mk index dbf69186..d2167674 100644 --- a/make/update.mk +++ b/make/update.mk @@ -7,29 +7,29 @@ update-self: export GIT_MERGE_AUTOEDIT=no; \ git pull ifeq ($(HAS_INTERNALS), yes) - $(CD) $(BASE_DIR)/$(NI_INTERNALS); git pull + $(CD) $(BASE_DIR)/$(NI-INTERNALS); git pull endif update-neutrino: export GIT_MERGE_AUTOEDIT=no; \ - $(CD) $(SOURCE_DIR)/$(NI_NEUTRINO); \ - git checkout $(NI_NEUTRINO_BRANCH); \ - git pull origin $(NI_NEUTRINO_BRANCH) + $(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); \ + git checkout $(NI-NEUTRINO_BRANCH); \ + git pull origin $(NI-NEUTRINO_BRANCH) update-remotes: ifeq ($(NI_ADMIN), true) export GIT_MERGE_AUTOEDIT=no; \ - $(CD) $(SOURCE_DIR)/$(NI_NEUTRINO); \ - git checkout $(NI_NEUTRINO_BRANCH); \ + $(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); \ + git checkout $(NI-NEUTRINO_BRANCH); \ 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 $(CD) $(BUILD-GENERIC-PC); git pull - $(CD) $(SOURCE_DIR)/$(NI_DRIVERS-BIN); git pull - $(CD) $(SOURCE_DIR)/$(NI_FFMPEG); git pull --all; git checkout $(NI_FFMPEG_BRANCH) + $(CD) $(SOURCE_DIR)/$(NI-DRIVERS-BIN); git pull + $(CD) $(SOURCE_DIR)/$(NI-FFMPEG); git pull --all; git checkout $(NI-FFMPEG_BRANCH) ifeq ($(HAS_LIBCS), yes) - $(CD) $(SOURCE_DIR)/$(NI_LIBCOOLSTREAM); git pull --all; git checkout $(NI_LIBCOOLSTREAM_BRANCH) + $(CD) $(SOURCE_DIR)/$(NI-LIBCOOLSTREAM); git pull --all; git checkout $(NI-LIBCOOLSTREAM_BRANCH) endif - $(CD) $(SOURCE_DIR)/$(NI_LIBSTB-HAL); git pull - $(CD) $(SOURCE_DIR)/$(NI_LINUX-KERNEL); git pull --all; git checkout $(KERNEL_BRANCH) - $(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; git checkout $(KERNEL_BRANCH) + $(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 update-ni: make update-self @@ -70,23 +70,23 @@ update-all: update-ni update-remotes push: git push ifeq ($(HAS_INTERNALS), yes) - $(CD) $(BASE_DIR)/$(NI_INTERNALS); git push + $(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) $(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 + $(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 # -----------------------------------------------------------------------------