public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
* [PATCH 01/11] wio: This is a patch series relocating wio into the standard ipfire directories
@ 2023-04-05 12:28 Adolf Belka
  2023-04-05 12:28 ` [PATCH 02/11] wio: Move backup/includes file to standard IPFire location Adolf Belka
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: Adolf Belka @ 2023-04-05 12:28 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 3465 bytes --]

- This patch is the changes to the wio lfs file related to the relocations
- The modified patch series was built and the generated wio-1.3.2-17.ipfire file was
   used to install wio on a testbed vm system. Everything worked. Tested out with various
   hosts on the system, tested the graphs, tested adding hosts from a network scan and
   from the arp table and everything worked fine. So all the relocations look to have
   worked.
- Files were only relocated, the wio code was not modified in any way.

Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 lfs/wio | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/lfs/wio b/lfs/wio
index 08bac2e02..b173b935a 100644
--- a/lfs/wio
+++ b/lfs/wio
@@ -32,7 +32,7 @@ THISAPP    = wio-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = wio
-PAK_VER    = 16
+PAK_VER    = 17
 
 DEPS       =
 
@@ -59,31 +59,28 @@ dist:
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && mkdir $(DIR_APP) && cp -R $(DIR_SRC)/src/wio/ $(DIR_APP)
-	cd $(DIR_APP)
+	@rm -rf $(DIR_APP)
 	mkdir -p /usr/lib/wio
 	mkdir -p /var/log/wio
 	mkdir -p /var/log/rrd/wio
-	mkdir -p /srv/web/ipfire/html/images/wio
 	mkdir -p /var/ipfire/wio
-
-	install -v -m 755 $(DIR_APP)/wio/wio.cgi /srv/web/ipfire/cgi-bin/
-	install -v -m 755 $(DIR_APP)/wio/wiographs.cgi /srv/web/ipfire/cgi-bin/
-	install -v -m 755 $(DIR_APP)/wio/wio /etc/fcron.minutely/
-	install -v -m 644 $(DIR_APP)/wio/main/wio.conf /var/ipfire/wio/
-	install -v -m 754 $(DIR_APP)/wio/main/wio.pl /var/ipfire/wio/
-	install -v -m 754 $(DIR_APP)/wio/main/wiovpn.pl /var/ipfire/wio/
-	install -v -m 644 $(DIR_APP)/wio/wio-lib.pl /usr/lib/wio/
-	install -v -m 644 $(DIR_APP)/wio/wio-graphs.pl /usr/lib/wio/
-	install -v -m 644 $(DIR_APP)/wio/wioips /var/log/wio/
-	install -v -m 644 $(DIR_APP)/wio/images/* /srv/web/ipfire/html/images/wio/
-	install -v -m 644 $(DIR_APP)/wio/lang/wio.de.pl /var/ipfire/addon-lang/
-	install -v -m 644 $(DIR_APP)/wio/lang/wio.en.pl /var/ipfire/addon-lang/
-	install -v -m 644 $(DIR_APP)/wio/lang/wio.es.pl /var/ipfire/addon-lang/
-	install -v -m 644 $(DIR_APP)/wio/lang/wio.fr.pl /var/ipfire/addon-lang/
-	install -v -m 644 $(DIR_APP)/wio/lang/wio.tr.pl /var/ipfire/addon-lang/
-	install -v -m 644 $(DIR_APP)/wio/EX-wio.menu /var/ipfire/menu.d/
-	install -v -m 644 $(DIR_APP)/wio/config/backup/includes/wio /var/ipfire/backup/addons/includes/wio
+	chmod 755 /srv/web/ipfire/html/images/wio
+
+	install -v -m 755 $(DIR_SRC)/config/wio/wio /etc/fcron.minutely/
+	install -v -m 644 $(DIR_SRC)/config/wio/wio.conf /var/ipfire/wio/
+	install -v -m 754 $(DIR_SRC)/config/wio/wio.pl /var/ipfire/wio/
+	install -v -m 754 $(DIR_SRC)/config/wio/wiovpn.pl /var/ipfire/wio/
+	install -v -m 644 $(DIR_SRC)/config/wio/wio-lib.pl /usr/lib/wio/
+	install -v -m 644 $(DIR_SRC)/config/wio/wio-graphs.pl /usr/lib/wio/
+	install -v -m 644 $(DIR_SRC)/config/wio/wioips /var/log/wio/
+	
+	# Install addon-specific language-files.
+	install -v -m 004 $(DIR_SRC)/config/wio/wio.*.pl \
+		/var/ipfire/addon-lang/	
+		
+	# install backup include file
+	install -v -m 644 $(DIR_SRC)/config/backup/includes/wio \
+			/var/ipfire/backup/addons/includes/wio
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
-- 
2.40.0


^ permalink raw reply	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-04-05 12:28 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-05 12:28 [PATCH 01/11] wio: This is a patch series relocating wio into the standard ipfire directories Adolf Belka
2023-04-05 12:28 ` [PATCH 02/11] wio: Move backup/includes file to standard IPFire location Adolf Belka
2023-04-05 12:28 ` [PATCH 03/11] wio: images moved " Adolf Belka
2023-04-05 12:28 ` [PATCH 04/11] wio: relocate wio menu item " Adolf Belka
2023-04-05 12:28 ` [PATCH 05/11] wio: move cgi files " Adolf Belka
2023-04-05 12:28 ` [PATCH 06/11] wio: move addon language " Adolf Belka
2023-04-05 12:28 ` [PATCH 07/11] wio: move files from src/wio/main/ " Adolf Belka
2023-04-05 12:28 ` [PATCH 08/11] wio: moved files from src/wio directory " Adolf Belka
2023-04-05 12:28 ` [PATCH 09/11] wio: add reference to wio menu Adolf Belka
2023-04-05 12:28 ` [PATCH 10/11] wio: add references to wio cgi and image files Adolf Belka
2023-04-05 12:28 ` [PATCH 11/11] wio: remove unneeded or incorrect commands Adolf Belka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox