<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'>üblich ist es scheinbar wirklich nicht, ich finde es einfach praktisch, da man nur einmal den Namen angeben muss und nicht fünf Mal.<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 habe das für die restlichen Packages irgendwann mal als Sammelpatch durchgebracht (die Mehrheit unserer Pakete benutzt also PKG_NAME).<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'>Da das aber eigentlich überhaupt nicht wichtig ist, kann ich auch damit leben, es nicht zu machen.<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'>Da außer uns beiden sich da eh niemand dafür interessieren wird, sag einfach, was dir lieber ist. Dann applye ich den Patch entweder oder werfe ihn gleich wieder aus dem Patchwork raus, damit wir das gleich wieder vom Tisch haben und der Patch nicht ewig rumgammelt.<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'> Fabian Bläse [mailto:fabian@blaese.de] <br><b>Sent:</b> Sonntag, 27. Januar 2019 21:34<br><b>To:</b> Adrian Schmutzler <freifunk@adrianschmutzler.de>; franken-dev@freifunk.net<br><b>Subject:</b> Re: [PATCH 1/6] packages: Use PKG_NAME for new packages<o:p></o:p></span></p></div></div><p class=MsoNormal><o:p> </o:p></p><p><span style='font-family:"Calibri",sans-serif'>Hallo Adrian,</span> <o:p></o:p></p><p><span style='font-family:"Calibri",sans-serif'>wenn du mich fragst, ist das eher ungewöhnlich, da mit der PKG_NAME Variable zu arbeiten. Kann man machen, muss man aber jetzt nicht unbedingt.</span><o:p></o:p></p><p><span style='font-family:"Calibri",sans-serif'>Im Endeffekt tut beides das gleiche.</span> <o:p></o:p></p><p><span style='font-family:"Calibri",sans-serif'>Fabian</span> <o:p></o:p></p><p><span style='font-family:"Calibri",sans-serif'>On 27.01.19 17:38, Adrian Schmutzler wrote:</span> <br><span style='font-family:"Calibri",sans-serif'>> Using PKG_NAME makes copying Makefiles to new packages and</span> <br><span style='font-family:"Calibri",sans-serif'>> renames easier, since the risk of typos is reduced.</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/alfred-json/Makefile | 6 +++---</span> <br><span style='font-family:"Calibri",sans-serif'>> src/packages/fff/fff-alfred-monitoring-proxy/Makefile | 10 +++++-----</span> <br><span style='font-family:"Calibri",sans-serif'>> src/packages/fff/fff-dhcp/Makefile | 10 +++++-----</span> <br><span style='font-family:"Calibri",sans-serif'>> 3 files changed, 13 insertions(+), 13 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/alfred-json/Makefile b/src/packages/fff/alfred-json/Makefile</span> <br><span style='font-family:"Calibri",sans-serif'>> index dfca763e..154b90e2 100644</span> <br><span style='font-family:"Calibri",sans-serif'>> --- a/src/packages/fff/alfred-json/Makefile</span> <br><span style='font-family:"Calibri",sans-serif'>> +++ b/src/packages/fff/alfred-json/Makefile</span> <br><span style='font-family:"Calibri",sans-serif'>> @@ -13,7 +13,7 @@ PKG_SOURCE_URL:=<a href="https://github.com/FreifunkFranken/alfred-json.git">https://github.com/FreifunkFranken/alfred-json.git</a></span> <br><span style='font-family:"Calibri",sans-serif'>> include $(INCLUDE_DIR)/package.mk</span> <br><span style='font-family:"Calibri",sans-serif'>> include $(INCLUDE_DIR)/cmake.mk</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> -define Package/alfred-json</span> <br><span style='font-family:"Calibri",sans-serif'>> +define Package/$(PKG_NAME)</span> <br><span style='font-family:"Calibri",sans-serif'>> SECTION:=utils</span> <br><span style='font-family:"Calibri",sans-serif'>> CATEGORY:=Utilities</span> <br><span style='font-family:"Calibri",sans-serif'>> TITLE:= A.L.F.R.E.D - JSON Client</span> <br><span style='font-family:"Calibri",sans-serif'>> @@ -21,9 +21,9 @@ define Package/alfred-json</span> <br><span style='font-family:"Calibri",sans-serif'>> DEPENDS:=+jansson +zlib</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/alfred-json/install</span> <br><span style='font-family:"Calibri",sans-serif'>> +define Package/$(PKG_NAME)/install</span> <br><span style='font-family:"Calibri",sans-serif'>> $(INSTALL_DIR) $(1)/bin/</span> <br><span style='font-family:"Calibri",sans-serif'>> $(CP) $(PKG_INSTALL_DIR)/usr/bin/alfred-json $(1)/bin/</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,alfred-json))</span> <br><span style='font-family:"Calibri",sans-serif'>> +$(eval $(call BuildPackage,$(PKG_NAME)))</span> <br><span style='font-family:"Calibri",sans-serif'>> diff --git a/src/packages/fff/fff-alfred-monitoring-proxy/Makefile b/src/packages/fff/fff-alfred-monitoring-proxy/Makefile</span><o:p></o:p></p><p><span style='font-family:"Calibri",sans-serif'>> index 424dd589..93d982e0 100644</span> <br><span style='font-family:"Calibri",sans-serif'>> --- a/src/packages/fff/fff-alfred-monitoring-proxy/Makefile</span> <br><span style='font-family:"Calibri",sans-serif'>> +++ b/src/packages/fff/fff-alfred-monitoring-proxy/Makefile</span> <br><span style='font-family:"Calibri",sans-serif'>> @@ -4,11 +4,11 @@ PKG_NAME:=fff-alfred-monitoring-proxy</span> <br><span style='font-family:"Calibri",sans-serif'>> PKG_VERSION:=0.0.1</span> <br><span style='font-family:"Calibri",sans-serif'>> PKG_RELEASE:=1</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> -PKG_BUILD_DIR:=$(BUILD_DIR)/fff-alfred-monitoring-proxy</span> <br><span style='font-family:"Calibri",sans-serif'>> +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)</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-alfred-monitoring-proxy</span> <br><span style='font-family:"Calibri",sans-serif'>> +define Package/$(PKG_NAME)</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'>> TITLE:= Freifunk-Franken Alfred-Monitoring-Proxy</span> <br><span style='font-family:"Calibri",sans-serif'>> @@ -16,7 +16,7 @@ define Package/fff-alfred-monitoring-proxy</span> <br><span style='font-family:"Calibri",sans-serif'>> DEPENDS:=+micrond +fff-random +curl +alfred-json +fff-nodewatcher</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-alfred-monitoring-proxy/description</span> <br><span style='font-family:"Calibri",sans-serif'>> +define Package/$(PKG_NAME)/description</span> <br><span style='font-family:"Calibri",sans-serif'>> The Alfred-Monitoring-Proxy is used</span> <br><span style='font-family:"Calibri",sans-serif'>> to send node status information to <a href="https://monitoring.freifunk-franken.de/">https://monitoring.freifunk-franken.de/</a></span> <br><span style='font-family:"Calibri",sans-serif'>> endef</span> <br><span style='font-family:"Calibri",sans-serif'>> @@ -25,8 +25,8 @@ 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'>> endef</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> -define Package/fff-alfred-monitoring-proxy/install</span> <br><span style='font-family:"Calibri",sans-serif'>> +define Package/$(PKG_NAME)/install</span> <br><span style='font-family:"Calibri",sans-serif'>> $(CP) ./files/* $(1)/</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-alfred-monitoring-proxy))</span> <br><span style='font-family:"Calibri",sans-serif'>> +$(eval $(call BuildPackage,$(PKG_NAME)))</span> <br><span style='font-family:"Calibri",sans-serif'>> diff --git a/src/packages/fff/fff-dhcp/Makefile b/src/packages/fff/fff-dhcp/Makefile</span> <br><span style='font-family:"Calibri",sans-serif'>> index d6304128..82c03e10 100644</span> <br><span style='font-family:"Calibri",sans-serif'>> --- a/src/packages/fff/fff-dhcp/Makefile</span> <br><span style='font-family:"Calibri",sans-serif'>> +++ b/src/packages/fff/fff-dhcp/Makefile</span> <br><span style='font-family:"Calibri",sans-serif'>> @@ -4,11 +4,11 @@ PKG_NAME:=fff-dhcp</span> <br><span style='font-family:"Calibri",sans-serif'>> PKG_VERSION:=1</span> <br><span style='font-family:"Calibri",sans-serif'>> PKG_RELEASE:=1</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> -PKG_BUILD_DIR:=$(BUILD_DIR)/fff-dhcp</span> <br><span style='font-family:"Calibri",sans-serif'>> +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)</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-dhcp</span> <br><span style='font-family:"Calibri",sans-serif'>> +define Package/$(PKG_NAME)</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'>> TITLE:=Freifunk-Franken dhcp</span> <br><span style='font-family:"Calibri",sans-serif'>> @@ -16,7 +16,7 @@ define Package/fff-dhcp</span> <br><span style='font-family:"Calibri",sans-serif'>> DEPENDS:=+dnsmasq</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-dhcp/description</span> <br><span style='font-family:"Calibri",sans-serif'>> +define Package/$(PKG_NAME)/description</span> <br><span style='font-family:"Calibri",sans-serif'>> This is the fff-dhcp for the Freifunk Franken Firmware</span> <br><span style='font-family:"Calibri",sans-serif'>> It is used to configure dnsmasq for use as gateway.</span> <br><span style='font-family:"Calibri",sans-serif'>> endef</span> <br><span style='font-family:"Calibri",sans-serif'>> @@ -33,8 +33,8 @@ define Build/Compile</span> <br><span style='font-family:"Calibri",sans-serif'>> # nothing</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-dhcp/install</span> <br><span style='font-family:"Calibri",sans-serif'>> +define Package/$(PKG_NAME)/install</span> <br><span style='font-family:"Calibri",sans-serif'>> $(CP) ./files/* $(1)/</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-dhcp))</span> <br><span style='font-family:"Calibri",sans-serif'>> +$(eval $(call BuildPackage,$(PKG_NAME)))</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><o:p></o:p></p><p class=MsoNormal style='margin-bottom:12.0pt'><o:p> </o:p></p></div></div></body></html>