Skip to content
Snippets Groups Projects
Unverified Commit 2cd30d64 authored by Matthias Schiffer's avatar Matthias Schiffer
Browse files

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.
parent 9b7ef2c6
No related branches found
No related tags found
No related merge requests found
...@@ -9,7 +9,6 @@ GLUON_SITE_PACKAGES := \ ...@@ -9,7 +9,6 @@ GLUON_SITE_PACKAGES := \
gluon-autoupdater \ gluon-autoupdater \
gluon-config-mode-autoupdater \ gluon-config-mode-autoupdater \
gluon-config-mode-contact-info \ gluon-config-mode-contact-info \
gluon-config-mode-core \
gluon-config-mode-geo-location \ gluon-config-mode-geo-location \
gluon-config-mode-hostname \ gluon-config-mode-hostname \
gluon-config-mode-mesh-vpn \ gluon-config-mode-mesh-vpn \
...@@ -22,7 +21,6 @@ GLUON_SITE_PACKAGES := \ ...@@ -22,7 +21,6 @@ GLUON_SITE_PACKAGES := \
gluon-mesh-batman-adv-15 \ gluon-mesh-batman-adv-15 \
gluon-mesh-vpn-fastd \ gluon-mesh-vpn-fastd \
gluon-radvd \ gluon-radvd \
gluon-setup-mode \
gluon-status-page \ gluon-status-page \
haveged \ haveged \
iwinfo iwinfo
......
...@@ -14,7 +14,7 @@ define Package/gluon-config-mode-autoupdater ...@@ -14,7 +14,7 @@ define Package/gluon-config-mode-autoupdater
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
TITLE:=Config Mode: Let the user know whether the autoupdater is enabled or not 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 endef
define Build/Prepare define Build/Prepare
......
...@@ -14,7 +14,7 @@ define Package/gluon-config-mode-contact-info ...@@ -14,7 +14,7 @@ define Package/gluon-config-mode-contact-info
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
TITLE:=Allows the user to provide contact information to be distributed in the mesh 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 endef
define Package/gluon-config-mode-contact-info/description define Package/gluon-config-mode-contact-info/description
......
...@@ -17,8 +17,7 @@ define Package/gluon-config-mode-core ...@@ -17,8 +17,7 @@ define Package/gluon-config-mode-core
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
TITLE:=Configuration wizard for user friendly setup of new mesh nodes TITLE:=Configuration wizard for user friendly setup of new mesh nodes
DEPENDS:=gluon-setup-mode-virtual +gluon-web-theme +gluon-lock-password +pretty-hostname DEPENDS:=+gluon-setup-mode +gluon-web-theme +gluon-lock-password +pretty-hostname
PROVIDES:=gluon-config-mode-core-virtual
endef endef
define Build/Prepare define Build/Prepare
......
...@@ -14,7 +14,7 @@ define Package/gluon-config-mode-geo-location ...@@ -14,7 +14,7 @@ define Package/gluon-config-mode-geo-location
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
TITLE:=Set geographic location of a node 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 endef
define Build/Prepare define Build/Prepare
......
...@@ -14,7 +14,7 @@ define Package/gluon-config-mode-hostname ...@@ -14,7 +14,7 @@ define Package/gluon-config-mode-hostname
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
TITLE:=Set the hostname TITLE:=Set the hostname
DEPENDS:=gluon-config-mode-core-virtual DEPENDS:=+gluon-config-mode-core
endef endef
define Build/Prepare define Build/Prepare
......
...@@ -14,7 +14,7 @@ define Package/gluon-config-mode-mesh-vpn ...@@ -14,7 +14,7 @@ define Package/gluon-config-mode-mesh-vpn
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
TITLE:=Toggle mesh-vpn and bandwidth limit 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 endef
define Build/Prepare define Build/Prepare
......
...@@ -16,7 +16,6 @@ define Package/gluon-setup-mode ...@@ -16,7 +16,6 @@ define Package/gluon-setup-mode
CATEGORY:=Gluon CATEGORY:=Gluon
TITLE:=Setup mode TITLE:=Setup mode
DEPENDS:=+gluon-core +gluon-web +ubus +uhttpd +dnsmasq DEPENDS:=+gluon-core +gluon-web +ubus +uhttpd +dnsmasq
PROVIDES:=gluon-setup-mode-virtual
endef endef
define Package/gluon-setup-mode/description define Package/gluon-setup-mode/description
......
...@@ -18,7 +18,7 @@ define Package/gluon-web-admin ...@@ -18,7 +18,7 @@ define Package/gluon-web-admin
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
TITLE:=Web-based simple administration interface for mesh nodes 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 endef
define Build/Prepare define Build/Prepare
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment