From patchwork Tue Feb 5 14:08:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: fff-base: Sort dependencies From: Adrian Schmutzler X-Patchwork-Id: 1025 Message-Id: <20190205140852.2256-1-freifunk@adrianschmutzler.de> To: franken-dev@freifunk.net Date: Tue, 5 Feb 2019 15:08:52 +0100 Sort dependencies in two blocks (non-fff, fff) for each of our meta-packages. Signed-off-by: Adrian Schmutzler Reviewed-by: Christian Dresel --- src/packages/fff/fff/Makefile | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile index 2ed67724..976a69fa 100644 --- a/src/packages/fff/fff/Makefile +++ b/src/packages/fff/fff/Makefile @@ -14,18 +14,18 @@ define Package/fff/base URL:=http://www.freifunk-franken.de DEPENDS:=+iptables \ +ip6tables \ - +odhcp6c \ +micrond \ + +odhcp6c \ + +simple-tc \ + +fff-batman-adv \ +fff-config \ + +fff-network \ +fff-nodewatcher \ - +fff-web \ - +fff-batman-adv \ +fff-support \ - +fff-network \ +fff-sysupgrade \ - +fff-wireless \ +fff-timeserver \ - +simple-tc + +fff-web \ + +fff-wireless endef define Package/fff/base/description @@ -37,8 +37,8 @@ define Package/fff-node TITLE+=(Home node) DEPENDS+=+fff-fastd \ +fff-firewall \ - +fff-uradvd \ - +fff-hoods + +fff-hoods \ + +fff-uradvd VARIANT:=homenode endef @@ -49,21 +49,21 @@ endef define Package/fff-layer3 $(call Package/fff/base) TITLE+=(Layer 3 Gateway) - DEPENDS+=+fff-dhcp \ - +fff-babeld \ - +fff-ra \ - +arptables \ + DEPENDS+=+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 + +iptables-mod-conntrack-extra \ + +iptables-mod-filter \ + +iptables-mod-ipopt \ + +fff-alfred-monitoring-proxy \ + +fff-babeld \ + +fff-dhcp \ + +fff-ra VARIANT:=layer3 endef