vti: squash vtiv4 and vtiv6 packages into vti

This change adds the same package behaviour as gre package.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
This commit is contained in:
Florian Eckert 2021-10-27 15:54:25 +02:00 committed by Hans Dedecker
parent 063d49b8a0
commit b14f062849

View File

@ -8,47 +8,28 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=vti PKG_NAME:=vti
PKG_RELEASE:=4 PKG_RELEASE:=5
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/vti/Default define Package/vti/Default
SECTION:=net
CATEGORY:=Network
MAINTAINER:=Andre Valentin <avalentin@marcant.net>
PKGARCH:=all
endef endef
define Package/vti define Package/vti
$(call Package/vti/Default) SECTION:=net
CATEGORY:=Network
MAINTAINER:=Andre Valentin <avalentin@marcant.net>
TITLE:=Virtual IPsec Tunnel Interface config support TITLE:=Virtual IPsec Tunnel Interface config support
DEPENDS:=+kmod-ip-vti +IPV6:kmod-ip6-vti
PROVIDES:=vtiv4 vtiv6
PKGARCH:=all
endef endef
define Package/vti/description define Package/vti/description
Virtual IPsec Tunnel Interface config support (IPv4 and IPv6) in /etc/config/network. Virtual IPsec Tunnel Interface config support (IPv4 and IPv6) in /etc/config/network.
endef endef
define Package/vtiv4
$(call Package/vti/Default)
TITLE:=Virtual IPsec Tunnel Interface (IPv4) config support
DEPENDS:=@(PACKAGE_vti) +kmod-ip-vti
endef
define Package/vtiv4/description
Virtual IPsec Tunnel Interface config support (IPv4) in /etc/config/network.
endef
define Package/vtiv6
$(call Package/vti/Default)
TITLE:=Virtual IPsec Tunnel Interface (IPv6) config support
DEPENDS:=@(PACKAGE_vti) @IPV6 +kmod-ip6-vti
endef
define Package/vtiv6/description
Virtual IPsec Tunnel Interface config support (IPv6) in /etc/config/network.
endef
define Build/Compile define Build/Compile
endef endef
@ -60,14 +41,4 @@ define Package/vti/install
$(INSTALL_BIN) ./files/vti.sh $(1)/lib/netifd/proto/vti.sh $(INSTALL_BIN) ./files/vti.sh $(1)/lib/netifd/proto/vti.sh
endef endef
define Package/vtiv4/install
:
endef
define Package/vtiv6/install
:
endef
$(eval $(call BuildPackage,vti)) $(eval $(call BuildPackage,vti))
$(eval $(call BuildPackage,vtiv4))
$(eval $(call BuildPackage,vtiv6))