From 5aa6838828cd35f4709b422295e034d3bac71c00 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer <mschiffer@universe-factory.net> Date: Sun, 26 Apr 2015 13:16:23 +0200 Subject: [PATCH] Introduce virtual packages for gluon-setup-mode and gluon-config-mode-core This will require site.mk to explicitly pull in the gluon-setup-mode and gluon-config-mode-core packages. --- package/gluon-config-mode-autoupdater/Makefile | 2 +- package/gluon-config-mode-contact-info/Makefile | 2 +- package/gluon-config-mode-core/Makefile | 3 ++- package/gluon-config-mode-geo-location/Makefile | 2 +- package/gluon-config-mode-hostname/Makefile | 2 +- package/gluon-config-mode-mesh-vpn/Makefile | 2 +- package/gluon-luci-admin/Makefile | 2 +- package/gluon-mesh-vpn-fastd/Makefile | 2 +- package/gluon-setup-mode/Makefile | 1 + 9 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/gluon-config-mode-autoupdater/Makefile b/package/gluon-config-mode-autoupdater/Makefile index d480e1322..4303940b4 100644 --- a/package/gluon-config-mode-autoupdater/Makefile +++ b/package/gluon-config-mode-autoupdater/Makefile @@ -14,7 +14,7 @@ define Package/gluon-config-mode-autoupdater SECTION:=gluon CATEGORY:=Gluon TITLE:=Let the user know whether the autoupdater is enabled or not. - DEPENDS:=+gluon-config-mode-core +gluon-autoupdater + DEPENDS:=gluon-config-mode-core-virtual +gluon-autoupdater endef define Package/gluon-config-mode-autoupdater/description diff --git a/package/gluon-config-mode-contact-info/Makefile b/package/gluon-config-mode-contact-info/Makefile index d5c50dd6d..ff9cb57f8 100644 --- a/package/gluon-config-mode-contact-info/Makefile +++ b/package/gluon-config-mode-contact-info/Makefile @@ -14,7 +14,7 @@ define Package/gluon-config-mode-contact-info SECTION:=gluon CATEGORY:=Gluon TITLE:=Set a custom string that will be distributed in the mesh. - DEPENDS:=+gluon-config-mode-core +gluon-node-info + DEPENDS:=gluon-config-mode-core-virtual +gluon-node-info endef define Build/Prepare diff --git a/package/gluon-config-mode-core/Makefile b/package/gluon-config-mode-core/Makefile index 35946b27d..5d700f7f0 100644 --- a/package/gluon-config-mode-core/Makefile +++ b/package/gluon-config-mode-core/Makefile @@ -17,7 +17,8 @@ define Package/gluon-config-mode-core SECTION:=gluon CATEGORY:=Gluon TITLE:=Luci based config mode for user friendly setup of new mesh nodes - DEPENDS:=+gluon-setup-mode +gluon-luci-theme +gluon-lock-password $(GLUON_I18N_PACKAGES) + DEPENDS:=gluon-setup-mode-virtual +gluon-luci-theme +gluon-lock-password $(GLUON_I18N_PACKAGES) + PROVIDES:=gluon-config-mode-core-virtual endef define Build/Prepare diff --git a/package/gluon-config-mode-geo-location/Makefile b/package/gluon-config-mode-geo-location/Makefile index 4b5204e0f..28d347643 100644 --- a/package/gluon-config-mode-geo-location/Makefile +++ b/package/gluon-config-mode-geo-location/Makefile @@ -14,7 +14,7 @@ define Package/gluon-config-mode-geo-location SECTION:=gluon CATEGORY:=Gluon TITLE:=Set geographic location of a node - DEPENDS:=+gluon-config-mode-core +gluon-node-info + DEPENDS:=gluon-config-mode-core-virtual +gluon-node-info endef define Build/Prepare diff --git a/package/gluon-config-mode-hostname/Makefile b/package/gluon-config-mode-hostname/Makefile index 255740e48..803f018f3 100644 --- a/package/gluon-config-mode-hostname/Makefile +++ b/package/gluon-config-mode-hostname/Makefile @@ -14,7 +14,7 @@ define Package/gluon-config-mode-hostname SECTION:=gluon CATEGORY:=Gluon TITLE:=Set the hostname - DEPENDS:=+gluon-config-mode-core + DEPENDS:=gluon-config-mode-core-virtual endef define Build/Prepare diff --git a/package/gluon-config-mode-mesh-vpn/Makefile b/package/gluon-config-mode-mesh-vpn/Makefile index 4792e3d32..6a8a3f2c0 100644 --- a/package/gluon-config-mode-mesh-vpn/Makefile +++ b/package/gluon-config-mode-mesh-vpn/Makefile @@ -14,7 +14,7 @@ define Package/gluon-config-mode-mesh-vpn SECTION:=gluon CATEGORY:=Gluon TITLE:=Toggle mesh-vpn and bandwidth limit - DEPENDS:=+gluon-config-mode-core +gluon-mesh-vpn-fastd +gluon-simple-tc + DEPENDS:=gluon-config-mode-core-virtual +gluon-mesh-vpn-fastd +gluon-simple-tc endef define Build/Prepare diff --git a/package/gluon-luci-admin/Makefile b/package/gluon-luci-admin/Makefile index 455bcb25b..0208ace24 100644 --- a/package/gluon-luci-admin/Makefile +++ b/package/gluon-luci-admin/Makefile @@ -15,7 +15,7 @@ define Package/gluon-luci-admin SECTION:=gluon CATEGORY:=Gluon TITLE:=Luci based simple administration interface for mesh nodes - DEPENDS:=+gluon-config-mode-core + DEPENDS:=gluon-config-mode-core-virtual endef define Package/gluon-luci-admin/description diff --git a/package/gluon-mesh-vpn-fastd/Makefile b/package/gluon-mesh-vpn-fastd/Makefile index 1547985c3..775f92f11 100644 --- a/package/gluon-mesh-vpn-fastd/Makefile +++ b/package/gluon-mesh-vpn-fastd/Makefile @@ -11,7 +11,7 @@ define Package/gluon-mesh-vpn-fastd SECTION:=gluon CATEGORY:=Gluon TITLE:=Support for connecting batman-adv meshes via fastd - DEPENDS:=+gluon-core +gluon-mesh-batman-adv +gluon-wan-dnsmasq +fastd +iptables-mod-extra + DEPENDS:=+gluon-core gluon-mesh-batman-adv +gluon-wan-dnsmasq +fastd +iptables-mod-extra endef define Package/gluon-mesh-vpn-fastd/description diff --git a/package/gluon-setup-mode/Makefile b/package/gluon-setup-mode/Makefile index 99799927e..55370abee 100644 --- a/package/gluon-setup-mode/Makefile +++ b/package/gluon-setup-mode/Makefile @@ -15,6 +15,7 @@ define Package/gluon-setup-mode CATEGORY:=Gluon TITLE:=Setup mode DEPENDS:=+gluon-core +uhttpd +dnsmasq + PROVIDES:=gluon-setup-mode-virtual endef define Package/gluon-setup-mode/description -- GitLab