ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-19 13:48:06 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

gre: squash grev4 and grev6 packages into gre (FS#1399)

Browse Source 
The split-up into packages gre, grev4 and grev6 causes confusion for the
users as reported in FS#1399.
As IPv4 and IPv6 are considered now as bundled; squash the grev4 and grev6
packages into the gre package and let gre provide both grev4 and grev6.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
This commit is contained in:
Hans Dedecker 2018-03-02 14:28:43 +01:00
parent 175b262328
commit 694f0bb5af
1 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
package/network/config/gre/Makefile
View File

@ -15,40 +15,21 @@ PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/gre/Default define Package/gre/Default
SECTION:=net
CATEGORY:=Network
MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com>
endef endef
define Package/gre define Package/gre
$(call Package/gre/Default) SECTION:=net
CATEGORY:=Network
MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com>
TITLE:=Generic Routing Encapsulation config support TITLE:=Generic Routing Encapsulation config support
DEPENDS:=+kmod-gre +IPV6:kmod-gre6 +resolveip
PROVIDES:=grev4 grev6
endef endef
define Package/gre/description define Package/gre/description
Generic Routing Encapsulation config support (IPv4 and IPv6) in /etc/config/network. Generic Routing Encapsulation config support (IPv4 and IPv6) in /etc/config/network.
endef endef
define Package/grev4
$(call Package/gre/Default)
TITLE:=Generic Routing Encapsulation (IPv4) config support
DEPENDS:=@(PACKAGE_gre) +kmod-gre +resolveip
endef
define Package/grev4/description
Generic Routing Encapsulation config support (IPv4) in /etc/config/network.
endef
define Package/grev6
$(call Package/gre/Default)
TITLE:=Generic Routing Encapsulation (IPv6) config support
DEPENDS:=@(PACKAGE_gre) @IPV6 +kmod-gre6 +resolveip
endef
define Package/grev6/description
Generic Routing Encapsulation config support (IPv6) in /etc/config/network.
endef
define Build/Compile define Build/Compile
endef endef
@ -60,14 +41,4 @@ define Package/gre/install
$(INSTALL_BIN) ./files/gre.sh $(1)/lib/netifd/proto/gre.sh $(INSTALL_BIN) ./files/gre.sh $(1)/lib/netifd/proto/gre.sh
endef endef
define Package/grev4/install
:
endef
define Package/grev6/install
:
endef
$(eval $(call BuildPackage,gre)) $(eval $(call BuildPackage,gre))
$(eval $(call BuildPackage,grev4))
$(eval $(call BuildPackage,grev6))