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

- move plugins to /share/tuxbox/neutrino/plugins

master
vanhofen 7 years ago
parent
0182166517
commit
a9793741dd
3 changed files with 14 additions and 16 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. 2
      make/environment-target.mk
  2. 12
      make/image-update.mk
  3. 16
      make/neutrino-plugins.mk

2
make/environment-target.mk
View File

@ -5,7 +5,6 @@
BIN = $(TARGET_DIR)/bin BIN = $(TARGET_DIR)/bin
ETCINITD = $(TARGET_DIR)/etc/init.d ETCINITD = $(TARGET_DIR)/etc/init.d
LIBPLUGINS = $(TARGET_DIR)/lib/tuxbox/plugins
SBIN = $(TARGET_DIR)/sbin SBIN = $(TARGET_DIR)/sbin
SHAREFLEX = $(TARGET_DIR)/share/tuxbox/neutrino/flex SHAREFLEX = $(TARGET_DIR)/share/tuxbox/neutrino/flex
SHAREICONS = $(TARGET_DIR)/share/tuxbox/neutrino/icons SHAREICONS = $(TARGET_DIR)/share/tuxbox/neutrino/icons
@ -18,7 +17,6 @@ VARINITD = $(TARGET_DIR)/var/etc/init.d
VARPLUGINS = $(TARGET_DIR)/var/tuxbox/plugins VARPLUGINS = $(TARGET_DIR)/var/tuxbox/plugins
$(ETCINITD) \ $(ETCINITD) \
$(LIBPLUGINS) \
$(SBIN) \ $(SBIN) \
$(SHAREFLEX) \ $(SHAREFLEX) \
$(SHAREICONS) \ $(SHAREICONS) \

12
make/image-update.mk
View File

@ -82,12 +82,12 @@ u-pr-auto-timer:
$(MAKE) u-init $(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/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/postinstall.sh $(POSTINSTALL_SH)
install -d $(UPDATE_INST_DIR)/lib/tuxbox/plugins 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)/lib/tuxbox/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)/lib/tuxbox/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)/lib/tuxbox/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)/lib/tuxbox/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)/lib/tuxbox/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 -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.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/pr-auto-timer.rules.template $(UPDATE_INST_DIR)/var/tuxbox/config/

16
make/neutrino-plugins.mk
View File

@ -109,10 +109,10 @@ $(D)/channellogos: $(SOURCE_DIR)/$(NI_LOGO-STUFF) $(SHAREICONS)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
$(D)/logo-addon: $(SOURCE_DIR)/$(NI_LOGO-STUFF) $(LIBPLUGINS) $(D)/logo-addon: $(SOURCE_DIR)/$(NI_LOGO-STUFF) $(SHAREPLUGINS)
install -m 0755 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logo-addon/*.sh $(LIBPLUGINS)/ install -m 0755 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logo-addon/*.sh $(SHAREPLUGINS)/
install -m 0644 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logo-addon/*.cfg $(LIBPLUGINS)/ install -m 0644 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logo-addon/*.cfg $(SHAREPLUGINS)/
install -m 0644 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logo-addon/*.png $(LIBPLUGINS)/ install -m 0644 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logo-addon/*.png $(SHAREPLUGINS)/
$(TOUCH) $(TOUCH)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@ -124,12 +124,12 @@ $(D)/doscam-webif-skin:
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
$(D)/neutrino-mediathek: $(LIBPLUGINS) | $(TARGET_DIR) $(D)/neutrino-mediathek: $(SHAREPLUGINS) | $(TARGET_DIR)
$(REMOVE)/mediathek.git $(REMOVE)/mediathek.git
get-git-source.sh https://github.com/neutrino-mediathek/mediathek.git $(ARCHIVE)/mediathek.git get-git-source.sh https://github.com/neutrino-mediathek/mediathek.git $(ARCHIVE)/mediathek.git
$(CPDIR)/mediathek.git $(CPDIR)/mediathek.git
$(CHDIR)/mediathek.git; \ $(CHDIR)/mediathek.git; \
cp -a plugins/* $(LIBPLUGINS)/; \ cp -a plugins/* $(SHAREPLUGINS)/; \
cp -a share $(TARGET_DIR) cp -a share $(TARGET_DIR)
$(REMOVE)/mediathek.git $(REMOVE)/mediathek.git
$(TOUCH) $(TOUCH)
@ -145,7 +145,7 @@ LINKS_PATCH = links-$(LINKS_VER).patch
LINKS_PATCH += links-$(LINKS_VER)-ac-prog-cxx.patch LINKS_PATCH += links-$(LINKS_VER)-ac-prog-cxx.patch
LINKS_PATCH += links-$(LINKS_VER)-input-$(BOXTYPE).patch LINKS_PATCH += links-$(LINKS_VER)-input-$(BOXTYPE).patch
$(D)/links: $(D)/libpng $(D)/libjpeg $(D)/openssl $(ARCHIVE)/links-$(LINKS_VER).tar.bz2 $(LIBPLUGINS) | $(TARGET_DIR) $(D)/links: $(D)/libpng $(D)/libjpeg $(D)/openssl $(ARCHIVE)/links-$(LINKS_VER).tar.bz2 $(SHAREPLUGINS) | $(TARGET_DIR)
$(REMOVE)/links-$(LINKS_VER) $(REMOVE)/links-$(LINKS_VER)
$(UNTAR)/links-$(LINKS_VER).tar.bz2 $(UNTAR)/links-$(LINKS_VER).tar.bz2
$(CHDIR)/links-$(LINKS_VER)/intl; \ $(CHDIR)/links-$(LINKS_VER)/intl; \
@ -173,7 +173,7 @@ $(D)/links: $(D)/libpng $(D)/libjpeg $(D)/openssl $(ARCHIVE)/links-$(LINKS_VER).
; \ ; \
$(MAKE); \ $(MAKE); \
$(MAKE) install DESTDIR=$(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR)
mv -f $(BIN)/links $(LIBPLUGINS)/links.so mv -f $(BIN)/links $(SHAREPLUGINS)/links.so
cp -a $(IMAGEFILES)/links/* $(TARGET_DIR)/ cp -a $(IMAGEFILES)/links/* $(TARGET_DIR)/
$(REMOVE)/links-$(LINKS_VER) $(REMOVE)/links-$(LINKS_VER)
$(TOUCH) $(TOUCH)

Write Preview
Loading…
Cancel
Save