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

- image-update.mk: clean up and resort

master
vanhofen 7 years ago
parent
45de4983cb
commit
e77e1ab23c
2 changed files with 85 additions and 121 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. 204
      make/image-update.mk
  2. 2
      make/rootfs.mk

204
make/image-update.mk
View File

@ -1,7 +1,9 @@
# makefile for image updates
UPDATE_INST_DIR = $(BUILD_TMP)/temp_inst/inst
UPDATE_CTRL_DIR = $(BUILD_TMP)/temp_inst/ctrl
UPDATE_TEMP_DIR = $(BUILD_TMP)/temp_inst
UPDATE_INST_DIR = $(UPDATE_TEMP_DIR)/inst
UPDATE_CTRL_DIR = $(UPDATE_TEMP_DIR)/ctrl
POSTINSTALL_SH = $(UPDATE_CTRL_DIR)/postinstall.sh
PREINSTALL_SH = $(UPDATE_CTRL_DIR)/preinstall.sh
@ -17,98 +19,22 @@ UPDATE_SUFFIX = $(BOXTYPE_SC)-$(BOXSERIES)-update
UPDATE_NAME = $(UPDATE_PREFIX)-$(UPDATE_SUFFIX)
UPDATE_DESC = "Neutrino [$(BOXTYPE_SC)][$(BOXSERIES)] Update"
UPDATE_TYPE = U
# 0 = "Release"
# 1 = "Beta"
# 2 = "Internal"
# L = "Locale"
# S = "Settings"
# U = "Update"
# A = "Addon"
# T = "Text"
# Release = 0
# Beta = 1
# Nightly = 2
# Selfmade = 9
# Locale = L
# Settings = S
# Update = U
# Addon = A
# Text = T
UPDATE_URL = $(NI-SERVER)/$(NI-SUBDIR)
UPDATE_MD5FILE = update.txt
UPDATE_MD5FILE-BOXSERIES= update-$(BOXTYPE_SC)-$(BOXSERIES).txt
UPDATE_MD5FILE-BOXMODEL = update-$(BOXTYPE_SC)-$(BOXMODEL).txt
CHANLIST_URL = $(NI-SERVER)/channellists
CHANLIST_MD5FILE= lists.txt
channellists: matze-19 matze-19-13 pathauf_HD-19
u-FritzCallMonitor:
$(MAKE) u-init
echo "killall FritzCallMonitor" >> $(PREINSTALL_SH)
echo "wget -q \"http://localhost/control/message?popup=FritzCallMonitor%20installed.\" -O /dev/null" >> $(POSTINSTALL_SH)
echo "sleep 5" >> $(POSTINSTALL_SH)
echo "/bin/sync" >> $(POSTINSTALL_SH)
mkdir -pv $(UPDATE_INST_DIR)/bin && \
mkdir -pv $(UPDATE_INST_DIR)/var/tuxbox/config && \
cp -f $(BIN)/FritzCallMonitor $(UPDATE_INST_DIR)/bin/ && \
cp -f $(TARGET_DIR)/var/tuxbox/config/FritzCallMonitor.cfg $(UPDATE_INST_DIR)/var/tuxbox/config/
$(MAKE) u-update-bin \
UPDATE_MD5FILE=$(UPDATE_MD5FILE-BOXMODEL) \
UPDATE_NAME=FritzCallMonitor-$(BOXMODEL) \
UPDATE_DESC=FritzCallMonitor-$(BOXMODEL) \
UPDATE_VERSION_STRING=`cat $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/FritzCallMonitor/FritzCallMonitor.h | grep 'define VERSION' | cut -d\" -f2`
u-FritzInfoMonitor:
$(MAKE) u-init
echo "killall FritzCallMonitor" >> $(PREINSTALL_SH)
echo "wget -q \"http://localhost/control/message?popup=FritzInfoMonitor%20installed.\" -O /dev/null" >> $(POSTINSTALL_SH)
echo "sleep 5" >> $(POSTINSTALL_SH)
echo "/bin/sync" >> $(POSTINSTALL_SH)
mkdir -pv $(UPDATE_INST_DIR)/var/tuxbox/config && \
mkdir -pv $(UPDATE_INST_DIR)/lib/tuxbox/plugins && \
cp -f $(LIBPLUGINS)/FritzInfoMonitor.cfg $(UPDATE_INST_DIR)/lib/tuxbox/plugins/ && \
cp -f $(LIBPLUGINS)/FritzInfoMonitor.so $(UPDATE_INST_DIR)/lib/tuxbox/plugins/ && \
cp -f $(TARGET_DIR)/var/tuxbox/config/FritzCallMonitor.cfg $(UPDATE_INST_DIR)/var/tuxbox/config/
$(MAKE) u-update-bin \
UPDATE_MD5FILE=$(UPDATE_MD5FILE-BOXMODEL) \
UPDATE_NAME=FritzInfoMonitor-$(BOXMODEL) \
UPDATE_DESC=FritzInfoMonitor-$(BOXMODEL) \
UPDATE_VERSION_STRING=`cat $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/FritzCallMonitor/FritzInfoMonitor/FritzInfoMonitor.h | grep 'define VERSION' | cut -d\" -f2`
u-lcd4linux: $(D)/lcd4linux
ifneq ($(DEBUG), yes)
$(TARGET)-strip $(TARGET_DIR)/bin/lcd4linux
endif
$(MAKE) u-init
echo "service lcd4linux stop" >> $(PREINSTALL_SH)
echo "wget -q \"http://localhost/control/message?popup=LCD4Linux%20installed.\" -O /dev/null" >> $(POSTINSTALL_SH)
echo "sleep 5" >> $(POSTINSTALL_SH)
echo "/bin/sync" >> $(POSTINSTALL_SH)
echo "service lcd4linux start" >> $(POSTINSTALL_SH)
mkdir -pv $(UPDATE_INST_DIR)/bin && \
cp -f $(TARGET_DIR)/bin/lcd4linux $(UPDATE_INST_DIR)/bin/ && \
$(MAKE) u-update-bin \
UPDATE_MD5FILE=$(UPDATE_MD5FILE-BOXSERIES) \
UPDATE_NAME=lcd4linux-$(BOXSERIES) \
UPDATE_DESC="LCD4Linux [$(BOXSERIES)]" \
UPDATE_VERSION_STRING=`strings $(TARGET_DIR)/bin/lcd4linux | grep -m1 LCD4Linux | cut -d" " -f2`
u-pr-auto-timer:
$(MAKE) u-init
install -m755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/preinstall.sh $(PREINSTALL_SH)
install -m755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/postinstall.sh $(POSTINSTALL_SH)
mkdir -pv $(UPDATE_INST_DIR)/lib/tuxbox/plugins
install -m755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.sh $(UPDATE_INST_DIR)/lib/tuxbox/plugins/
install -m644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.cfg $(UPDATE_INST_DIR)/lib/tuxbox/plugins/
install -m755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer $(UPDATE_INST_DIR)/lib/tuxbox/plugins/
install -m755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer_hint.png $(UPDATE_INST_DIR)/lib/tuxbox/plugins/
install -m755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner $(UPDATE_INST_DIR)/lib/tuxbox/plugins/
mkdir -pv $(UPDATE_INST_DIR)/var/tuxbox/config
install -m644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/
install -m644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.rules.template $(UPDATE_INST_DIR)/var/tuxbox/config/
install -m644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/
install -m644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner.rules.template $(UPDATE_INST_DIR)/var/tuxbox/config/
VERSION_STRING=`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 \
UPDATE_NAME=pr-auto-timer_$${VERSION_STRING//./} \
UPDATE_DESC=Auto-Timer \
UPDATE_VERSION_STRING=$$VERSION_STRING
# -----------------------------------------------------------------------------
u-neutrino: neutrino-clean
$(MAKE) u-init
@ -126,6 +52,8 @@ endif
$(MAKE) u-update-bin \
UPDATE_MD5FILE=$(UPDATE_MD5FILE-BOXSERIES)
# -----------------------------------------------------------------------------
u-neutrino-full: neutrino-clean
$(MAKE) u-init
echo "killall start_neutrino neutrino; sleep 5" >> $(PREINSTALL_SH)
@ -143,21 +71,7 @@ endif
$(MAKE) u-update-bin \
UPDATE_MD5FILE=$(UPDATE_MD5FILE-BOXSERIES)
u-openvpn-setup:
$(MAKE) u-init
echo "rm -f /var/etc/init.d/openvpn" >> $(PREINSTALL_SH)
echo "cd /tmp/" >> $(POSTINSTALL_SH)
echo "wget -q "http://localhost/control/message?popup=OpenVPN-Plugin%20installed." -O /dev/null" >> $(POSTINSTALL_SH)
echo "wget -q "http://localhost/control/reloadplugins" -O /dev/null" >> $(POSTINSTALL_SH)
#$(MAKE) openvpn
#$(TARGET)-strip $(TARGET_DIR)/sbin/openvpn
#mkdir -p $(UPDATE_INST_DIR)/var/sbin && \
#cp -f $(TARGET_DIR)/sbin/openvpn $(UPDATE_INST_DIR)/var/sbin
cp -a $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/openvpn-setup/* $(UPDATE_INST_DIR)/
$(MAKE) u-update-bin \
UPDATE_NAME=openvpn-setup-$(BOXSERIES)-v011 \
UPDATE_DESC="OpenVPN-Setup" \
UPDATE_VERSION_STRING="0.11"
# -----------------------------------------------------------------------------
u-update.urls: update.urls
$(MAKE) u-init
@ -168,14 +82,37 @@ u-update.urls: update.urls
UPDATE_NAME=update.urls \
UPDATE_DESC=update.urls
u-custom:
# -----------------------------------------------------------------------------
u-pr-auto-timer:
$(MAKE) u-init
install -m755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/preinstall.sh $(PREINSTALL_SH)
install -m755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/postinstall.sh $(POSTINSTALL_SH)
mkdir -pv $(UPDATE_INST_DIR)/lib/tuxbox/plugins
install -m755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.sh $(UPDATE_INST_DIR)/lib/tuxbox/plugins/
install -m644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.cfg $(UPDATE_INST_DIR)/lib/tuxbox/plugins/
install -m755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer $(UPDATE_INST_DIR)/lib/tuxbox/plugins/
install -m755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer_hint.png $(UPDATE_INST_DIR)/lib/tuxbox/plugins/
install -m755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner $(UPDATE_INST_DIR)/lib/tuxbox/plugins/
mkdir -pv $(UPDATE_INST_DIR)/var/tuxbox/config
install -m644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/
install -m644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.rules.template $(UPDATE_INST_DIR)/var/tuxbox/config/
install -m644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/
install -m644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner.rules.template $(UPDATE_INST_DIR)/var/tuxbox/config/
VERSION_STRING=`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=custom_bin.txt \
UPDATE_NAME=custom_bin \
UPDATE_DESC="Custom Package" \
UPDATE_VERSION_STRING="0.00"
UPDATE_MD5FILE=pr-auto-timer.txt \
UPDATE_URL=$(NI-SERVER)/plugins/pr-auto-timer \
UPDATE_NAME=pr-auto-timer_$${VERSION_STRING//./} \
UPDATE_DESC=Auto-Timer \
UPDATE_VERSION_STRING=$$VERSION_STRING
# -----------------------------------------------------------------------------
# --- channellists ---
CHANNELLISTS_URL = $(NI-SERVER)/channellists
CHANNELLISTS_MD5FILE = lists.txt
channellists: matze-19 matze-19-13 pathauf_HD-19
matze-19 \
matze-19-13 \
@ -223,23 +160,22 @@ pathauf_HD-19:
done && \
$(MAKE) u-update-bin \
UPDATE_TYPE=S \
UPDATE_URL=$(CHANLIST_URL) \
UPDATE_MD5FILE=$(CHANLIST_MD5FILE) \
UPDATE_URL=$(CHANNELLISTS_URL) \
UPDATE_MD5FILE=$(CHANNELLISTS_MD5FILE) \
UPDATE_NAME=$@ \
UPDATE_DESC="$$desc - " \
UPDATE_VERSION_STRING="$$date" \
u-update-bin:
pushd $(BUILD_TMP) && \
tar -czvf $(UPDATE_DIR)/$(UPDATE_NAME).bin temp_inst
echo $(UPDATE_URL)/$(UPDATE_NAME).bin $(UPDATE_TYPE)$(UPDATE_VERSION)$(UPDATE_DATE) `md5sum $(UPDATE_DIR)/$(UPDATE_NAME).bin | cut -c1-32` $(UPDATE_DESC) $(UPDATE_VERSION_STRING) >> $(UPDATE_DIR)/$(UPDATE_MD5FILE)
$(MAKE) u-clean
# -----------------------------------------------------------------------------
u-clean:
rm -rf $(BUILD_TMP)/temp_inst
u-custom:
$(MAKE) u-update-bin \
UPDATE_MD5FILE=custom_bin.txt \
UPDATE_NAME=custom_bin \
UPDATE_DESC="Custom Package" \
UPDATE_VERSION_STRING="0.00"
u-clean-all: u-clean
rm -rf $(UPDATE_DIR)
# -----------------------------------------------------------------------------
u-init: u-clean | $(UPDATE_DIR)
mkdir -p $(UPDATE_INST_DIR)
@ -248,3 +184,31 @@ u-init: u-clean | $(UPDATE_DIR)
chmod 0755 $(PREINSTALL_SH)
echo -e "#!/bin/sh\n#" > $(POSTINSTALL_SH)
chmod 0755 $(POSTINSTALL_SH)
u-clean:
rm -rf $(UPDATE_TEMP_DIR)
u-clean-all: u-clean
rm -rf $(UPDATE_DIR)
u-update-bin:
set -e; cd $(BUILD_TMP); \
tar -czvf $(UPDATE_DIR)/$(UPDATE_NAME).bin temp_inst
echo $(UPDATE_URL)/$(UPDATE_NAME).bin $(UPDATE_TYPE)$(UPDATE_VERSION)$(UPDATE_DATE) `md5sum $(UPDATE_DIR)/$(UPDATE_NAME).bin | cut -c1-32` $(UPDATE_DESC) $(UPDATE_VERSION_STRING) >> $(UPDATE_DIR)/$(UPDATE_MD5FILE)
$(MAKE) u-clean
# -----------------------------------------------------------------------------
PHONY += u-neutrino
PHONY += u-neutrino-full
PHONY += u-update.urls
PHONY += u-pr-auto-timer
PHONY += channellists
PHONY += matze-19
PHONY += matze-19-13
PHONY += pathauf_HD-19
PHONY += u-custom
PHONY += u-init
PHONY += u-clean
PHONY += u-clean-all
PHONY += u-update-bin

2
make/rootfs.mk
View File

@ -29,7 +29,7 @@ endif
update.urls: $(TARGET_DIR)/var/etc/update.urls
$(TARGET_DIR)/var/etc/update.urls:
echo "$(NI-SERVER)/update.php" > $@
echo "$(CHANLIST_URL)/$(CHANLIST_MD5FILE)" >> $@
echo "$(CHANNELLISTS_URL)/$(CHANNELLISTS_MD5FILE)" >> $@
# create filesystem for our images
$(BOX): | $(TARGET_DIR)

Write Preview
Loading…
Cancel
Save