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

- plugins: switch to new own plugin-repo

master
vanhofen 7 years ago
parent
23abc3ccc4
commit
0da7621c56
6 changed files with 180 additions and 92 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      make/environment.mk
  2. 218
      make/plugins.mk
  3. 19
      make/prerequisites.mk
  4. 4
      make/system-libs.mk
  5. 8
      make/system-tools.mk
  6. 16
      make/update.mk

7
make/environment.mk
View File

@ -296,6 +296,7 @@ ifeq ($(USE_LIBSTB-HAL), yes)
NI_NEUTRINO_BRANCH := ni/mp/tuxbox
endif
NI_NEUTRINO-PLUGINS = ni-neutrino-plugins
BUILD-GENERIC-PC = build-generic-pc
NI_BUILD-GENERIC-PC = ni-build-generic-pc
@ -320,17 +321,11 @@ TUXBOX_NEUTRINO_BRANCH ?= master
TUXBOX_LIBSTB-HAL = library-stb-hal
TUXBOX_BOOTLOADER = bootloader-uboot-cst
TUXBOX_PLUGINS = plugins
TUXBOX_REMOTE_REPO = tuxbox
# plugins with remote repo
NI_TUXWETTER = ni-neutrino-plugin-tuxwetter
TUXBOX_TUXWETTER = plugin-tuxwetter
# various
NI_LOGO_STUFF = ni-logo-stuff
NI_SMARTHOMEINFO = ni-neutrino-plugin-smarthomeinfo
# execute local scripts
define local-script

218
make/plugins.mk
View File

@ -36,7 +36,7 @@ $(VARPLUG) \
$(VARCONF) : | $(TARGETPREFIX)
mkdir -p $@
plugins-all: \
plugins-all: $(D)/neutrino \
getrc \
input \
logomask \
@ -163,9 +163,9 @@ logo-addon: $(SOURCE_DIR)/$(NI_LOGO_STUFF) $(LIBPLUG)
install -m644 $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logo-addon/*.cfg $(LIBPLUG)/
install -m644 $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logo-addon/*.png $(LIBPLUG)/
smarthomeinfo: $(SOURCE_DIR)/$(NI_SMARTHOMEINFO) $(LIBPLUG) $(VARCONF)
cp -a $(SOURCE_DIR)/$(NI_SMARTHOMEINFO)/plugin/tuxbox/plugins/* $(LIBPLUG)/
cp -a $(SOURCE_DIR)/$(NI_SMARTHOMEINFO)/plugin/tuxbox/config/* $(VARCONF)/
smarthomeinfo: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(LIBPLUG) $(VARCONF)
cp -a $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/$@/plugin/tuxbox/plugins/* $(LIBPLUG)/
cp -a $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/$@/plugin/tuxbox/config/* $(VARCONF)/
doscam-webif-skin: $(VARCONF)
mkdir -p $(TARGETPREFIX)/share/doscam/tpl/
@ -206,107 +206,206 @@ coolithek: $(LIBPLUG)
cp -rf share* $(TARGETPREFIX)/
$(REMOVE)/coolithek
############################
### plugins from cst-git ###
############################
#scripts-lua
netzkino \
mtv \
favorites2bin: $(LIBPLUG)
install -m755 $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/scripts-lua/plugins/$@/* $(LIBPLUG)/
favorites2bin: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(LIBPLUG)
install -m755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/$@/* $(LIBPLUG)/
#getrc
getrc: $(SOURCE_DIR)/$(TUXBOX_PLUGINS) $(BIN)/getrc
getrc: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(BIN)/getrc
$(BIN)/getrc: $(BIN)
pushd $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/getrc && \
$(TARGET)-gcc $(TARGET_CFLAGS) -o $@ getrc.c io.c
pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/getrc && \
$(TARGET)-gcc $(TARGET_CFLAGS) \
-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
\
getrc.c \
io.c \
\
-o $@
#input
input: $(SOURCE_DIR)/$(TUXBOX_PLUGINS) $(BIN)/input
input: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(BIN)/input
$(BIN)/input: $(D)/freetype $(BIN)
pushd $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/input && \
$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -I$(TARGETINCLUDE)/freetype2 -lfreetype -lz -lpng $(CORTEX-STRINGS) -o $@ input.c inputd.c gfx.c io.c text.c fb_display.c resize.c pngw.cpp png_helper.cpp
pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/input && \
$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-I$(TARGETINCLUDE)/freetype2 \
\
-lfreetype -lz -lpng \
\
fb_display.c \
gfx.c \
input.c \
inputd.c \
io.c \
png_helper.cpp \
pngw.cpp \
resize.c \
text.c \
\
-o $@
#logomask
logomask: $(SOURCE_DIR)/$(TUXBOX_PLUGINS) $(BIN)/logomask $(LIBPLUG)/logoset.so $(LIBPLUG)/logomask.so
logomask: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(BIN)/logomask $(LIBPLUG)/logoset.so $(LIBPLUG)/logomask.so
$(BIN)/logomask: $(BIN)
pushd $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/logomask && \
$(TARGET)-gcc $(TARGET_CFLAGS) -o $@ logomask.c gfx.c && \
pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/logomask && \
$(TARGET)-gcc $(TARGET_CFLAGS) \
-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
\
gfx.c \
logomask.c \
\
-o $@ && \
install -m755 logomask.sh $(BIN)/
$(LIBPLUG)/logoset.so: $(D)/freetype $(LIBPLUG)
pushd $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/logomask && \
$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -I$(TARGETINCLUDE)/freetype2 -lfreetype -lz $(CORTEX-STRINGS) -o $@ logoset.c gfx.c io.c text.c && \
pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/logomask && \
$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-I$(TARGETINCLUDE)/freetype2 \
\
-lfreetype -lz \
\
gfx.c \
io.c \
logoset.c \
text.c \
\
-o $@ && \
install -m644 logoset.cfg $(LIBPLUG)/
install -m644 $(IMAGEFILES)/icons/hinticons/logoset_hint.png $(LIBPLUG)/
$(LIBPLUG)/logomask.so: $(LIBPLUG) $(BIN)
pushd $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/logomask && \
$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -I$(N_HD_SOURCE)/src -o $@ starter_logomask.c && \
pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/logomask && \
$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
\
starter_logomask.c \
\
-o $@ && \
install -m644 logomask.cfg $(LIBPLUG)/ && \
install -m644 $(IMAGEFILES)/icons/hinticons/logomask_hint.png $(LIBPLUG)/
#msgbox
msgbox: $(SOURCE_DIR)/$(TUXBOX_PLUGINS) $(BIN)/msgbox
msgbox: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(BIN)/msgbox
$(BIN)/msgbox: $(D)/freetype $(BIN)
pushd $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/msgbox && \
$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -I$(TARGETINCLUDE)/freetype2 -lfreetype -lz -lpng $(CORTEX-STRINGS) -o $@ msgbox.c gfx.c io.c text.c txtform.c fb_display.c resize.c pngw.cpp png_helper.cpp
pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/msgbox && \
$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-I$(TARGETINCLUDE)/freetype2 \
\
-lfreetype -lz -lpng \
\
fb_display.c \
gfx.c \
io.c \
msgbox.c \
png_helper.cpp \
pngw.cpp \
resize.c \
text.c \
txtform.c \
\
-o $@
#tuxcal
tuxcal: $(SOURCE_DIR)/$(TUXBOX_PLUGINS) $(BIN)/tuxcald $(LIBPLUG)/tuxcal.so
tuxcal: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(BIN)/tuxcald $(LIBPLUG)/tuxcal.so
$(BIN)/tuxcald: $(D)/freetype $(BIN) $(ETCINIT) $(VARCONF)
pushd $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/tuxcal/daemon && \
$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -I$(TARGETINCLUDE)/freetype2 -lpthread -lfreetype -lz $(CORTEX-STRINGS) -o $@ tuxcald.c && \
pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxcal/daemon && \
$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-I$(TARGETINCLUDE)/freetype2 \
\
-lfreetype -lz -lpthread \
\
tuxcald.c \
\
-o $@ && \
install -m755 $(IMAGEFILES)/scripts/tuxcald.init $(ETCINIT)/tuxcald && \
cd $(ETCINIT) && \
ln -sf tuxcald S99tuxcald && \
ln -sf tuxcald K01tuxcald && \
pushd $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/tuxcal && \
pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxcal && \
mkdir -p $(VARCONF)/tuxcal && \
install -m644 tuxcal.conf $(VARCONF)/tuxcal/
$(LIBPLUG)/tuxcal.so: $(LIBPLUG)
pushd $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/tuxcal && \
$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -I$(TARGETINCLUDE)/freetype2 -lfreetype -lz $(CORTEX-STRINGS) -o $@ tuxcal.c && \
pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxcal && \
$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-I$(TARGETINCLUDE)/freetype2 \
\
-lfreetype -lz \
\
tuxcal.c \
\
-o $@ && \
install -m644 tuxcal.cfg $(LIBPLUG)/
install -m644 $(IMAGEFILES)/icons/hinticons/tuxcal_hint.png $(LIBPLUG)/
#tuxcom
tuxcom: $(SOURCE_DIR)/$(TUXBOX_PLUGINS) $(LIBPLUG)/tuxcom.so
tuxcom: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(LIBPLUG)/tuxcom.so
$(LIBPLUG)/tuxcom.so: $(D)/freetype $(LIBPLUG)
pushd $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/tuxcom && \
$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -I$(TARGETINCLUDE)/freetype2 -lfreetype -lz $(CORTEX-STRINGS) -o $@ tuxcom.c && \
pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxcom && \
$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-I$(TARGETINCLUDE)/freetype2 \
\
-lfreetype -lz \
\
tuxcom.c \
\
-o $@ && \
install -m644 tuxcom.cfg $(LIBPLUG)/
install -m644 $(IMAGEFILES)/icons/hinticons/tuxcom_hint.png $(LIBPLUG)/
#tuxmail
tuxmail: $(SOURCE_DIR)/$(TUXBOX_PLUGINS) $(BIN)/tuxmaild $(LIBPLUG)/tuxmail.so
tuxmail: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(BIN)/tuxmaild $(LIBPLUG)/tuxmail.so
$(BIN)/tuxmaild: $(D)/freetype $(D)/openssl $(BIN) $(ETCINIT) $(VARCONF)
pushd $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/tuxmail/daemon && \
$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -I$(TARGETINCLUDE)/freetype2 -lssl -lcrypto -lpthread -lfreetype -lz $(CORTEX-STRINGS) -o $@ tuxmaild.c && \
pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxmail/daemon && \
$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-I$(TARGETINCLUDE)/freetype2 \
\
-lfreetype -lz -lcrypto -lssl -lpthread \
\
tuxmaild.c \
\
-o $@ && \
install -m755 $(IMAGEFILES)/scripts/tuxmaild.init $(ETCINIT)/tuxmaild && \
cd $(ETCINIT) && \
ln -sf tuxmaild S99tuxmaild && \
ln -sf tuxmaild K01tuxmaild && \
pushd $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/tuxmail && \
pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxmail && \
mkdir -p $(VARCONF)/tuxmail && \
install -m644 tuxmail.conf $(VARCONF)/tuxmail/ && \
pushd $(IMAGEFILES)/scripts && \
install -m755 tuxmail.onreadmail $(VARCONF)/tuxmail/
$(LIBPLUG)/tuxmail.so: $(LIBPLUG)
pushd $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/tuxmail && \
$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -I$(TARGETINCLUDE)/freetype2 -lfreetype -lz $(CORTEX-STRINGS) -o $@ tuxmail.c && \
pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxmail && \
$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-I$(TARGETINCLUDE)/freetype2 \
\
-lfreetype -lz \
\
tuxmail.c \
\
-o $@ && \
install -m644 tuxmail.cfg $(LIBPLUG)/
install -m644 $(IMAGEFILES)/icons/hinticons/tuxmail_hint.png $(LIBPLUG)/
#tuxwetter
tuxwetter: $(SOURCE_DIR)/$(NI_TUXWETTER) $(LIBPLUG)/tuxwetter.so
tuxwetter: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(LIBPLUG)/tuxwetter.so
$(LIBPLUG)/tuxwetter.so: $(D)/freetype $(D)/libcurl $(D)/giflib $(D)/libjpeg $(LIBPLUG) $(VARCONF)
pushd $(SOURCE_DIR)/$(NI_TUXWETTER) && \
$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -I$(TARGETINCLUDE)/freetype2 \
-lfreetype -lcrypto -lssl -lz -lcurl -ljpeg -lpng -lgif \
pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxwetter && \
$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-I$(TARGETINCLUDE)/freetype2 \
\
-lfreetype -lz -lcrypto -lssl -lcurl -ljpeg -lpng -lgif \
\
-DWWEATHER \
\
@ -338,9 +437,9 @@ $(LIBPLUG)/tuxwetter.so: $(D)/freetype $(D)/libcurl $(D)/giflib $(D)/libjpeg $(L
ln -sf /lib/tuxbox/plugins/tuxwetter.so $(BIN)/tuxwetter
#cooliTSclimax
cooliTSclimax: $(SOURCE_DIR)/$(TUXBOX_PLUGINS) $(BIN)/cooliTSclimax
cooliTSclimax: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(BIN)/cooliTSclimax
$(BIN)/cooliTSclimax: $(D)/ffmpeg $(BIN)
pushd $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/cooliTSclimax && \
pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/cooliTSclimax && \
$(TARGET)-g++ $(TARGET_CFLAGS) -D__STDC_CONSTANT_MACROS $(TARGET_LDFLAGS) -lpthread -lavformat -lavcodec -lavutil $(CORTEX-STRINGS) -o $@ cooliTSclimax.cpp
# oscammon
@ -353,12 +452,27 @@ $(LIBPLUG)/oscammon.so: $(LIBPLUG) $(VARCONF)
cp -f oscammon_hint.png $(LIBPLUG)/
# shellexec
shellexec: $(SOURCE_DIR)/$(TUXBOX_PLUGINS) $(LIBPLUG)/shellexec.so
shellexec: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(LIBPLUG)/shellexec.so
$(LIBPLUG)/shellexec.so: $(D)/freetype $(LIBPLUG) $(SHAREFLEX) $(VARCONF) $(BIN)
pushd $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/shellexec; \
$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -I$(TARGETINCLUDE)/freetype2 -lfreetype -lz -lpng $(CORTEX-STRINGS) -o $@ shellexec.c gfx.c io.c text.c fb_display.c resize.c pngw.cpp png_helper.cpp; \
install -m644 shellexec.conf $(VARCONF)/; \
install -m644 shellexec.cfg $(LIBPLUG)/
pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/shellexec; \
$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-I$(TARGETINCLUDE)/freetype2 \
\
-lfreetype -lz -lpng \
\
fb_display.c \
gfx.c \
io.c \
png_helper.cpp \
pngw.cpp \
resize.c \
shellexec.c \
text.c \
\
-o $@ && \
install -m644 shellexec.conf $(VARCONF)/; \
install -m644 shellexec.cfg $(LIBPLUG)/
sed -i 's|FONT=|#FONT=|' $(VARCONF)/shellexec.conf
sed -i 's|/var/tuxbox/config/flex|/share/tuxbox/neutrino/flex|' $(VARCONF)/shellexec.conf
mv -f $(LIBPLUG)/shellexec.so $(LIBPLUG)/00_shellexec.so

19
make/prerequisites.mk
View File

@ -46,17 +46,6 @@ $(SOURCE_DIR)/$(TUXBOX_BOOTLOADER):
cd $@ && \
git checkout coolstream_hdx
$(SOURCE_DIR)/$(TUXBOX_PLUGINS):
cd $(SOURCE_DIR) && \
git clone --recursive $(TUXBOX_GIT)/$(notdir $@).git
$(SOURCE_DIR)/$(NI_TUXWETTER):
cd $(SOURCE_DIR) && \
git clone $(NI_GIT)/$(notdir $@).git
cd $@ && \
git remote add $(TUXBOX_REMOTE_REPO) $(TUXBOX_GIT)/$(TUXBOX_TUXWETTER).git && \
git fetch $(TUXBOX_REMOTE_REPO)
$(SOURCE_DIR)/$(NI_LIBSTB-HAL):
cd $(SOURCE_DIR) && \
git clone $(NI_GIT)/$(notdir $@).git
@ -90,9 +79,9 @@ $(SOURCE_DIR)/$(NI_LINUX-KERNEL):
git remote add torvalds https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git && \
git fetch --all
$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) \
$(SOURCE_DIR)/$(NI_DRIVERS-BIN) \
$(SOURCE_DIR)/$(NI_LOGO_STUFF) \
$(SOURCE_DIR)/$(NI_SMARTHOMEINFO) \
$(SOURCE_DIR)/$(NI_STREAMRIPPER) \
$(SOURCE_DIR)/$(NI_OPENTHREADS):
cd $(SOURCE_DIR) && \
@ -185,18 +174,16 @@ toolcheck: $(TOOLCHECK)
neutrino-hd-source: $(N_HD_SOURCE)
tuxbox-git: \
$(SOURCE_DIR)/$(TUXBOX_BOOTLOADER) \
$(SOURCE_DIR)/$(TUXBOX_PLUGINS)
$(SOURCE_DIR)/$(TUXBOX_BOOTLOADER)
ni-git: \
$(BUILD-GENERIC-PC) \
$(SOURCE_DIR)/$(NI_TUXWETTER) \
$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) \
$(SOURCE_DIR)/$(NI_LIBSTB-HAL) \
$(SOURCE_DIR)/$(NI_LIBCOOLSTREAM) \
$(SOURCE_DIR)/$(NI_DRIVERS-BIN) \
$(SOURCE_DIR)/$(NI_FFMPEG) \
$(SOURCE_DIR)/$(NI_LINUX-KERNEL) \
$(SOURCE_DIR)/$(NI_LOGO_STUFF) \
$(SOURCE_DIR)/$(NI_SMARTHOMEINFO) \
$(SOURCE_DIR)/$(NI_STREAMRIPPER) \
$(SOURCE_DIR)/$(NI_OPENTHREADS)

4
make/system-libs.mk
View File

@ -647,8 +647,8 @@ $(HOSTPREFIX)/bin/lua-$(LUA_VER): $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGETPRE
install -m 0755 -D $(BUILD_TMP)/lua-$(LUA_VER)/src/lua $@
$(REMOVE)/lua-$(LUA_VER) $(TARGETPREFIX)/.remove
lua-libs: $(SOURCE_DIR)/$(TUXBOX_PLUGINS) | $(TARGETPREFIX)
cp -a $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/scripts-lua/share/lua/5.2/* $(TARGETPREFIX)/share/lua/$(LUA_ABIVER)/
lua-libs: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) | $(TARGETPREFIX)
cp -a $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/share/lua/5.2/* $(TARGETPREFIX)/share/lua/$(LUA_ABIVER)/
$(D)/lua: $(D)/libncurses $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGETPREFIX)
$(UNTAR)/lua-$(LUA_VER).tar.gz

8
make/system-tools.mk
View File

@ -714,10 +714,10 @@ $(D)/xupnpd: $(D)/lua $(D)/openssl | $(TARGETPREFIX)
cp -a $$object $(TARGETPREFIX)/share/xupnpd/; \
done;
rm $(TARGETPREFIX)/share/xupnpd/plugins/staff/xupnpd_18plus.lua
install -D -m 644 $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/scripts-lua/xupnpd/xupnpd_18plus.lua $(TARGETPREFIX)/share/xupnpd/plugins/
install -D -m 644 $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/scripts-lua/xupnpd/xupnpd_youtube.lua $(TARGETPREFIX)/share/xupnpd/plugins/
install -D -m 644 $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/scripts-lua/xupnpd/xupnpd_coolstream.lua $(TARGETPREFIX)/share/xupnpd/plugins/
install -D -m 644 $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/scripts-lua/xupnpd/xupnpd_cczwei.lua $(TARGETPREFIX)/share/xupnpd/plugins/
install -D -m 644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_18plus.lua $(TARGETPREFIX)/share/xupnpd/plugins/
install -D -m 644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_youtube.lua $(TARGETPREFIX)/share/xupnpd/plugins/
install -D -m 644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_coolstream.lua $(TARGETPREFIX)/share/xupnpd/plugins/
install -D -m 644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_cczwei.lua $(TARGETPREFIX)/share/xupnpd/plugins/
mkdir -p $(TARGETPREFIX)/etc/init.d/
install -D -m 0755 $(IMAGEFILES)/scripts/xupnpd.init $(TARGETPREFIX)/etc/init.d/xupnpd
ln -sf xupnpd $(TARGETPREFIX)/etc/init.d/S99xupnpd

16
make/update.mk
View File

@ -22,21 +22,15 @@ ifneq ($(NO_REMOTE_REPO), true)
git pull $(TUXBOX_REMOTE_REPO) $(TUXBOX_NEUTRINO_BRANCH) && \
git fetch $(TUXBOX_REMOTE_REPO); \
cd $(SOURCE_DIR)/$(NI_LIBSTB-HAL) && \
git checkout master && \
git pull $(TUXBOX_REMOTE_REPO) master && \
git fetch $(TUXBOX_REMOTE_REPO); \
cd $(SOURCE_DIR)/$(NI_TUXWETTER) && \
git checkout master && \
git pull $(TUXBOX_REMOTE_REPO) master && \
git fetch $(TUXBOX_REMOTE_REPO)
cd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) && \
make update-tuxbox-remotes
endif
update-tuxbox-git:
cd $(SOURCE_DIR)/$(TUXBOX_BOOTLOADER) && git pull
cd $(SOURCE_DIR)/$(TUXBOX_PLUGINS) && \
git pull && \
git submodule foreach 'git checkout master; git pull origin master' && \
git submodule update
# rebase of ffmpeg/kernel repos forces us to force push into git repo
# use this target once if such force push was done
@ -53,11 +47,10 @@ update-ni-git:
ifeq ($(HAS_LIBCS), yes)
cd $(SOURCE_DIR)/$(NI_LIBCOOLSTREAM) && git pull --all && git checkout $(NI_LIBCOOLSTREAM_BRANCH)
endif
cd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) && git pull
cd $(SOURCE_DIR)/$(NI_LIBSTB-HAL) && git pull
cd $(SOURCE_DIR)/$(NI_FFMPEG) && git pull --all && git checkout $(NI_FFMPEG_BRANCH)
cd $(SOURCE_DIR)/$(NI_TUXWETTER) && git checkout master && git pull origin master
cd $(SOURCE_DIR)/$(NI_LOGO_STUFF) && git pull
cd $(SOURCE_DIR)/$(NI_SMARTHOMEINFO) && git pull
cd $(SOURCE_DIR)/$(NI_STREAMRIPPER) && git pull
cd $(SOURCE_DIR)/$(NI_OPENTHREADS) && git pull
@ -84,10 +77,9 @@ endif
ifeq ($(HAS_LIBCS), yes)
cd $(SOURCE_DIR)/$(NI_LIBCOOLSTREAM) && git push --all
endif
cd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) && git push
cd $(SOURCE_DIR)/$(NI_LIBSTB-HAL) && git push
cd $(SOURCE_DIR)/$(NI_FFMPEG) && git push
cd $(SOURCE_DIR)/$(NI_TUXWETTER) && git push
cd $(SOURCE_DIR)/$(NI_LOGO_STUFF) && git push
cd $(SOURCE_DIR)/$(NI_SMARTHOMEINFO) && git push
cd $(SOURCE_DIR)/$(NI_STREAMRIPPER) && git push
cd $(SOURCE_DIR)/$(NI_OPENTHREADS) && git push

Write Preview
Loading…
Cancel
Save