topaLE
/
ni-buildsystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

master
vanhofen 6 years ago
parent
b79e0607e0
commit
b17d6d68ac
7 changed files with 28 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      make/environment.mk
  2. 4
      make/image-update.mk
  3. 17
      make/neutrino.mk
  4. 2
      make/plugins-extra.mk
  5. 11
      make/prerequisites.mk
  6. 8
      make/rootfs.mk
  7. 6
      make/update.mk

4
make/environment.mk
View File

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

4
make/image-update.mk
View File

@ -195,11 +195,11 @@ pathauf_HD-19:
done done
# sync sat-names with current satellites.xml # sync sat-names with current satellites.xml
# Astra 19.2 # 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`; \ A192=`echo $$A192`; \
sed -i "/position=\"192\"/c\ $$A192" $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/services.xml sed -i "/position=\"192\"/c\ $$A192" $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/services.xml
# Hotbird 13.0 # 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`; \ H130=`echo $$H130`; \
sed -i "/position=\"130\"/c\ $$H130" $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/services.xml sed -i "/position=\"130\"/c\ $$H130" $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/services.xml
# #

17
make/neutrino.mk
View File

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

2
make/plugins-extra.mk
View File

@ -62,7 +62,7 @@ $(BIN)/convert:
logoview: $(SOURCE_DIR)/$(TUXBOX_PLUGINS) $(D)/neutrino $(BIN)/logoview logoview: $(SOURCE_DIR)/$(TUXBOX_PLUGINS) $(D)/neutrino $(BIN)/logoview
$(BIN)/logoview: $(BIN) $(BIN)/logoview: $(BIN)
pushd $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/logoview && \ 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 $@ && \ install -m755 logoview $@ && \
$(MAKE) clean $(MAKE) clean

11
make/prerequisites.mk
View File

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

8
make/rootfs.mk
View File

@ -7,15 +7,15 @@ rootfs: .version update.urls $(BOX) cleanup strip softlinks
$(TARGET_DIR)/.version: $(TARGET_DIR)/.version:
echo "version="$(IMAGE_TYPE)$(IMAGE_VERSION)$(IMAGE_DATE) > $@ echo "version="$(IMAGE_TYPE)$(IMAGE_VERSION)$(IMAGE_DATE) > $@
# determinate last NI-release-tag an use this to git describe # determinate last NI-release-tag an use this to git describe
GITTAG=`cd $(N_HD_SOURCE); git tag -l "NI-*" | tail -n1`; \ GITTAG=`cd $(SOURCE_DIR)/$(NI_NEUTRINO); git tag -l "NI-*" | tail -n1`; \
GITDESCRIBE=`cd $(N_HD_SOURCE); git describe --always --dirty --tags --match $$GITTAG`; \ GITDESCRIBE=`cd $(SOURCE_DIR)/$(NI_NEUTRINO); git describe --always --dirty --tags --match $$GITTAG`; \
GITDESCRIBE=$${GITDESCRIBE%-dirty}; \ GITDESCRIBE=$${GITDESCRIBE%-dirty}; \
echo "describe="$$GITDESCRIBE >> $@ echo "describe="$$GITDESCRIBE >> $@
# determinate current branch in origin repo # 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 >> $@ echo "branch="$$BRANCH >> $@
# determinate last commit in origin repo # 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 "commit="$$COMMIT >> $@
echo "builddate="`date` >> $@ echo "builddate="`date` >> $@
echo "creator=$(MAINTAINER)" >> $@ echo "creator=$(MAINTAINER)" >> $@

6
make/update.mk
View File

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

Write Preview
Loading…
Cancel
Save