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

- neutrino-update: move targets to package dir

master
vanhofen 3 years ago
parent
059d75f286
commit
8b327b1e64
2 changed files with 61 additions and 77 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. 77
      make/flash-updates.mk
  2. 61
      package/neutrino-updates/neutrino-updates.mk

77
make/flash-updates.mk
View File

@ -3,76 +3,6 @@
# #
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
BOXSERIES_UPDATE = hd2 hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo
ifneq ($(DEBUG),yes)
BOXSERIES_UPDATE += hd1
endif
neutrino-update \
ni-neutrino-update:
make u-neutrino
neutrino-updates \
ni-neutrino-updates:
for boxseries in $(BOXSERIES_UPDATE); do \
$(MAKE) BOXSERIES=$${boxseries} clean neutrino-update || exit; \
done;
make clean
neutrino-full-update \
ni-neutrino-full-update:
make u-neutrino-full
neutrino-full-updates \
ni-neutrino-full-updates:
for boxseries in $(BOXSERIES_UPDATE); do \
$(MAKE) BOXSERIES=$${boxseries} clean neutrino-full-update || exit; \
done;
make clean
# -----------------------------------------------------------------------------
u-neutrino: neutrino-clean
$(MAKE) u-init
echo "killall start_neutrino neutrino; sleep 5" >> $(PREINSTALL_SH)
echo "sync; reboot" >> $(POSTINSTALL_SH)
$(MAKE) neutrino
$(INSTALL_EXEC) -D $(TARGET_sysconfdir)/init.d/start_neutrino $(UPDATE_INST_DIR)$(sysconfdir)/init.d/start_neutrino
$(INSTALL_EXEC) -D $(TARGET_bindir)/neutrino $(UPDATE_INST_DIR)$(bindir)/neutrino
$(INSTALL_DATA) -D $(TARGET_datadir)/tuxbox/neutrino/locale/deutsch.locale $(UPDATE_INST_DIR)$(datadir)/tuxbox/neutrino/locale/deutsch.locale
$(INSTALL_DATA) -D $(TARGET_datadir)/tuxbox/neutrino/locale/english.locale $(UPDATE_INST_DIR)$(datadir)/tuxbox/neutrino/locale/english.locale
ifneq ($(DEBUG),yes)
find $(UPDATE_INST_DIR)$(bindir) -type f ! -name *.sh -print0 | xargs -0 $(TARGET_STRIP) || true
endif
$(MAKE) u-update-bin \
UPDATE_DATE=$(shell date +%Y%m%d%H%M) \
UPDATE_MD5FILE=$(UPDATE_MD5FILE_BOXSERIES) \
UPDATE_NAME=$(UPDATE_PREFIX)-$(UPDATE_SUFFIX) \
UPDATE_DESC="Neutrino [$(BOXTYPE_SC)][$(BOXSERIES)] Update \(simple\)"
# -----------------------------------------------------------------------------
u-neutrino-full: neutrino-clean
$(MAKE) u-init
echo "killall start_neutrino neutrino; sleep 5" >> $(PREINSTALL_SH)
echo "sync; reboot" >> $(POSTINSTALL_SH)
$(MAKE) neutrino NEUTRINO_INST_DIR=$(UPDATE_INST_DIR)
$(INSTALL_EXEC) -D $(TARGET_sysconfdir)/init.d/start_neutrino $(UPDATE_INST_DIR)$(sysconfdir)/init.d/start_neutrino
ifneq ($(DEBUG),yes)
find $(UPDATE_INST_DIR)$(bindir) -type f ! -name *.sh -print0 | xargs -0 $(TARGET_STRIP) || true
endif
ifeq ($(PERSISTENT_VAR_PARTITION),yes)
# avoid overrides in user's var-partition
mv $(UPDATE_INST_DIR)/var $(UPDATE_INST_DIR)/var_init
endif
$(MAKE) u-update-bin \
UPDATE_DATE=$(shell date +%Y%m%d%H%M) \
UPDATE_MD5FILE=$(UPDATE_MD5FILE_BOXSERIES) \
UPDATE_NAME=$(UPDATE_PREFIX)-$(UPDATE_SUFFIX)-full \
UPDATE_DESC="Neutrino [$(BOXTYPE_SC)][$(BOXSERIES)] Update \(full\)"
# -----------------------------------------------------------------------------
u-update.urls: update.urls u-update.urls: update.urls
$(MAKE) u-init $(MAKE) u-init
echo "wget -q "http://localhost/control/message?popup=update.urls%20installed." -O /dev/null" >> $(POSTINSTALL_SH) echo "wget -q "http://localhost/control/message?popup=update.urls%20installed." -O /dev/null" >> $(POSTINSTALL_SH)
@ -115,13 +45,6 @@ u-update-bin:
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
PHONY += neutrino-update ni-neutrino-update
PHONY += neutrino-updates ni-neutrino-updates
PHONY += neutrino-full-update ni-neutrino-full-update
PHONY += neutrino-full-updates ni-neutrino-full-updates
PHONY += u-neutrino
PHONY += u-neutrino-full
PHONY += u-update.urls PHONY += u-update.urls
PHONY += u-custom PHONY += u-custom
PHONY += u-init PHONY += u-init

61
package/neutrino-updates/neutrino-updates.mk
View File

@ -0,0 +1,61 @@
################################################################################
#
# neutrino updates
#
################################################################################
BOXSERIES_UPDATE = hd2 hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo
ifneq ($(DEBUG),yes)
BOXSERIES_UPDATE += hd1
endif
neutrino-updates:
for boxseries in $(BOXSERIES_UPDATE); do \
$(MAKE) BOXSERIES=$${boxseries} clean neutrino-update || exit; \
done;
make clean
neutrino-full-updates:
for boxseries in $(BOXSERIES_UPDATE); do \
$(MAKE) BOXSERIES=$${boxseries} clean neutrino-full-update || exit; \
done;
make clean
# -----------------------------------------------------------------------------
neutrino-update: neutrino-clean
$(MAKE) u-init
echo "killall start_neutrino neutrino; sleep 5" >> $(PREINSTALL_SH)
echo "sync; reboot" >> $(POSTINSTALL_SH)
$(MAKE) neutrino
$(INSTALL_EXEC) -D $(TARGET_sysconfdir)/init.d/start_neutrino $(UPDATE_INST_DIR)$(sysconfdir)/init.d/start_neutrino
$(INSTALL_EXEC) -D $(TARGET_bindir)/neutrino $(UPDATE_INST_DIR)$(bindir)/neutrino
$(INSTALL_DATA) -D $(TARGET_datadir)/tuxbox/neutrino/locale/deutsch.locale $(UPDATE_INST_DIR)$(datadir)/tuxbox/neutrino/locale/deutsch.locale
$(INSTALL_DATA) -D $(TARGET_datadir)/tuxbox/neutrino/locale/english.locale $(UPDATE_INST_DIR)$(datadir)/tuxbox/neutrino/locale/english.locale
ifneq ($(DEBUG),yes)
find $(UPDATE_INST_DIR)$(bindir) -type f ! -name *.sh -print0 | xargs -0 $(TARGET_STRIP) || true
endif
$(MAKE) u-update-bin \
UPDATE_DATE=$(shell date +%Y%m%d%H%M) \
UPDATE_MD5FILE=$(UPDATE_MD5FILE_BOXSERIES) \
UPDATE_NAME=$(UPDATE_PREFIX)-$(UPDATE_SUFFIX) \
UPDATE_DESC="Neutrino [$(BOXTYPE_SC)][$(BOXSERIES)] Update \(simple\)"
neutrino-full-update: neutrino-clean
$(MAKE) u-init
echo "killall start_neutrino neutrino; sleep 5" >> $(PREINSTALL_SH)
echo "sync; reboot" >> $(POSTINSTALL_SH)
$(MAKE) neutrino NEUTRINO_INST_DIR=$(UPDATE_INST_DIR)
$(INSTALL_EXEC) -D $(TARGET_sysconfdir)/init.d/start_neutrino $(UPDATE_INST_DIR)$(sysconfdir)/init.d/start_neutrino
ifneq ($(DEBUG),yes)
find $(UPDATE_INST_DIR)$(bindir) -type f ! -name *.sh -print0 | xargs -0 $(TARGET_STRIP) || true
endif
ifeq ($(PERSISTENT_VAR_PARTITION),yes)
# avoid overrides in user's var-partition
mv $(UPDATE_INST_DIR)/var $(UPDATE_INST_DIR)/var_init
endif
$(MAKE) u-update-bin \
UPDATE_DATE=$(shell date +%Y%m%d%H%M) \
UPDATE_MD5FILE=$(UPDATE_MD5FILE_BOXSERIES) \
UPDATE_NAME=$(UPDATE_PREFIX)-$(UPDATE_SUFFIX)-full \
UPDATE_DESC="Neutrino [$(BOXTYPE_SC)][$(BOXSERIES)] Update \(full\)"
Write Preview
Loading…
Cancel
Save