[PATCH 1/3] Rename variant meta-packages to avoid confilcts

[Fabian Bläse]

Signed-off-by: Fabian Bläse <fabian at blaese.de>
---
 src/packages/fff/fff/Makefile          | 12 ++++++------
 src/packages/fff/fff/variant-layer3.mk |  2 +-
 src/packages/fff/fff/variant-node.mk   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile
index 881a527..58ff2c9 100644
--- a/src/packages/fff/fff/Makefile
+++ b/src/packages/fff/fff/Makefile
@@ -31,7 +31,7 @@ define Package/fff/base/description
 	This is the Freifunk Franken Firmware Base package
 endef
 
-define Package/fff-node
+define Package/fff-variant-node
 	$(call Package/fff/base)
 	TITLE+=(Home node)
 	DEPENDS+=+fff-fastd \
@@ -42,11 +42,11 @@ define Package/fff-node
 	VARIANT:=homenode
 endef
 
-define Package/fff-node/description
+define Package/fff-variant-node/description
 	$(call Package/fff/base/description)
 endef
 
-define Package/fff-layer3
+define Package/fff-variant-layer3
 	$(call Package/fff/base)
 	TITLE+=(Layer 3 Gateway)
 	DEPENDS+=+fff-gateway \
@@ -70,11 +70,11 @@ define Package/fff-layer3
 	VARIANT:=layer3
 endef
 
-define Package/fff-layer3/description
+define Package/fff-variant-layer3/description
 	$(call Package/fff/base/description)
 endef
 
-$(eval $(call BuildPackage,fff-node))
-$(eval $(call BuildPackage,fff-layer3))
+$(eval $(call BuildPackage,fff-variant-node))
+$(eval $(call BuildPackage,fff-variant-layer3))
 
 include $(TOPDIR)/variant.mk
diff --git a/src/packages/fff/fff/variant-layer3.mk b/src/packages/fff/fff/variant-layer3.mk
index aa8627d..80293ce 100644
--- a/src/packages/fff/fff/variant-layer3.mk
+++ b/src/packages/fff/fff/variant-layer3.mk
@@ -4,7 +4,7 @@ define Package/fff-default
 	DEFAULT:=y
 	TITLE:=Freifunk-Franken Base default switcher
 	URL:=http://www.freifunk-franken.de
-	DEPENDS:=+fff-layer3
+	DEPENDS:=+fff-variant-layer3
 endef
 
 define Package/fff-default/description
diff --git a/src/packages/fff/fff/variant-node.mk b/src/packages/fff/fff/variant-node.mk
index 5738f7d..3abbd06 100644
--- a/src/packages/fff/fff/variant-node.mk
+++ b/src/packages/fff/fff/variant-node.mk
@@ -4,7 +4,7 @@ define Package/fff-default
 	DEFAULT:=y
 	TITLE:=Freifunk-Franken Base default switcher
 	URL:=http://www.freifunk-franken.de
-	DEPENDS:=+fff-node
+	DEPENDS:=+fff-variant-node
 endef
 
 define Package/fff-default/description
-- 
2.23.0