From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 01/11] wio: This is a patch series relocating wio into the standard ipfire directories Date: Wed, 05 Apr 2023 14:28:25 +0200 Message-ID: <20230405122835.12821-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0719171474857917258==" List-Id: --===============0719171474857917258== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - 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 f= ile 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 Signed-off-by: Adolf Belka --- 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 =3D wio-$(VER) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D wio -PAK_VER =3D 16 +PAK_VER =3D 17 =20 DEPS =3D =20 @@ -59,31 +59,28 @@ dist: =20 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && mkdir $(DIR_APP) && cp -R $(DIR_SRC)/src/wio/ $(DIR_A= PP) - 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/bac= kup/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/ +=09 + # Install addon-specific language-files. + install -v -m 004 $(DIR_SRC)/config/wio/wio.*.pl \ + /var/ipfire/addon-lang/=09 + =09 + # install backup include file + install -v -m 644 $(DIR_SRC)/config/backup/includes/wio \ + /var/ipfire/backup/addons/includes/wio =20 @rm -rf $(DIR_APP) @$(POSTBUILD) --=20 2.40.0 --===============0719171474857917258==--