<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"><head><meta name=Generator content="Microsoft Word 15 (filtered medium)"><style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman",serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
p
{mso-style-priority:99;
mso-margin-top-alt:auto;
margin-right:0cm;
mso-margin-bottom-alt:auto;
margin-left:0cm;
font-size:12.0pt;
font-family:"Times New Roman",serif;}
span.EmailStyle18
{mso-style-type:personal;
font-family:"Calibri",sans-serif;
color:#1F497D;}
span.EmailStyle19
{mso-style-type:personal-compose;
font-family:"Calibri",sans-serif;
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:70.85pt 70.85pt 2.0cm 70.85pt;}
div.WordSection1
{page:WordSection1;}
--></style></head><body lang=DE link=blue vlink=purple><div class=WordSection1><p class=MsoNormal><span style='font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US'>Ich lasse die beiden Patches mal noch 1-2 Tage liegen, hier wäre ein zweites Review schön.<o:p></o:p></span></p><p class=MsoNormal><span style='font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US'><o:p> </o:p></span></p><p class=MsoNormal><span style='font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US'><o:p> </o:p></span></p><div style='border:none;border-left:solid blue 1.5pt;padding:0cm 0cm 0cm 4.0pt'><div><div style='border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0cm 0cm 0cm'><p class=MsoNormal><b><span lang=EN-US style='font-size:11.0pt;font-family:"Calibri",sans-serif'>From:</span></b><span lang=EN-US style='font-size:11.0pt;font-family:"Calibri",sans-serif'> franken-dev [mailto:franken-dev-bounces@freifunk.net] <b>On Behalf Of </b>mail@adrianschmutzler.de<br><b>Sent:</b> Sonntag, 3. Februar 2019 16:59<br><b>To:</b> 'Tim Niemeyer' <tim@tn-x.org>; franken-dev@freifunk.net<br><b>Subject:</b> RE: [PATCH v2 1/2] packages/fff: add layer3 variant<o:p></o:p></span></p></div></div><p class=MsoNormal><o:p> </o:p></p><p><span style='font-family:"Calibri",sans-serif'>Reviewed-by: Adrian Schmutzler <<a href="mailto:freifunk@adrianschmutzler.de">freifunk@adrianschmutzler.de</a>></span> <o:p></o:p></p><p><span style='font-family:"Calibri",sans-serif'>Zwecks vpn-select schicke ich wie vorgeschlagen einen separaten Patch.</span> <o:p></o:p></p><p><span style='font-family:"Calibri",sans-serif'>> -----Original Message-----</span> <br><span style='font-family:"Calibri",sans-serif'>> From: franken-dev [<a href="mailto:franken-dev-bounces@freifunk.net">mailto:franken-dev-bounces@freifunk.net</a>] On Behalf</span> <br><span style='font-family:"Calibri",sans-serif'>> Of Tim Niemeyer</span> <br><span style='font-family:"Calibri",sans-serif'>> Sent: Sonntag, 3. Februar 2019 14:06</span> <br><span style='font-family:"Calibri",sans-serif'>> To: <a href="mailto:franken-dev@freifunk.net">franken-dev@freifunk.net</a></span> <br><span style='font-family:"Calibri",sans-serif'>> Subject: [PATCH v2 1/2] packages/fff: add layer3 variant</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> Signed-off-by: Tim Niemeyer <<a href="mailto:tim@tn-x.org">tim@tn-x.org</a>></span> <br><span style='font-family:"Calibri",sans-serif'>> ---</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> Changes in v2:</span> <br><span style='font-family:"Calibri",sans-serif'>> - Changed fff-openvpn to fff-ra</span> <br><span style='font-family:"Calibri",sans-serif'>> (fff-odhcpd was renamed to fff-ra and is already applied,</span> <br><span style='font-family:"Calibri",sans-serif'>> fff-openvpn is not applied yet.)</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> Changes in v1:</span> <br><span style='font-family:"Calibri",sans-serif'>> - First version of this patch</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> src/packages/fff/fff/Makefile | 57 +++++++++++++++++++++++++++++----</span> <br><span style='font-family:"Calibri",sans-serif'>> ----------</span> <br><span style='font-family:"Calibri",sans-serif'>> 1 file changed, 39 insertions(+), 18 deletions(-)</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile</span> <br><span style='font-family:"Calibri",sans-serif'>> index dce33f9..fd63433 100644</span> <br><span style='font-family:"Calibri",sans-serif'>> --- a/src/packages/fff/fff/Makefile</span> <br><span style='font-family:"Calibri",sans-serif'>> +++ b/src/packages/fff/fff/Makefile</span> <br><span style='font-family:"Calibri",sans-serif'>> @@ -8,11 +8,10 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/fff</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> include $(INCLUDE_DIR)/package.mk</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> -define Package/fff-base</span> <br><span style='font-family:"Calibri",sans-serif'>> +define Package/fff/base</span> <br><span style='font-family:"Calibri",sans-serif'>> SECTION:=base</span> <br><span style='font-family:"Calibri",sans-serif'>> CATEGORY:=Freifunk</span> <br><span style='font-family:"Calibri",sans-serif'>> - DEFAULT:=y</span> <br><span style='font-family:"Calibri",sans-serif'>> - TITLE:= Freifunk-Franken Base</span> <br><span style='font-family:"Calibri",sans-serif'>> + TITLE:=Freifunk-Franken Base</span> <br><span style='font-family:"Calibri",sans-serif'>> URL:=<a href="http://www.freifunk-franken.de">http://www.freifunk-franken.de</a></span> <br><span style='font-family:"Calibri",sans-serif'>> DEPENDS:=+iptables \</span> <br><span style='font-family:"Calibri",sans-serif'>> +ip6tables \</span> <br><span style='font-family:"Calibri",sans-serif'>> @@ -21,37 +20,59 @@ define Package/fff-base</span> <br><span style='font-family:"Calibri",sans-serif'>> +fff-config \</span> <br><span style='font-family:"Calibri",sans-serif'>> +fff-nodewatcher \</span> <br><span style='font-family:"Calibri",sans-serif'>> +fff-web \</span> <br><span style='font-family:"Calibri",sans-serif'>> - +fff-uradvd \</span> <br><span style='font-family:"Calibri",sans-serif'>> +fff-batman-adv \</span> <br><span style='font-family:"Calibri",sans-serif'>> - +fff-firewall \</span> <br><span style='font-family:"Calibri",sans-serif'>> +fff-support \</span> <br><span style='font-family:"Calibri",sans-serif'>> +fff-network \</span> <br><span style='font-family:"Calibri",sans-serif'>> +fff-sysupgrade \</span> <br><span style='font-family:"Calibri",sans-serif'>> +fff-wireless \</span> <br><span style='font-family:"Calibri",sans-serif'>> +fff-timeserver \</span> <br><span style='font-family:"Calibri",sans-serif'>> - +fff-vpn-select \</span> <br><span style='font-family:"Calibri",sans-serif'>> - +simple-tc \</span> <br><span style='font-family:"Calibri",sans-serif'>> - +fff-hoods</span> <br><span style='font-family:"Calibri",sans-serif'>> + +simple-tc</span> <br><span style='font-family:"Calibri",sans-serif'>> endef</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> -define Package/fff-base/description</span> <br><span style='font-family:"Calibri",sans-serif'>> +define Package/fff/base/description</span> <br><span style='font-family:"Calibri",sans-serif'>> This is the Freifunk Franken Firmware Base package endef</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> -define Build/Prepare</span> <br><span style='font-family:"Calibri",sans-serif'>> - echo "all: " > $(PKG_BUILD_DIR)/Makefile</span> <br><span style='font-family:"Calibri",sans-serif'>> +define Package/fff-node</span> <br><span style='font-family:"Calibri",sans-serif'>> + $(call Package/fff/base)</span> <br><span style='font-family:"Calibri",sans-serif'>> + DEFAULT:=y</span> <br><span style='font-family:"Calibri",sans-serif'>> + TITLE+=(Home node)</span> <br><span style='font-family:"Calibri",sans-serif'>> + DEPENDS+=+fff-fastd \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +fff-firewall \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +fff-vpn-select \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +fff-uradvd \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +fff-hoods</span> <br><span style='font-family:"Calibri",sans-serif'>> + VARIANT:=homenode</span> <br><span style='font-family:"Calibri",sans-serif'>> endef</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> -define Build/Configure</span> <br><span style='font-family:"Calibri",sans-serif'>> - # nothing</span> <br><span style='font-family:"Calibri",sans-serif'>> +define Package/fff-node/description</span> <br><span style='font-family:"Calibri",sans-serif'>> + $(call Package/fff/base/description)</span> <br><span style='font-family:"Calibri",sans-serif'>> endef</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> -define Build/Compile</span> <br><span style='font-family:"Calibri",sans-serif'>> - # nothing</span> <br><span style='font-family:"Calibri",sans-serif'>> +define Package/fff-layer3</span> <br><span style='font-family:"Calibri",sans-serif'>> + $(call Package/fff/base)</span> <br><span style='font-family:"Calibri",sans-serif'>> + TITLE+=(Layer 3 Gateway)</span> <br><span style='font-family:"Calibri",sans-serif'>> + DEPENDS+=+fff-dhcp \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +fff-babeld \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +fff-ra \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +arptables \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +ebtables \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +ebtables-utils \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +kmod-ebtables-ipv4 \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +kmod-ebtables-ipv6 \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +iptables-mod-filter \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +iptables-mod-ipopt \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +iptables-mod-conntrack-extra \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +gre \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +@PACKAGE_grev4 \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +@PACKAGE_grev6 \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +fff-alfred-monitoring-proxy</span> <br><span style='font-family:"Calibri",sans-serif'>> + VARIANT:=layer3</span> <br><span style='font-family:"Calibri",sans-serif'>> endef</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> -define Package/fff-base/install</span> <br><span style='font-family:"Calibri",sans-serif'>> - # nothing</span> <br><span style='font-family:"Calibri",sans-serif'>> +define Package/fff-layer3/description</span> <br><span style='font-family:"Calibri",sans-serif'>> + $(call Package/fff/base/description)</span> <br><span style='font-family:"Calibri",sans-serif'>> endef</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> -$(eval $(call BuildPackage,fff-base))</span> <br><span style='font-family:"Calibri",sans-serif'>> +$(eval $(call BuildPackage,fff-node))</span> <br><span style='font-family:"Calibri",sans-serif'>> +$(eval $(call BuildPackage,fff-layer3))</span> <br><span style='font-family:"Calibri",sans-serif'>> --</span> <br><span style='font-family:"Calibri",sans-serif'>> 2.11.0</span> <o:p></o:p></p></div></div></body></html>