<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;
font-family:"Calibri",sans-serif;
color:windowtext;}
span.EmailStyle20
{mso-style-type:personal;
font-family:"Calibri",sans-serif;
color:#1F497D;}
span.EmailStyle21
{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'>Applied.<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'> mail@adrianschmutzler.de [mailto:mail@adrianschmutzler.de] <br><b>Sent:</b> Sonntag, 2. Dezember 2018 14:00<br><b>To:</b> 'franken-dev@freifunk.net' <franken-dev@freifunk.net><br><b>Subject:</b> RE: [PATCH] fff-sysupgrade: merge SOC and SUBTARGET<o:p></o:p></span></p></div></div><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal><span style='font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US'>Hallo nochmal,<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 würde nach dem Release diesen Patch dann auch schon zeitnah einkippen, dann müssen wir den für die Fritzbox-Diskussion nicht mitschleifen.<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'> Adrian Schmutzler [<a href="mailto:mail@adrianschmutzler.de">mailto:mail@adrianschmutzler.de</a>] <br><b>Sent:</b> Mittwoch, 28. November 2018 14:33<br><b>To:</b> 'Christian Dresel' <<a href="mailto:fff@chrisi01.de">fff@chrisi01.de</a>>; <a href="mailto:franken-dev@freifunk.net">franken-dev@freifunk.net</a><br><b>Subject:</b> RE: [PATCH] fff-sysupgrade: merge SOC and SUBTARGET<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'>War ich eh schon immer dafür.</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 Of</span> <br><span style='font-family:"Calibri",sans-serif'>> Christian Dresel</span> <br><span style='font-family:"Calibri",sans-serif'>> Sent: Sonntag, 25. November 2018 10:11</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] fff-sysupgrade: merge SOC and SUBTARGET</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> This make it easier to use new targets without subtarget.</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> Signed-off-by: Christian Dresel <<a href="mailto:fff@chrisi01.de">fff@chrisi01.de</a>></span> <br><span style='font-family:"Calibri",sans-serif'>> ---</span> <br><span style='font-family:"Calibri",sans-serif'>> src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh | 8 +++-----</span> <br><span style='font-family:"Calibri",sans-serif'>> 1 file changed, 3 insertions(+), 5 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-sysupgrade/files/etc/sysupgrade.sh</span> <br><span style='font-family:"Calibri",sans-serif'>> b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh</span> <br><span style='font-family:"Calibri",sans-serif'>> index dca21a1..87ac48a 100755</span> <br><span style='font-family:"Calibri",sans-serif'>> --- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh</span> <br><span style='font-family:"Calibri",sans-serif'>> +++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh</span> <br><span style='font-family:"Calibri",sans-serif'>> @@ -17,12 +17,10 @@ BOARD=$(uci get board.model.name)</span> <br><span style='font-family:"Calibri",sans-serif'>> #decide SOC</span> <br><span style='font-family:"Calibri",sans-serif'>> case $BOARD in</span> <br><span style='font-family:"Calibri",sans-serif'>> tl-wdr4900-v1 )</span> <br><span style='font-family:"Calibri",sans-serif'>> - SOC="mpc85xx"</span> <br><span style='font-family:"Calibri",sans-serif'>> - SUBTARGET="g"</span> <br><span style='font-family:"Calibri",sans-serif'>> + SOC="mpc85xx-g"</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'>> - SOC="ar71xx"</span> <br><span style='font-family:"Calibri",sans-serif'>> - SUBTARGET="t"</span> <br><span style='font-family:"Calibri",sans-serif'>> + SOC="ar71xx-t"</span> <br><span style='font-family:"Calibri",sans-serif'>> ;;</span> <br><span style='font-family:"Calibri",sans-serif'>> esac</span> <br><span style='font-family:"Calibri",sans-serif'>> echo ""</span> <br><span style='font-family:"Calibri",sans-serif'>> @@ -71,7 +69,7 @@ if [ "$VERSION" = "$FIRMWARE_VERSION" ]; then</span> <br><span style='font-family:"Calibri",sans-serif'>> done</span> <br><span style='font-family:"Calibri",sans-serif'>> fi</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> -FILE="fff-${VERSION}-${SOC}-${SUBTARGET}-${BOARD}-squashfs-</span> <br><span style='font-family:"Calibri",sans-serif'>> sysupgrade.bin"</span> <br><span style='font-family:"Calibri",sans-serif'>> +FILE="fff-${VERSION}-${SOC}-${BOARD}-squashfs-sysupgrade.bin"</span> <br><span style='font-family:"Calibri",sans-serif'>> echo "Downloading $FILE"</span> <br><span style='font-family:"Calibri",sans-serif'>> echo ""</span> <br><span style='font-family:"Calibri",sans-serif'>> wget "${UPGRADE_PATH}/${FILE}"</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></div></body></html>