<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'>Hallo,<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'>das ist halt auch wieder so eine Geschmackssache:<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'>Macht man es einmal ordentlich und dann müssen ein paar alte Patches rebased werden, oder macht man sich für immer die Mühe, sich durch das Wirrwarr zu suchen, wenn man dann einen neuen Patch baut.<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'>Ich könnte mir als Kompromiss vorstellen, dass man erstmal die Gateway-Firmware „fertig“ macht (und diesen Patch zurückstellt) und ich danach nochmal einen Sortierpatch schicke, dann sollte es ja keinen signifikanten Rebase-Bedarf mehr geben.<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'>Grüße<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'>Adrian<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'> Tim Niemeyer [mailto:tim@tn-x.org] <br><b>Sent:</b> Sonntag, 10. Februar 2019 16:00<br><b>To:</b> Adrian Schmutzler <freifunk@adrianschmutzler.de>; franken-dev@freifunk.net<br><b>Subject:</b> Re: [PATCH] fff-base: Sort dependencies<o:p></o:p></span></p></div></div><p class=MsoNormal><o:p> </o:p></p><p><span style='font-family:"Calibri",sans-serif'>Hi</span> <o:p></o:p></p><p><span style='font-family:"Calibri",sans-serif'>Wenn es nicht zwingend nötig ist, lieber so lassen wie es ist, weil das</span> <br><span style='font-family:"Calibri",sans-serif'>rebasen bei $Menschen schwer macht.</span> <o:p></o:p></p><p><span style='font-family:"Calibri",sans-serif'>Tim</span> <o:p></o:p></p><p><span style='font-family:"Calibri",sans-serif'>Am Dienstag, den 05.02.2019, 15:08 +0100 schrieb Adrian Schmutzler:</span> <br><span style='font-family:"Calibri",sans-serif'>> Sort dependencies in two blocks (non-fff, fff) for each of our</span> <br><span style='font-family:"Calibri",sans-serif'>> meta-packages.</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> Signed-off-by: Adrian Schmutzler <<a href="mailto:freifunk@adrianschmutzler.de">freifunk@adrianschmutzler.de</a>></span> <br><span style='font-family:"Calibri",sans-serif'>> ---</span> <br><span style='font-family:"Calibri",sans-serif'>> src/packages/fff/fff/Makefile | 32 ++++++++++++++++----------------</span> <br><span style='font-family:"Calibri",sans-serif'>> 1 file changed, 16 insertions(+), 16 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</span> <br><span style='font-family:"Calibri",sans-serif'>> b/src/packages/fff/fff/Makefile</span> <br><span style='font-family:"Calibri",sans-serif'>> index 2ed67724..976a69fa 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'>> @@ -14,18 +14,18 @@ define Package/fff/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'>> - +odhcp6c \</span> <br><span style='font-family:"Calibri",sans-serif'>> +micrond \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +odhcp6c \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +simple-tc \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +fff-batman-adv \</span> <br><span style='font-family:"Calibri",sans-serif'>> +fff-config \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +fff-network \</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-batman-adv \</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'>> - +simple-tc</span> <br><span style='font-family:"Calibri",sans-serif'>> + +fff-web \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +fff-wireless</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'>> @@ -37,8 +37,8 @@ define Package/fff-node</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-uradvd \</span> <br><span style='font-family:"Calibri",sans-serif'>> - +fff-hoods</span> <br><span style='font-family:"Calibri",sans-serif'>> + +fff-hoods \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +fff-uradvd</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'>> @@ -49,21 +49,21 @@ endef</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'>> + DEPENDS+=+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'>> + +iptables-mod-conntrack-extra \</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'>> + +fff-alfred-monitoring-proxy \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +fff-babeld \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +fff-dhcp \</span> <br><span style='font-family:"Calibri",sans-serif'>> + +fff-ra</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> <o:p></o:p></p></div></div></body></html>