From f489aa7e32465b541743b5fd638dd90ff70dee4a Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 27 Feb 2021 23:50:34 +0100 Subject: [PATCH] - channellists: move files to package dir --- make/flash-updates.mk | 20 +++++++++---------- .../files}/matze-192-130/bouquets.xml | 0 .../files}/matze-192-130/services.xml | 0 .../files}/matze-192-130/ubouquets.xml | 0 .../files}/matze-192/bouquets.xml | 0 .../files}/matze-192/services.xml | 0 .../files}/matze-192/ubouquets.xml | 0 .../files}/update-ctrl/postinstall.sh | 0 .../files}/update-ctrl/preinstall.sh | 0 9 files changed, 10 insertions(+), 10 deletions(-) rename {skel-root/general/channellists => package/channellists/files}/matze-192-130/bouquets.xml (100%) rename {skel-root/general/channellists => package/channellists/files}/matze-192-130/services.xml (100%) rename {skel-root/general/channellists => package/channellists/files}/matze-192-130/ubouquets.xml (100%) rename {skel-root/general/channellists => package/channellists/files}/matze-192/bouquets.xml (100%) rename {skel-root/general/channellists => package/channellists/files}/matze-192/services.xml (100%) rename {skel-root/general/channellists => package/channellists/files}/matze-192/ubouquets.xml (100%) rename {skel-root/general/channellists => package/channellists/files}/update-ctrl/postinstall.sh (100%) rename {skel-root/general/channellists => package/channellists/files}/update-ctrl/preinstall.sh (100%) diff --git a/make/flash-updates.mk b/make/flash-updates.mk index e1974ff2..74fca8f5 100644 --- a/make/flash-updates.mk +++ b/make/flash-updates.mk @@ -111,10 +111,10 @@ channellists: matze-192 matze-192-130 matze-192 \ matze-192-130: $(MAKE) u-init - $(INSTALL_EXEC) $(TARGET_FILES)/channellists/update-ctrl/preinstall.sh $(PREINSTALL_SH) - $(INSTALL_EXEC) $(TARGET_FILES)/channellists/update-ctrl/postinstall.sh $(POSTINSTALL_SH) - mkdir -pv $(UPDATE_INST_DIR)/var/tuxbox/config/zapit && \ - cp -f $(TARGET_FILES)/channellists/$(@)/* $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/ + $(INSTALL_EXEC) $(PACKAGE_DIR)/channellists/files/update-ctrl/preinstall.sh $(PREINSTALL_SH) + $(INSTALL_EXEC) $(PACKAGE_DIR)/channellists/files/update-ctrl/postinstall.sh $(POSTINSTALL_SH) + mkdir -p $(UPDATE_INST_DIR)/var/tuxbox/config/zapit + $(INSTALL_COPY) $(PACKAGE_DIR)/channellists/files/$(@)/* $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/ # remove non-printable chars and re-format xml-files $(CD) $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/; \ for file in *.xml; do \ @@ -135,9 +135,9 @@ matze-192-130: # # we should try to keep this array table up-to-date ;-) # - DIR[0]="#directory" && DESC[0]="#description" && DATE[0]="#date" ; \ - DIR[1]="matze-192" && DESC[1]="matze-Settings 19.2" && DATE[1]="20.12.2020" ; \ - DIR[2]="matze-192-130" && DESC[2]="matze-Settings 19.2, 13.0" && DATE[2]="20.12.2020" ; \ + DIR[0]="#directory" ; DESC[0]="#description" ; DATE[0]="#date" ; \ + DIR[1]="matze-192" ; DESC[1]="matze-Settings 19.2" ; DATE[1]="20.12.2020" ; \ + DIR[2]="matze-192-130" ; DESC[2]="matze-Settings 19.2, 13.0" ; DATE[2]="20.12.2020" ; \ #; \ i=0; \ for dir in $${DIR[*]}; do \ @@ -149,7 +149,7 @@ matze-192-130: else \ i=$$((i+1)); \ fi; \ - done && \ + done; \ $(MAKE) u-update-bin \ UPDATE_TYPE=S \ UPDATE_SITE=$(CHANNELLISTS_SITE) \ @@ -163,8 +163,8 @@ matze-192-130: initial-settings: matze-192 $(REMOVE)/initial $(MKDIR)/initial - $(CHDIR)/initial && \ - tar -xf $(STAGING_DIR)/updates/matze-192.bin && \ + $(CHDIR)/initial; \ + tar -xf $(STAGING_DIR)/updates/matze-192.bin; \ cp temp_inst/inst/var/tuxbox/config/zapit/* $(SOURCE_DIR)/$(NI_NEUTRINO)/data/initial/ P192=`grep -m 1 'position=\"192\"' $(SOURCE_DIR)/$(NI_NEUTRINO)/data/config/satellites.xml`; \ P192=`echo $$P192`; \ diff --git a/skel-root/general/channellists/matze-192-130/bouquets.xml b/package/channellists/files/matze-192-130/bouquets.xml similarity index 100% rename from skel-root/general/channellists/matze-192-130/bouquets.xml rename to package/channellists/files/matze-192-130/bouquets.xml diff --git a/skel-root/general/channellists/matze-192-130/services.xml b/package/channellists/files/matze-192-130/services.xml similarity index 100% rename from skel-root/general/channellists/matze-192-130/services.xml rename to package/channellists/files/matze-192-130/services.xml diff --git a/skel-root/general/channellists/matze-192-130/ubouquets.xml b/package/channellists/files/matze-192-130/ubouquets.xml similarity index 100% rename from skel-root/general/channellists/matze-192-130/ubouquets.xml rename to package/channellists/files/matze-192-130/ubouquets.xml diff --git a/skel-root/general/channellists/matze-192/bouquets.xml b/package/channellists/files/matze-192/bouquets.xml similarity index 100% rename from skel-root/general/channellists/matze-192/bouquets.xml rename to package/channellists/files/matze-192/bouquets.xml diff --git a/skel-root/general/channellists/matze-192/services.xml b/package/channellists/files/matze-192/services.xml similarity index 100% rename from skel-root/general/channellists/matze-192/services.xml rename to package/channellists/files/matze-192/services.xml diff --git a/skel-root/general/channellists/matze-192/ubouquets.xml b/package/channellists/files/matze-192/ubouquets.xml similarity index 100% rename from skel-root/general/channellists/matze-192/ubouquets.xml rename to package/channellists/files/matze-192/ubouquets.xml diff --git a/skel-root/general/channellists/update-ctrl/postinstall.sh b/package/channellists/files/update-ctrl/postinstall.sh similarity index 100% rename from skel-root/general/channellists/update-ctrl/postinstall.sh rename to package/channellists/files/update-ctrl/postinstall.sh diff --git a/skel-root/general/channellists/update-ctrl/preinstall.sh b/package/channellists/files/update-ctrl/preinstall.sh similarity index 100% rename from skel-root/general/channellists/update-ctrl/preinstall.sh rename to package/channellists/files/update-ctrl/preinstall.sh