From 2cd30d644bd1f742c4e6ce71b36da58fdbf870d0 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 8 Jul 2017 16:34:40 +0200 Subject: [PATCH] Remove redundant virtual packages As PROVIDES can be used to replace real packages now, we don't need the virtual packages as workaround anymore. This also means that the providing packages don't need to be added to site.mk explicitly anymore when the default provider is used. --- docs/site-example/site.mk | 2 -- 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-setup-mode/Makefile | 1 - package/gluon-web-admin/Makefile | 2 +- 9 files changed, 7 insertions(+), 11 deletions(-) diff --git a/docs/site-example/site.mk b/docs/site-example/site.mk index 6ec1172a..8f03eb5e 100644 --- a/docs/site-example/site.mk +++ b/docs/site-example/site.mk @@ -9,7 +9,6 @@ GLUON_SITE_PACKAGES := \ gluon-autoupdater \ gluon-config-mode-autoupdater \ gluon-config-mode-contact-info \ - gluon-config-mode-core \ gluon-config-mode-geo-location \ gluon-config-mode-hostname \ gluon-config-mode-mesh-vpn \ @@ -22,7 +21,6 @@ GLUON_SITE_PACKAGES := \ gluon-mesh-batman-adv-15 \ gluon-mesh-vpn-fastd \ gluon-radvd \ - gluon-setup-mode \ gluon-status-page \ haveged \ iwinfo diff --git a/package/gluon-config-mode-autoupdater/Makefile b/package/gluon-config-mode-autoupdater/Makefile index a77c07de..423aca18 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:=Config Mode: Let the user know whether the autoupdater is enabled or not - DEPENDS:=gluon-config-mode-core-virtual +gluon-autoupdater + DEPENDS:=+gluon-config-mode-core +gluon-autoupdater endef define Build/Prepare diff --git a/package/gluon-config-mode-contact-info/Makefile b/package/gluon-config-mode-contact-info/Makefile index 7a3780a6..c7d11b11 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:=Allows the user to provide contact information to be distributed in the mesh - DEPENDS:=gluon-config-mode-core-virtual +gluon-node-info + DEPENDS:=+gluon-config-mode-core +gluon-node-info endef define Package/gluon-config-mode-contact-info/description diff --git a/package/gluon-config-mode-core/Makefile b/package/gluon-config-mode-core/Makefile index 91b2e51f..a66a042f 100644 --- a/package/gluon-config-mode-core/Makefile +++ b/package/gluon-config-mode-core/Makefile @@ -17,8 +17,7 @@ define Package/gluon-config-mode-core SECTION:=gluon CATEGORY:=Gluon TITLE:=Configuration wizard for user friendly setup of new mesh nodes - DEPENDS:=gluon-setup-mode-virtual +gluon-web-theme +gluon-lock-password +pretty-hostname - PROVIDES:=gluon-config-mode-core-virtual + DEPENDS:=+gluon-setup-mode +gluon-web-theme +gluon-lock-password +pretty-hostname endef define Build/Prepare diff --git a/package/gluon-config-mode-geo-location/Makefile b/package/gluon-config-mode-geo-location/Makefile index af523f09..7c938ca7 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-virtual +gluon-node-info + DEPENDS:=+gluon-config-mode-core +gluon-node-info endef define Build/Prepare diff --git a/package/gluon-config-mode-hostname/Makefile b/package/gluon-config-mode-hostname/Makefile index 2b24a640..041f09d9 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-virtual + DEPENDS:=+gluon-config-mode-core endef define Build/Prepare diff --git a/package/gluon-config-mode-mesh-vpn/Makefile b/package/gluon-config-mode-mesh-vpn/Makefile index 20e5c016..ecca627d 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-virtual +gluon-mesh-vpn-core + DEPENDS:=+gluon-config-mode-core +gluon-mesh-vpn-core endef define Build/Prepare diff --git a/package/gluon-setup-mode/Makefile b/package/gluon-setup-mode/Makefile index 5840d3fd..d149e918 100644 --- a/package/gluon-setup-mode/Makefile +++ b/package/gluon-setup-mode/Makefile @@ -16,7 +16,6 @@ define Package/gluon-setup-mode CATEGORY:=Gluon TITLE:=Setup mode DEPENDS:=+gluon-core +gluon-web +ubus +uhttpd +dnsmasq - PROVIDES:=gluon-setup-mode-virtual endef define Package/gluon-setup-mode/description diff --git a/package/gluon-web-admin/Makefile b/package/gluon-web-admin/Makefile index e244b35b..164b0db1 100644 --- a/package/gluon-web-admin/Makefile +++ b/package/gluon-web-admin/Makefile @@ -18,7 +18,7 @@ define Package/gluon-web-admin SECTION:=gluon CATEGORY:=Gluon TITLE:=Web-based simple administration interface for mesh nodes - DEPENDS:=gluon-config-mode-core-virtual +pretty-hostname + DEPENDS:=+gluon-config-mode-core +pretty-hostname endef define Build/Prepare