Message ID | 20190203130608.8787-1-tim@tn-x.org |
---|---|
State | Accepted |
Headers | show |
diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile index dce33f9..fd63433 100644 --- a/src/packages/fff/fff/Makefile +++ b/src/packages/fff/fff/Makefile @@ -8,11 +8,10 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/fff include $(INCLUDE_DIR)/package.mk -define Package/fff-base +define Package/fff/base SECTION:=base CATEGORY:=Freifunk - DEFAULT:=y - TITLE:= Freifunk-Franken Base + TITLE:=Freifunk-Franken Base URL:=http://www.freifunk-franken.de DEPENDS:=+iptables \ +ip6tables \ @@ -21,37 +20,59 @@ define Package/fff-base +fff-config \ +fff-nodewatcher \ +fff-web \ - +fff-uradvd \ +fff-batman-adv \ - +fff-firewall \ +fff-support \ +fff-network \ +fff-sysupgrade \ +fff-wireless \ +fff-timeserver \ - +fff-vpn-select \ - +simple-tc \ - +fff-hoods + +simple-tc endef -define Package/fff-base/description +define Package/fff/base/description This is the Freifunk Franken Firmware Base package endef -define Build/Prepare - echo "all: " > $(PKG_BUILD_DIR)/Makefile +define Package/fff-node + $(call Package/fff/base) + DEFAULT:=y + TITLE+=(Home node) + DEPENDS+=+fff-fastd \ + +fff-firewall \ + +fff-vpn-select \ + +fff-uradvd \ + +fff-hoods + VARIANT:=homenode endef -define Build/Configure - # nothing +define Package/fff-node/description + $(call Package/fff/base/description) endef -define Build/Compile - # nothing +define Package/fff-layer3 + $(call Package/fff/base) + TITLE+=(Layer 3 Gateway) + DEPENDS+=+fff-dhcp \ + +fff-babeld \ + +fff-ra \ + +arptables \ + +ebtables \ + +ebtables-utils \ + +kmod-ebtables-ipv4 \ + +kmod-ebtables-ipv6 \ + +iptables-mod-filter \ + +iptables-mod-ipopt \ + +iptables-mod-conntrack-extra \ + +gre \ + +@PACKAGE_grev4 \ + +@PACKAGE_grev6 \ + +fff-alfred-monitoring-proxy + VARIANT:=layer3 endef -define Package/fff-base/install - # nothing +define Package/fff-layer3/description + $(call Package/fff/base/description) endef -$(eval $(call BuildPackage,fff-base)) +$(eval $(call BuildPackage,fff-node)) +$(eval $(call BuildPackage,fff-layer3))
Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Zwecks vpn-select schicke ich wie vorgeschlagen einen separaten Patch. > -----Original Message----- > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf > Of Tim Niemeyer > Sent: Sonntag, 3. Februar 2019 14:06 > To: franken-dev@freifunk.net > Subject: [PATCH v2 1/2] packages/fff: add layer3 variant > > Signed-off-by: Tim Niemeyer <tim@tn-x.org> > --- > > Changes in v2: > - Changed fff-openvpn to fff-ra > (fff-odhcpd was renamed to fff-ra and is already applied, > fff-openvpn is not applied yet.) > > Changes in v1: > - First version of this patch > > src/packages/fff/fff/Makefile | 57 +++++++++++++++++++++++++++++---- > ---------- > 1 file changed, 39 insertions(+), 18 deletions(-) > > diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile > index dce33f9..fd63433 100644 > --- a/src/packages/fff/fff/Makefile > +++ b/src/packages/fff/fff/Makefile > @@ -8,11 +8,10 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/fff > > include $(INCLUDE_DIR)/package.mk > > -define Package/fff-base > +define Package/fff/base > SECTION:=base > CATEGORY:=Freifunk > - DEFAULT:=y > - TITLE:= Freifunk-Franken Base > + TITLE:=Freifunk-Franken Base > URL:=http://www.freifunk-franken.de > DEPENDS:=+iptables \ > +ip6tables \ > @@ -21,37 +20,59 @@ define Package/fff-base > +fff-config \ > +fff-nodewatcher \ > +fff-web \ > - +fff-uradvd \ > +fff-batman-adv \ > - +fff-firewall \ > +fff-support \ > +fff-network \ > +fff-sysupgrade \ > +fff-wireless \ > +fff-timeserver \ > - +fff-vpn-select \ > - +simple-tc \ > - +fff-hoods > + +simple-tc > endef > > -define Package/fff-base/description > +define Package/fff/base/description > This is the Freifunk Franken Firmware Base package endef > > -define Build/Prepare > - echo "all: " > $(PKG_BUILD_DIR)/Makefile > +define Package/fff-node > + $(call Package/fff/base) > + DEFAULT:=y > + TITLE+=(Home node) > + DEPENDS+=+fff-fastd \ > + +fff-firewall \ > + +fff-vpn-select \ > + +fff-uradvd \ > + +fff-hoods > + VARIANT:=homenode > endef > > -define Build/Configure > - # nothing > +define Package/fff-node/description > + $(call Package/fff/base/description) > endef > > -define Build/Compile > - # nothing > +define Package/fff-layer3 > + $(call Package/fff/base) > + TITLE+=(Layer 3 Gateway) > + DEPENDS+=+fff-dhcp \ > + +fff-babeld \ > + +fff-ra \ > + +arptables \ > + +ebtables \ > + +ebtables-utils \ > + +kmod-ebtables-ipv4 \ > + +kmod-ebtables-ipv6 \ > + +iptables-mod-filter \ > + +iptables-mod-ipopt \ > + +iptables-mod-conntrack-extra \ > + +gre \ > + +@PACKAGE_grev4 \ > + +@PACKAGE_grev6 \ > + +fff-alfred-monitoring-proxy > + VARIANT:=layer3 > endef > > -define Package/fff-base/install > - # nothing > +define Package/fff-layer3/description > + $(call Package/fff/base/description) > endef > > -$(eval $(call BuildPackage,fff-base)) > +$(eval $(call BuildPackage,fff-node)) > +$(eval $(call BuildPackage,fff-layer3)) > -- > 2.11.0
Was mir noch aufgefallen ist: Bei so einer Änderung sollten wir irgendwas mit der PKG_VERSION/PKG_RELEASE machen und es nicht einfach gleich lassen. Allerdings bin ich nach wie vor der Meinung, dass in so einer Package eigentlich nur das PKG_RELEASE gesetzt gehört, insofern wird das u.U. eine größere Diskussion und wir lassen es vll. doch besser ... Grüße Adrian > -----Original Message----- > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf > Of Tim Niemeyer > Sent: Sonntag, 3. Februar 2019 14:06 > To: franken-dev@freifunk.net > Subject: [PATCH v2 1/2] packages/fff: add layer3 variant > > Signed-off-by: Tim Niemeyer <tim@tn-x.org> > --- > > Changes in v2: > - Changed fff-openvpn to fff-ra > (fff-odhcpd was renamed to fff-ra and is already applied, > fff-openvpn is not applied yet.) > > Changes in v1: > - First version of this patch > > src/packages/fff/fff/Makefile | 57 +++++++++++++++++++++++++++++---- > ---------- > 1 file changed, 39 insertions(+), 18 deletions(-) > > diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile > index dce33f9..fd63433 100644 > --- a/src/packages/fff/fff/Makefile > +++ b/src/packages/fff/fff/Makefile > @@ -8,11 +8,10 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/fff > > include $(INCLUDE_DIR)/package.mk > > -define Package/fff-base > +define Package/fff/base > SECTION:=base > CATEGORY:=Freifunk > - DEFAULT:=y > - TITLE:= Freifunk-Franken Base > + TITLE:=Freifunk-Franken Base > URL:=http://www.freifunk-franken.de > DEPENDS:=+iptables \ > +ip6tables \ > @@ -21,37 +20,59 @@ define Package/fff-base > +fff-config \ > +fff-nodewatcher \ > +fff-web \ > - +fff-uradvd \ > +fff-batman-adv \ > - +fff-firewall \ > +fff-support \ > +fff-network \ > +fff-sysupgrade \ > +fff-wireless \ > +fff-timeserver \ > - +fff-vpn-select \ > - +simple-tc \ > - +fff-hoods > + +simple-tc > endef > > -define Package/fff-base/description > +define Package/fff/base/description > This is the Freifunk Franken Firmware Base package endef > > -define Build/Prepare > - echo "all: " > $(PKG_BUILD_DIR)/Makefile > +define Package/fff-node > + $(call Package/fff/base) > + DEFAULT:=y > + TITLE+=(Home node) > + DEPENDS+=+fff-fastd \ > + +fff-firewall \ > + +fff-vpn-select \ > + +fff-uradvd \ > + +fff-hoods > + VARIANT:=homenode > endef > > -define Build/Configure > - # nothing > +define Package/fff-node/description > + $(call Package/fff/base/description) > endef > > -define Build/Compile > - # nothing > +define Package/fff-layer3 > + $(call Package/fff/base) > + TITLE+=(Layer 3 Gateway) > + DEPENDS+=+fff-dhcp \ > + +fff-babeld \ > + +fff-ra \ > + +arptables \ > + +ebtables \ > + +ebtables-utils \ > + +kmod-ebtables-ipv4 \ > + +kmod-ebtables-ipv6 \ > + +iptables-mod-filter \ > + +iptables-mod-ipopt \ > + +iptables-mod-conntrack-extra \ > + +gre \ > + +@PACKAGE_grev4 \ > + +@PACKAGE_grev6 \ > + +fff-alfred-monitoring-proxy > + VARIANT:=layer3 > endef > > -define Package/fff-base/install > - # nothing > +define Package/fff-layer3/description > + $(call Package/fff/base/description) > endef > > -$(eval $(call BuildPackage,fff-base)) > +$(eval $(call BuildPackage,fff-node)) > +$(eval $(call BuildPackage,fff-layer3)) > -- > 2.11.0
On Sun, 2019-02-03 at 17:33 +0100, mail@adrianschmutzler.de wrote: > Was mir noch aufgefallen ist: > > Bei so einer Änderung sollten wir irgendwas mit der > PKG_VERSION/PKG_RELEASE machen und es nicht einfach gleich lassen. Stimmt wohl.. Ich hab nichts dagegen, falls es dir liebt, wenn du es beim Applien hochtüdelst. > Allerdings bin ich nach wie vor der Meinung, dass in so einer Package > eigentlich nur das PKG_RELEASE gesetzt gehört, insofern wird das u.U. > eine größere Diskussion und wir lassen es vll. doch besser ... Stimmt auch.. Am Ende ist es für uns _im Moment_ nicht wichtig, weil wir ja keine eigenen Pakete (opkg's) bauen. Tim > Grüße > > Adrian > > > -----Original Message----- > > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On > > Behalf > > Of Tim Niemeyer > > Sent: Sonntag, 3. Februar 2019 14:06 > > To: franken-dev@freifunk.net > > Subject: [PATCH v2 1/2] packages/fff: add layer3 variant > > > > Signed-off-by: Tim Niemeyer <tim@tn-x.org> > > --- > > > > Changes in v2: > > - Changed fff-openvpn to fff-ra > > (fff-odhcpd was renamed to fff-ra and is already applied, > > fff-openvpn is not applied yet.) > > > > Changes in v1: > > - First version of this patch > > > > src/packages/fff/fff/Makefile | 57 +++++++++++++++++++++++++++++ > > ---- > > ---------- > > 1 file changed, 39 insertions(+), 18 deletions(-) > > > > diff --git a/src/packages/fff/fff/Makefile > > b/src/packages/fff/fff/Makefile > > index dce33f9..fd63433 100644 > > --- a/src/packages/fff/fff/Makefile > > +++ b/src/packages/fff/fff/Makefile > > @@ -8,11 +8,10 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/fff > > > > include $(INCLUDE_DIR)/package.mk > > > > -define Package/fff-base > > +define Package/fff/base > > SECTION:=base > > CATEGORY:=Freifunk > > - DEFAULT:=y > > - TITLE:= Freifunk-Franken Base > > + TITLE:=Freifunk-Franken Base > > URL:=http://www.freifunk-franken.de > > DEPENDS:=+iptables \ > > +ip6tables \ > > @@ -21,37 +20,59 @@ define Package/fff-base > > +fff-config \ > > +fff-nodewatcher \ > > +fff-web \ > > - +fff-uradvd \ > > +fff-batman-adv \ > > - +fff-firewall \ > > +fff-support \ > > +fff-network \ > > +fff-sysupgrade \ > > +fff-wireless \ > > +fff-timeserver \ > > - +fff-vpn-select \ > > - +simple-tc \ > > - +fff-hoods > > + +simple-tc > > endef > > > > -define Package/fff-base/description > > +define Package/fff/base/description > > This is the Freifunk Franken Firmware Base package endef > > > > -define Build/Prepare > > - echo "all: " > $(PKG_BUILD_DIR)/Makefile > > +define Package/fff-node > > + $(call Package/fff/base) > > + DEFAULT:=y > > + TITLE+=(Home node) > > + DEPENDS+=+fff-fastd \ > > + +fff-firewall \ > > + +fff-vpn-select \ > > + +fff-uradvd \ > > + +fff-hoods > > + VARIANT:=homenode > > endef > > > > -define Build/Configure > > - # nothing > > +define Package/fff-node/description > > + $(call Package/fff/base/description) > > endef > > > > -define Build/Compile > > - # nothing > > +define Package/fff-layer3 > > + $(call Package/fff/base) > > + TITLE+=(Layer 3 Gateway) > > + DEPENDS+=+fff-dhcp \ > > + +fff-babeld \ > > + +fff-ra \ > > + +arptables \ > > + +ebtables \ > > + +ebtables-utils \ > > + +kmod-ebtables-ipv4 \ > > + +kmod-ebtables-ipv6 \ > > + +iptables-mod-filter \ > > + +iptables-mod-ipopt \ > > + +iptables-mod-conntrack-extra \ > > + +gre \ > > + +@PACKAGE_grev4 \ > > + +@PACKAGE_grev6 \ > > + +fff-alfred-monitoring-proxy > > + VARIANT:=layer3 > > endef > > > > -define Package/fff-base/install > > - # nothing > > +define Package/fff-layer3/description > > + $(call Package/fff/base/description) > > endef > > > > -$(eval $(call BuildPackage,fff-base)) > > +$(eval $(call BuildPackage,fff-node)) > > +$(eval $(call BuildPackage,fff-layer3)) > > -- > > 2.11.0
Ich lasse die beiden Patches mal noch 1-2 Tage liegen, hier wäre ein zweites Review schön. From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf Of mail@adrianschmutzler.de Sent: Sonntag, 3. Februar 2019 16:59 To: 'Tim Niemeyer' <tim@tn-x.org>; franken-dev@freifunk.net Subject: RE: [PATCH v2 1/2] packages/fff: add layer3 variant Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de <mailto:freifunk@adrianschmutzler.de> > Zwecks vpn-select schicke ich wie vorgeschlagen einen separaten Patch. > -----Original Message----- > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf > Of Tim Niemeyer > Sent: Sonntag, 3. Februar 2019 14:06 > To: franken-dev@freifunk.net <mailto:franken-dev@freifunk.net> > Subject: [PATCH v2 1/2] packages/fff: add layer3 variant > > Signed-off-by: Tim Niemeyer <tim@tn-x.org <mailto:tim@tn-x.org> > > --- > > Changes in v2: > - Changed fff-openvpn to fff-ra > (fff-odhcpd was renamed to fff-ra and is already applied, > fff-openvpn is not applied yet.) > > Changes in v1: > - First version of this patch > > src/packages/fff/fff/Makefile | 57 +++++++++++++++++++++++++++++---- > ---------- > 1 file changed, 39 insertions(+), 18 deletions(-) > > diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile > index dce33f9..fd63433 100644 > --- a/src/packages/fff/fff/Makefile > +++ b/src/packages/fff/fff/Makefile > @@ -8,11 +8,10 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/fff > > include $(INCLUDE_DIR)/package.mk > > -define Package/fff-base > +define Package/fff/base > SECTION:=base > CATEGORY:=Freifunk > - DEFAULT:=y > - TITLE:= Freifunk-Franken Base > + TITLE:=Freifunk-Franken Base > URL:=http://www.freifunk-franken.de > DEPENDS:=+iptables \ > +ip6tables \ > @@ -21,37 +20,59 @@ define Package/fff-base > +fff-config \ > +fff-nodewatcher \ > +fff-web \ > - +fff-uradvd \ > +fff-batman-adv \ > - +fff-firewall \ > +fff-support \ > +fff-network \ > +fff-sysupgrade \ > +fff-wireless \ > +fff-timeserver \ > - +fff-vpn-select \ > - +simple-tc \ > - +fff-hoods > + +simple-tc > endef > > -define Package/fff-base/description > +define Package/fff/base/description > This is the Freifunk Franken Firmware Base package endef > > -define Build/Prepare > - echo "all: " > $(PKG_BUILD_DIR)/Makefile > +define Package/fff-node > + $(call Package/fff/base) > + DEFAULT:=y > + TITLE+=(Home node) > + DEPENDS+=+fff-fastd \ > + +fff-firewall \ > + +fff-vpn-select \ > + +fff-uradvd \ > + +fff-hoods > + VARIANT:=homenode > endef > > -define Build/Configure > - # nothing > +define Package/fff-node/description > + $(call Package/fff/base/description) > endef > > -define Build/Compile > - # nothing > +define Package/fff-layer3 > + $(call Package/fff/base) > + TITLE+=(Layer 3 Gateway) > + DEPENDS+=+fff-dhcp \ > + +fff-babeld \ > + +fff-ra \ > + +arptables \ > + +ebtables \ > + +ebtables-utils \ > + +kmod-ebtables-ipv4 \ > + +kmod-ebtables-ipv6 \ > + +iptables-mod-filter \ > + +iptables-mod-ipopt \ > + +iptables-mod-conntrack-extra \ > + +gre \ > + +@PACKAGE_grev4 \ > + +@PACKAGE_grev6 \ > + +fff-alfred-monitoring-proxy > + VARIANT:=layer3 > endef > > -define Package/fff-base/install > - # nothing > +define Package/fff-layer3/description > + $(call Package/fff/base/description) > endef > > -$(eval $(call BuildPackage,fff-base)) > +$(eval $(call BuildPackage,fff-node)) > +$(eval $(call BuildPackage,fff-layer3)) > -- > 2.11.0
Beide Applied. From: Tim Niemeyer [mailto:tim@tn-x.org] Sent: Sonntag, 3. Februar 2019 17:35 To: mail@adrianschmutzler.de; franken-dev@freifunk.net Subject: Re: [PATCH v2 1/2] packages/fff: add layer3 variant On Sun, 2019-02-03 at 17:33 +0100, mail@adrianschmutzler.de <mailto:mail@adrianschmutzler.de> wrote: > Was mir noch aufgefallen ist: > > Bei so einer Änderung sollten wir irgendwas mit der > PKG_VERSION/PKG_RELEASE machen und es nicht einfach gleich lassen. Stimmt wohl.. Ich hab nichts dagegen, falls es dir liebt, wenn du es beim Applien hochtüdelst. > Allerdings bin ich nach wie vor der Meinung, dass in so einer Package > eigentlich nur das PKG_RELEASE gesetzt gehört, insofern wird das u.U. > eine größere Diskussion und wir lassen es vll. doch besser ... Stimmt auch.. Am Ende ist es für uns _im Moment_ nicht wichtig, weil wir ja keine eigenen Pakete (opkg's) bauen. Tim > Grüße > > Adrian > > > -----Original Message----- > > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On > > Behalf > > Of Tim Niemeyer > > Sent: Sonntag, 3. Februar 2019 14:06 > > To: franken-dev@freifunk.net <mailto:franken-dev@freifunk.net> > > Subject: [PATCH v2 1/2] packages/fff: add layer3 variant > > > > Signed-off-by: Tim Niemeyer <tim@tn-x.org <mailto:tim@tn-x.org> > > > --- > > > > Changes in v2: > > - Changed fff-openvpn to fff-ra > > (fff-odhcpd was renamed to fff-ra and is already applied, > > fff-openvpn is not applied yet.) > > > > Changes in v1: > > - First version of this patch > > > > src/packages/fff/fff/Makefile | 57 +++++++++++++++++++++++++++++ > > ---- > > ---------- > > 1 file changed, 39 insertions(+), 18 deletions(-) > > > > diff --git a/src/packages/fff/fff/Makefile > > b/src/packages/fff/fff/Makefile > > index dce33f9..fd63433 100644 > > --- a/src/packages/fff/fff/Makefile > > +++ b/src/packages/fff/fff/Makefile > > @@ -8,11 +8,10 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/fff > > > > include $(INCLUDE_DIR)/package.mk > > > > -define Package/fff-base > > +define Package/fff/base > > SECTION:=base > > CATEGORY:=Freifunk > > - DEFAULT:=y > > - TITLE:= Freifunk-Franken Base > > + TITLE:=Freifunk-Franken Base > > URL:=http://www.freifunk-franken.de > > DEPENDS:=+iptables \ > > +ip6tables \ > > @@ -21,37 +20,59 @@ define Package/fff-base > > +fff-config \ > > +fff-nodewatcher \ > > +fff-web \ > > - +fff-uradvd \ > > +fff-batman-adv \ > > - +fff-firewall \ > > +fff-support \ > > +fff-network \ > > +fff-sysupgrade \ > > +fff-wireless \ > > +fff-timeserver \ > > - +fff-vpn-select \ > > - +simple-tc \ > > - +fff-hoods > > + +simple-tc > > endef > > > > -define Package/fff-base/description > > +define Package/fff/base/description > > This is the Freifunk Franken Firmware Base package endef > > > > -define Build/Prepare > > - echo "all: " > $(PKG_BUILD_DIR)/Makefile > > +define Package/fff-node > > + $(call Package/fff/base) > > + DEFAULT:=y > > + TITLE+=(Home node) > > + DEPENDS+=+fff-fastd \ > > + +fff-firewall \ > > + +fff-vpn-select \ > > + +fff-uradvd \ > > + +fff-hoods > > + VARIANT:=homenode > > endef > > > > -define Build/Configure > > - # nothing > > +define Package/fff-node/description > > + $(call Package/fff/base/description) > > endef > > > > -define Build/Compile > > - # nothing > > +define Package/fff-layer3 > > + $(call Package/fff/base) > > + TITLE+=(Layer 3 Gateway) > > + DEPENDS+=+fff-dhcp \ > > + +fff-babeld \ > > + +fff-ra \ > > + +arptables \ > > + +ebtables \ > > + +ebtables-utils \ > > + +kmod-ebtables-ipv4 \ > > + +kmod-ebtables-ipv6 \ > > + +iptables-mod-filter \ > > + +iptables-mod-ipopt \ > > + +iptables-mod-conntrack-extra \ > > + +gre \ > > + +@PACKAGE_grev4 \ > > + +@PACKAGE_grev6 \ > > + +fff-alfred-monitoring-proxy > > + VARIANT:=layer3 > > endef > > > > -define Package/fff-base/install > > - # nothing > > +define Package/fff-layer3/description > > + $(call Package/fff/base/description) > > endef > > > > -$(eval $(call BuildPackage,fff-base)) > > +$(eval $(call BuildPackage,fff-node)) > > +$(eval $(call BuildPackage,fff-layer3)) > > -- > > 2.11.0
Signed-off-by: Tim Niemeyer <tim@tn-x.org> --- Changes in v2: - Changed fff-openvpn to fff-ra (fff-odhcpd was renamed to fff-ra and is already applied, fff-openvpn is not applied yet.) Changes in v1: - First version of this patch src/packages/fff/fff/Makefile | 57 +++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 18 deletions(-)