From 65a0c62b0de92f90cd5c5e90359ab70349517c58 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 8 Nov 2015 13:33:25 -0800 Subject: [PATCH] Update the 'Build' and 'Install' files for 5.0 Signed-off-by: Tom Eastep --- docs/Build.xml | 24 ++++++++++++++++-------- docs/Install.xml | 18 +++++++++++++++--- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/docs/Build.xml b/docs/Build.xml index 07367be07..d8a6a2fb7 100644 --- a/docs/Build.xml +++ b/docs/Build.xml @@ -164,10 +164,10 @@
- build45 and build46 + build45, build46 and build50 - These are the scripts that respectively build Shorewall 4.5 and - Shorewall 4.6 packages from Git. + These are the scripts that respectively build Shorewall 4.5, + Shorewall 4.6 and Shorewall 5.0 packages from Git. The scripts copy content from Git using the git archive command. They then use that content to build the @@ -281,7 +281,7 @@ The general form of the build command is:
- build4x [ -options + buildxx [ -options ] release [ prior release ]
@@ -549,15 +549,23 @@ - MAC - Apple MacIntosh (Shorewall and Shorewall6 packages - only) + MAC - Apple MacIntosh (Shorewall-core, Shorewall and + Shorewall6 packages only) - CYGWIN - Cygwin under Windows (Shorewall and Shorewall6 - packages only) + CYGWIN - Cygwin under Windows (Shorewall-core, Shorewall and + Shorewall6 packages only) + + + + OPENWRT - OpenWRT (Shorewall-core, Shorewall6-lite ad + Shorewall6-lite only) + + See the installation article for + additional information
diff --git a/docs/Install.xml b/docs/Install.xml index 8f18094cc..1075c308c 100644 --- a/docs/Install.xml +++ b/docs/Install.xml @@ -187,6 +187,10 @@ shorewallrc.suse (SLES and OpenSuSE) + + + shorewallrc.openwrt (OpenWRT) + When installing 4.5.2 or later for the first time, a special @@ -232,9 +236,9 @@ ./install.sh shorewallrcfile-that-meets-your-needs - + - Example: ./install + Example: ./install.sh shorewallrc.debian @@ -334,6 +338,14 @@ SLES and OpenSuSe + + + openwrt + + + OpenWRT (Shorewall 5.0.2 and later) + + @@ -698,7 +710,7 @@ root of the filesystem tree. In other words, the created installation is only runnable if one chroots to $DESTDIR. Please note that the uninstall.sh scripts cannot uninstall a configuration installed with - non-empty DESTDIR. + non-empty DESTDIR.